X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=c1446b462949c662eb5f0b117f315f38a42c83f3;hb=d914c5f40ca1194e7fd6a2b30664ac4717e38786;hp=5446c04235f3f0465fe64c93f62fc31ce6fdfc4e;hpb=003f12c8e9b3ae8bc00658a8763ebd593ac8c390;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index 5446c04..c1446b4 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -7,18 +7,17 @@
 
 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; }
 	};
 
 	typedef std::list<Pattern> PatternList;
@@ -27,8 +26,10 @@ 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;
@@ -39,15 +40,18 @@ 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::list<std::string> &) const;
 	bool is_native() const { return native; }
 	bool is_cross() const { return !cross_prefix.empty(); }
 
-	void set_cross_prefix(const std::string &);
 	const std::string &get_cross_prefix() const { return cross_prefix; }
 
 	const PatternList &get_shared_library_patterns() const { return sharedlib_patterns; }
@@ -55,10 +59,8 @@ public:
 	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