Refactor logger to do message formatting internally

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a6e838d1e49ea160bf6d320d647fe44ed9be7381..b8b25152e70acfce73e0c9f9e313daf8460f3979 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -69,10 +69,10 @@ Target *GnuCompiler::create_source(const FS::Path &path) const
                return new CSourceFile(builder, path);
 }
 
-Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
+Target *GnuCompiler::create_target(const vector<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);
@@ -84,13 +84,14 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
        if(!executable)
                return string();
 
-       string result = FS::basename(executable->get_path());
+       string result = Tool::create_build_signature(binfo);
        if(!architecture->get_cpu().empty())
        {
                result += ",m";
                result += architecture->get_cpu();
        }
-       result += ',';
+       if(binfo.debug || binfo.optimize)
+               result += ',';
        if(binfo.debug)
                result += 'g';
        if(binfo.optimize)
@@ -125,7 +126,7 @@ void GnuCompiler::prepare_syspath()
                        argv.push_back("--sysroot="+sysroot.str());
                argv.push_back("-");
 
-               builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+               builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
                try
                {
                        string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
@@ -144,7 +145,7 @@ void GnuCompiler::prepare_syspath()
                                else if(record_path)
                                {
                                        FS::Path path = strip(output.substr(start, newline-start));
-                                       builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
+                                       builder.get_logger().log("tools", "Got %s system path: %s", tag, path);
                                        system_path.push_back(path);
                                }
                                start = newline+1;
@@ -156,13 +157,13 @@ void GnuCompiler::prepare_syspath()
 
        if(!path_found)
        {
-               builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+               builder.get_logger().log("tools", "No %s system path found, using defaults", tag);
                if(!sysroot.empty())
                        system_path.push_back(sysroot/"usr/include");
                else if(architecture->is_native())
                        system_path.push_back("/usr/include");
                else
-                       system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+                       system_path.push_back(format("/usr/%s/include", architecture->get_cross_prefix()));
        }
 }
 
@@ -174,7 +175,7 @@ void GnuCompiler::prepare_version()
        prepare_version("-dumpversion");
        if(version>=0x70000)
                prepare_version("-dumpfullversion");
-       builder.get_logger().log("tools", format("%s version is %d.%d.%d", FS::basename(executable->get_path()), version>>16, (version>>8)&0xFF, version&0xFF));
+       builder.get_logger().log("tools", "%s version is %d.%d.%d", FS::basename(executable->get_path()), version>>16, (version>>8)&0xFF, version&0xFF);
 }
 
 void GnuCompiler::prepare_version(const string &arg)
@@ -183,7 +184,7 @@ void GnuCompiler::prepare_version(const string &arg)
        argv.push_back(executable->get_path().str());
        argv.push_back(arg);
 
-       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+       builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
        try
        {
                string version_str = strip(ExternalTask::run_and_capture_output(argv));
@@ -254,20 +255,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 +306,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")
                {