X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=2752ff4ed969db58745094d0d38249c752fa976b;hb=e87f8e48e17754a8413bda66e6da67daf933cee2;hp=6335aaf3cc4f51ce513b06ad3735de751e05db56;hpb=f41742cb2b21241634c123561b71ee1667cb1ff4;p=builder.git diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index 6335aaf..2752ff4 100644 --- a/source/gnucompiler.cpp +++ b/source/gnucompiler.cpp @@ -28,7 +28,8 @@ const char *cpus[] = } GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t): - Tool(b, a, t) + Tool(b, a, t), + version(0) { if(tag=="CC") { @@ -80,6 +81,9 @@ Target *GnuCompiler::create_target(const list &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()) { @@ -98,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; @@ -140,7 +150,7 @@ void GnuCompiler::do_prepare() start = newline+1; } } - catch(const runtime_error &e) + catch(const runtime_error &) { } } @@ -156,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 version_parts = split(version_str, '.'); + version = 0; + for(unsigned i=0; (i<3 && i(version_parts[i])<<(16-8*i); + } + catch(const runtime_error &) + { } +} + Task *GnuCompiler::run(const Target &target) const { const ObjectFile &object = dynamic_cast(target); @@ -169,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) { @@ -180,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) { @@ -235,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(); @@ -261,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") {