X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=6335aaf3cc4f51ce513b06ad3735de751e05db56;hb=f41742cb2b21241634c123561b71ee1667cb1ff4;hp=9fcdaf048cd50c23e0eb85e924dfa75d013ae87a;hpb=7c86449343bab284071716f1d0606d67e720b8ad;p=builder.git diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index 9fcdaf0..6335aaf 100644 --- a/source/gnucompiler.cpp +++ b/source/gnucompiler.cpp @@ -1,12 +1,14 @@ -#include +#include #include #include #include #include "architecture.h" #include "builder.h" #include "component.h" +#include "csourcefile.h" #include "externaltask.h" #include "gnucompiler.h" +#include "objcsourcefile.h" #include "objectfile.h" #include "sourcefile.h" #include "sourcepackage.h" @@ -14,13 +16,56 @@ using namespace std; using namespace Msp; +namespace { + +const char *cpus[] = +{ + "athlonxp", "athlon-xp", + "armv7a", "armv7-a", + 0 +}; + +} + GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t): Tool(b, a, t) { - if(architecture->is_native()) - system_path.push_back("/usr/include"); + if(tag=="CC") + { + input_suffixes.push_back(".c"); + aux_suffixes.push_back(".h"); + } + else if(tag=="CXX") + { + input_suffixes.push_back(".cpp"); + input_suffixes.push_back(".cc"); + aux_suffixes.push_back(".hpp"); + } + else if(tag=="OBJC") + { + input_suffixes.push_back(".m"); + build_info.libs.push_back("objc"); + } else - system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include"); + throw invalid_argument("GnuCompiler::GnuCompiler"); + + set_command((tag=="CXX" ? "g++" : "gcc"), true); +} + +Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const +{ + if(tag=="OBJC") + return new ObjCSourceFile(builder, comp, path); + else + return new CSourceFile(builder, comp, path); +} + +Target *GnuCompiler::create_source(const FS::Path &path) const +{ + if(tag=="OBJC") + return new ObjCSourceFile(builder, path); + else + return new CSourceFile(builder, path); } Target *GnuCompiler::create_target(const list &sources, const string &) @@ -54,34 +99,80 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const void GnuCompiler::do_prepare() { + bool path_found = false; + const FS::Path &sysroot = build_info.sysroot; + executable = builder.get_vfs().find_binary(command); if(executable) { ExternalTask::Arguments argv; argv.push_back(executable->get_path().str()); - argv.push_back("-dumpversion"); + argv.push_back("-Wp,-v"); + argv.push_back("-E"); + if(tag=="CXX") + argv.push_back("-xc++"); + if(!sysroot.empty()) + argv.push_back("--sysroot="+sysroot.str()); + argv.push_back("-"); builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end()))); try { - version = strip(ExternalTask::run_and_capture_output(argv)); - builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version)); + string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true); + string::size_type start = 0; + bool record_path = false; + while(start search starts here:")) + { + record_path = true; + path_found = true; + } + else if(!output.compare(start, 19, "End of search list.")) + record_path = false; + 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)); + system_path.push_back(path); + } + start = newline+1; + } } - catch(const runtime_error &) + catch(const runtime_error &e) { } } + + if(!path_found) + { + builder.get_logger().log("tools", format("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"); + } } Task *GnuCompiler::run(const Target &target) const { const ObjectFile &object = dynamic_cast(target); - const Component &comp = *object.get_component(); ExternalTask::Arguments argv; argv.push_back(executable->get_path().str()); argv.push_back("-c"); - const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path()); + BuildInfo binfo; + target.collect_build_info(binfo); + + 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)); + if(tag=="OBJC" && binfo.standards.count(tag)) + argv.push_back("-fobjc-std="+get_item(binfo.standards, tag)); + if(binfo.warning_level>=1) { argv.push_back("-Wall"); @@ -111,8 +202,15 @@ Task *GnuCompiler::run(const Target &target) const argv.push_back("-Winline"); } if(binfo.fatal_warnings) + { argv.push_back("-Werror"); + argv.push_back("-Wno-error=deprecated-declarations"); + } } + + 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) { argv.push_back("-iquote"); @@ -120,6 +218,7 @@ Task *GnuCompiler::run(const Target &target) const } for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i) argv.push_back("-I"+i->str()); + for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i) { if(i->second.empty()) @@ -127,6 +226,7 @@ Task *GnuCompiler::run(const Target &target) const else argv.push_back(format("-D%s=%s", i->first, i->second)); } + if(binfo.debug) argv.push_back("-ggdb"); if(binfo.optimize) @@ -138,20 +238,43 @@ Task *GnuCompiler::run(const Target &target) const } if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin") argv.push_back("-pthread"); - if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && architecture->get_system()!="windows") + 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()) argv.push_back(format("-m%d", architecture->get_bits())); - const string &cpu = architecture->get_cpu(); + string cpu = architecture->get_cpu(); if(!cpu.empty()) + { + for(unsigned i=0; cpus[i]; i+=2) + if(cpu==cpus[i]) + { + cpu = cpus[i+1]; + break; + } argv.push_back("-march="+cpu); + } + + if(!architecture->get_fpu().empty()) + { + if(architecture->get_type()=="x86") + { + argv.push_back("-mfpmath="+architecture->get_fpu()); + if(architecture->get_fpu()=="sse") + argv.push_back("-msse2"); + } + else if(architecture->get_type()=="arm") + { + argv.push_back("-mfpu="+architecture->get_fpu()); + argv.push_back("-mfloat-abi=softfp"); + } + } FS::Path obj_path = object.get_path(); FS::Path src_path = object.get_source().get_path(); - FS::Path work_dir = comp.get_package().get_source_directory(); + FS::Path work_dir = object.get_component()->get_package().get_source_directory(); argv.push_back("-o"); argv.push_back(relative(obj_path, work_dir).str());