X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=2f6393ec1d718e97134d3a4a53bc002b0a9c3fc1;hb=276a7c7c046a8f1b692cecbd53f17595ed23264d;hp=051722832ea66402e515733fb51cd5c6ad78aa8e;hpb=d1a42f852e58918708b5b0cbd90219f6a95aa75b;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 0517228..2f6393e 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -15,6 +15,17 @@
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+const char *cpus[] =
+{
+	"athlonxp", "athlon-xp",
+	"armv7a",   "armv7-a",
+	0
+};
+
+}
+
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
 	Tool(b, a, t)
 {
@@ -81,7 +92,6 @@ void GnuCompiler::do_prepare()
 Task *GnuCompiler::run(const Target &target) const
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
-	const Component &comp = *object.get_component();
 
 	ExternalTask::Arguments argv;
 	argv.push_back(executable->get_path().str());
@@ -165,13 +175,21 @@ Task *GnuCompiler::run(const Target &target) const
 	if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
-	const string &cpu = architecture->get_cpu();
+	string cpu = architecture->get_cpu();
 	if(!cpu.empty())
+	{
+		for(unsigned i=0; cpus[i]; i+=2)
+			if(cpu==cpus[i])
+			{
+				cpu = cpus[i+1];
+				break;
+			}
 		argv.push_back("-march="+cpu);
+	}
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();
-	FS::Path work_dir = comp.get_package().get_source_directory();
+	FS::Path work_dir = object.get_component()->get_package().get_source_directory();
 
 	argv.push_back("-o");
 	argv.push_back(relative(obj_path, work_dir).str());