X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=6daa99d81a565c482c05f6a49127986d0a457ead;hp=051722832ea66402e515733fb51cd5c6ad78aa8e;hb=081e13e6f146d1685bdcb1ec1c82752f4c6d264d;hpb=2c1497133a0ad7e4a936365f9e5e8ccc0e9cba1a

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 0517228..6daa99d 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)
 {
@@ -165,9 +176,17 @@ 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();