Fix typos

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a6e838d1e49ea160bf6d320d647fe44ed9be7381..2928cbfe21b30c88ea0b1d8a538ade7449b2f443 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -72,7 +72,7 @@ Target *GnuCompiler::create_source(const FS::Path &path) const
 Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
 {
        if(sources.size()!=1)
-               throw invalid_argument("GnuCCompiler::create_target");
+               throw invalid_argument("GnuCompiler::create_target");
        SourceFile &source = dynamic_cast<SourceFile &>(*sources.front());
        ObjectFile *obj = new ObjectFile(builder, *source.get_component(), source);
        obj->set_tool(*this);
@@ -254,20 +254,20 @@ Task *GnuCompiler::run(const Target &target) const
        const FS::Path &sysroot = binfo.sysroot;
        if(!sysroot.empty())
                argv.push_back("--sysroot="+sysroot.str());
-       for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+       for(const FS::Path &p: binfo.local_incpath)
        {
                argv.push_back("-iquote");
-               argv.push_back(i->str());
+               argv.push_back(p.str());
        }
-       for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-               argv.push_back("-I"+i->str());
+       for(const FS::Path &p: binfo.incpath)
+               argv.push_back("-I"+p.str());
 
-       for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+       for(const auto &kvp: binfo.defines)
        {
-               if(i->second.empty())
-                       argv.push_back(format("-D%s", i->first));
+               if(kvp.second.empty())
+                       argv.push_back(format("-D%s", kvp.first));
                else
-                       argv.push_back(format("-D%s=%s", i->first, i->second));
+                       argv.push_back(format("-D%s=%s", kvp.first, kvp.second));
        }
 
        if(binfo.debug)
@@ -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")
                {