Add FPU specification to Architecture and GnuCompiler

[builder.git] / source / architecture.h

diff --git a/source/architecture.h b/source/architecture.h
index f60381f9905ddb6573c304470b0be7304aed6a9d..153230244f6aedfdce7fd6a5648619108fe93d12 100644 (file)
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -3,58 +3,62 @@
 
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
-#include "misc.h"
+#include "pattern.h"
 
 class Builder;
 
-// XXX Add lib/exe prefix/suffix fields.  Some archs may need multiple alternatives, how to handle this?
+/**
+Stores information about an architecture.  This includes CPU type, model and
+bitness and operating system.
+*/
 class Architecture
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Architecture>
        {
-       private:
-               Architecture &arch;
-
        public:
                Loader(Architecture &);
-               Architecture &get_object() { return arch; }
-       private:
-               void tool(const std::string &t, const std::string &p);
        };
 
+       typedef std::list<Pattern> PatternList;
+
 private:
        Builder &builder;
        std::string type;
        std::string cpu;
+       std::string fpu;
        std::string system;
        unsigned bits;
        std::string name;
        bool native;
        std::string cross_prefix;
-       StringMap tools;
-       BuildInfo build_info;
+       PatternList sharedlib_patterns;
+       PatternList staticlib_patterns;
+       PatternList executable_patterns;
 
 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; }
        bool match_name(const std::string &) const;
+       std::string best_match(const std::list<std::string> &) const;
        bool is_native() const { return native; }
+       bool is_cross() const { return !cross_prefix.empty(); }
 
-       void set_tool(const std::string &t, const std::string &p);
-       void set_cross_prefix(const std::string &);
-       std::string get_tool(const std::string &t) const;
        const std::string &get_cross_prefix() const { return cross_prefix; }
 
-       const BuildInfo &get_build_info() const { return build_info; }
+       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 &);
 };
 
-typedef std::map<std::string, Architecture> ArchMap;
-
 #endif