Adapt to changes in mspcore

[builder.git] / source / architecture.h

diff --git a/source/architecture.h b/source/architecture.h
index 4db809f19f3cbf0ef33e6706b8cc1bedae5f0619..752c84a2d19b7afd267ed8863fa630fa34e347cd 100644 (file)
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -26,11 +26,14 @@ private:
        Builder &builder;
        std::string type;
        std::string cpu;
+       std::string fpu;
        std::string system;
        unsigned bits;
+       std::string toolchain;
        std::string name;
        bool native;
        std::string cross_prefix;
+       PatternList object_patterns;
        PatternList sharedlib_patterns;
        PatternList staticlib_patterns;
        PatternList executable_patterns;
@@ -38,22 +41,27 @@ private:
 public:
        Architecture(Builder &b, const std::string &spec);
 
+       const std::string &get_type() const { return type; }
        const std::string &get_name() const { return name; }
        const std::string &get_system() const { return system; }
        unsigned get_bits() const { return bits; }
        const std::string &get_cpu() const { return cpu; }
+       const std::string &get_fpu() const { return fpu; }
+       const std::string &get_toolchain() const { return toolchain; }
        bool match_name(const std::string &) const;
+       std::string best_match(const std::vector<std::string> &) const;
        bool is_native() const { return native; }
        bool is_cross() const { return !cross_prefix.empty(); }
 
        const std::string &get_cross_prefix() const { return cross_prefix; }
 
+       const PatternList &get_object_patterns() const { return object_patterns; }
        const PatternList &get_shared_library_patterns() const { return sharedlib_patterns; }
        const PatternList &get_static_library_patterns() const { return staticlib_patterns; }
        const PatternList &get_executable_patterns() const { return executable_patterns; }
 
 private:
-       std::string resolve_alias(const std::string &) const;
+       static void resolve_aliases(std::vector<std::string> &);
        void parse_specification(const std::string &);
 };