X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=153230244f6aedfdce7fd6a5648619108fe93d12;hb=921e8234ff65bd23c0b94ed568ec1fb68e47655b;hp=c322c3a580d23d7a676295295c20efc7fbc02e0f;hpb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index c322c3a..1532302 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -7,7 +7,10 @@
 
 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:
@@ -23,6 +26,7 @@ private:
 	Builder &builder;
 	std::string type;
 	std::string cpu;
+	std::string fpu;
 	std::string system;
 	unsigned bits;
 	std::string name;
@@ -35,15 +39,17 @@ 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; }
 	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; }
@@ -51,10 +57,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