Add support for SSE3 and SSE4.1 FPUs

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index b186bb367cdb84350988f143142085c4b690a3ca..2752ff4ed969db58745094d0d38249c752fa976b 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -150,7 +150,7 @@ void GnuCompiler::prepare_syspath()
                                start = newline+1;
                        }
                }
-               catch(const runtime_error &e)
+               catch(const runtime_error &)
                { }
        }
 
@@ -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)
        {
@@ -221,6 +221,8 @@ Task *GnuCompiler::run(const Target &target) const
                {
                        argv.push_back("-Wextra");
                        argv.push_back("-Wundef");
+                       if(version>=0x80000)
+                               argv.push_back("-Wno-cast-function-type");
                }
                if(binfo.warning_level>=3)
                {
@@ -276,14 +278,15 @@ Task *GnuCompiler::run(const Target &target) const
                        argv.push_back("-Os");
                else
                        argv.push_back(format("-O%d", binfo.optimize));
+               if(binfo.debug)
+                       argv.push_back("-fno-omit-frame-pointer");
        }
        if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
                argv.push_back("-pthread");
        if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
                argv.push_back("-fPIC");
 
-       const Architecture &native_arch = builder.get_native_arch();
-       if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
+       if((architecture->get_type()=="x86" || architecture->get_type()=="ppc") && !architecture->is_native())
                argv.push_back(format("-m%d", architecture->get_bits()));
 
        string cpu = architecture->get_cpu();
@@ -302,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")
                {