X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=2752ff4ed969db58745094d0d38249c752fa976b;hb=e87f8e48e17754a8413bda66e6da67daf933cee2;hp=fe1d735db197c6acff4512fe08721ec94b2ffaf5;hpb=a1a88a589352feca01a6c273b733caf7c96ad31b;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index fe1d735..2752ff4 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -210,9 +210,9 @@ Task *GnuCompiler::run(const Target &target) const
 
 	string tag_for_std = (tag=="OBJC" ? "CC" : tag);
 	if(binfo.standards.count(tag_for_std))
-		argv.push_back("-std="+get_item(binfo.standards, tag_for_std));
+		argv.push_back("-std="+get_item(binfo.standards, tag_for_std).str());
 	if(tag=="OBJC" && binfo.standards.count(tag))
-		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag));
+		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag).str());
 
 	if(binfo.warning_level>=1)
 	{
@@ -305,9 +305,17 @@ Task *GnuCompiler::run(const Target &target) const
 	{
 		if(architecture->get_type()=="x86")
 		{
-			argv.push_back("-mfpmath="+architecture->get_fpu());
+			if(architecture->get_fpu()=="387")
+				argv.push_back("-mfpmath=387");
+			else if(!architecture->get_fpu().compare(0, 3, "sse"))
+				argv.push_back("-mfpmath=sse");
+
 			if(architecture->get_fpu()=="sse")
 				argv.push_back("-msse2");
+			else if(architecture->get_fpu()=="sse3")
+				argv.push_back("-msse3");
+			else if(architecture->get_fpu()=="sse4.1")
+				argv.push_back("-msse4.1");
 		}
 		else if(architecture->get_type()=="arm")
 		{