Use -fno-omit-frame-pointer if debug is set with optimizations

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 16e7ccac1d88da73a34776e288980b295f4f0747..fe1d735db197c6acff4512fe08721ec94b2ffaf5 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -27,8 +27,9 @@ const char *cpus[] =
 
 }
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
-       Tool(b, a, t)
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
+       Tool(b, a, t),
+       version(0)
 {
        if(tag=="CC")
        {
@@ -50,9 +51,6 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, con
                throw invalid_argument("GnuCompiler::GnuCompiler");
 
        set_command((tag=="CXX" ? "g++" : "gcc"), true);
-
-       if(!sysroot.empty())
-               build_info.sysroot = sysroot;
 }
 
 Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -83,6 +81,9 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 
 string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 {
+       if(!executable)
+               return string();
+
        string result = FS::basename(executable->get_path());
        if(!architecture->get_cpu().empty())
        {
@@ -101,11 +102,17 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 }
 
 void GnuCompiler::do_prepare()
+{
+       executable = builder.get_vfs().find_binary(command);
+       prepare_syspath();
+       prepare_version();
+}
+
+void GnuCompiler::prepare_syspath()
 {
        bool path_found = false;
        const FS::Path &sysroot = build_info.sysroot;
 
-       executable = builder.get_vfs().find_binary(command);
        if(executable)
        {
                ExternalTask::Arguments argv;
@@ -143,7 +150,7 @@ void GnuCompiler::do_prepare()
                                start = newline+1;
                        }
                }
-               catch(const runtime_error &e)
+               catch(const runtime_error &)
                { }
        }
 
@@ -159,6 +166,37 @@ void GnuCompiler::do_prepare()
        }
 }
 
+void GnuCompiler::prepare_version()
+{
+       if(!executable)
+               return;
+
+       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));
+}
+
+void GnuCompiler::prepare_version(const string &arg)
+{
+       ExternalTask::Arguments argv;
+       argv.push_back(executable->get_path().str());
+       argv.push_back(arg);
+
+       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+       try
+       {
+               string version_str = strip(ExternalTask::run_and_capture_output(argv));
+
+               vector<string> version_parts = split(version_str, '.');
+               version = 0;
+               for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
+                       version |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
+       }
+       catch(const runtime_error &)
+       { }
+}
+
 Task *GnuCompiler::run(const Target &target) const
 {
        const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
@@ -183,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)
                {
@@ -238,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();