X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=6335aaf3cc4f51ce513b06ad3735de751e05db56;hb=f41742cb2b21241634c123561b71ee1667cb1ff4;hp=1180b4e89f1218a5d9f678b4415b3e7bd1c0a398;hpb=4fea1031bf55f4f4d7f17f529a89aa5945018446;p=builder.git diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index 1180b4e..6335aaf 100644 --- a/source/gnucompiler.cpp +++ b/source/gnucompiler.cpp @@ -1,11 +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" @@ -13,19 +16,59 @@ using namespace std; using namespace Msp; -GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n): - Tool(b, t) +namespace { + +const char *cpus[] = { - executable = builder.get_vfs().find_binary(n); + "athlonxp", "athlon-xp", + "armv7a", "armv7-a", + 0 +}; + +} - const Architecture &arch = builder.get_current_arch(); - if(arch.is_native()) - system_path.push_back("/usr/include"); +GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t): + Tool(b, a, t) +{ + 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/"+arch.get_cross_prefix()+"/include"); + throw invalid_argument("GnuCompiler::GnuCompiler"); + + set_command((tag=="CXX" ? "g++" : "gcc"), true); } -Target *GnuCompiler::create_target(const list &sources, const std::string &) const +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 &) { if(sources.size()!=1) throw invalid_argument("GnuCCompiler::create_target"); @@ -35,20 +78,147 @@ Target *GnuCompiler::create_target(const list &sources, const std::str return obj; } +string GnuCompiler::create_build_signature(const BuildInfo &binfo) const +{ + string result = FS::basename(executable->get_path()); + if(!architecture->get_cpu().empty()) + { + result += ",m"; + result += architecture->get_cpu(); + } + result += ','; + if(binfo.debug) + result += 'g'; + if(binfo.optimize) + { + result += 'O'; + result += (binfo.optimize>0 ? '0'+binfo.optimize : 's'); + } + return result; +} + +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("-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 + { + 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 &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(BuildInfo::WordList::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i) - argv.push_back("-W"+*i); + 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"); + if(binfo.warning_level>=2) + { + argv.push_back("-Wextra"); + argv.push_back("-Wundef"); + } + if(binfo.warning_level>=3) + { + argv.push_back("-pedantic"); + argv.push_back("-Wno-long-long"); + argv.push_back("-Wshadow"); + if(tag=="CC") + { + argv.push_back("-Wc++-compat"); + argv.push_back("-Wstrict-prototypes"); + } + } + if(binfo.warning_level>=4) + { + // Some truly paranoid warnings + argv.push_back("-Wstrict-overflow=4"); + argv.push_back("-Wfloat-equal"); + argv.push_back("-Wconversion"); + argv.push_back("-Wwrite-strings"); + 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"); + argv.push_back(i->str()); + } 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()) @@ -56,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) @@ -65,30 +236,49 @@ Task *GnuCompiler::run(const Target &target) const else argv.push_back(format("-O%d", binfo.optimize)); } - if(binfo.threads) + if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin") argv.push_back("-pthread"); - if(comp.get_type()==Component::LIBRARY) + if(object.is_used_in_shared_library() && architecture->get_system()!="windows") argv.push_back("-fPIC"); - const Architecture &arch = builder.get_current_arch(); const Architecture &native_arch = builder.get_native_arch(); - if(arch.get_bits()!=native_arch.get_bits()) - argv.push_back(format("-m%d", arch.get_bits())); + if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits()) + argv.push_back(format("-m%d", architecture->get_bits())); - const string &cpu = arch.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(); + 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()); argv.push_back(relative(src_path, work_dir).str()); - if(!builder.get_dry_run()) - FS::mkpath(FS::dirname(obj_path), 0755); - return new ExternalTask(argv, work_dir); }