X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Farchitecture.cpp;h=75a64607a395f7726357d52887fb06e65953277c;hp=07f5dbfb0c09159e7fa4fcbb14e7d9e3e6ff03af;hb=650560b14cac4bb35589b5b8db99197c5e1345cc;hpb=cee450d7cc932811b0d119a132bc9981eb480584 diff --git a/source/architecture.cpp b/source/architecture.cpp index 07f5dbf..75a6460 100644 --- a/source/architecture.cpp +++ b/source/architecture.cpp @@ -1,11 +1,14 @@ #include -#ifndef WIN32 -#include -#endif #include #include #include "architecture.h" #include "builder.h" +#include "executable.h" +#include "importlibrary.h" +#include "objectfile.h" +#include "sharedlibrary.h" +#include "staticlibrary.h" +#include "sysutils.h" using namespace std; using namespace Msp; @@ -14,26 +17,40 @@ namespace { const char *types[] = { - "pc", + "x86", "arm", + "ppc", 0 }; const char *cpus[] = { - "i386", "pc", - "i486", "pc", - "pentium", "pc", - "pentiumpro", "pc", - "pentium2", "pc", - "pentium3", "pc", - "pentium4", "pc", - "core2", "pc", - "k6", "pc", - "athlon", "pc", - "athlonxp", "pc", - "athlon64", "pc", + "i386", "x86", + "i486", "x86", + "pentium", "x86", + "pentiumpro", "x86", + "pentium2", "x86", + "pentium3", "x86", + "pentium4", "x86", + "core2", "x86", + "nehalem", "x86", + "k6", "x86", + "athlon", "x86", + "athlonxp", "x86", + "athlon64", "x86", "armv5", "arm", + "armv6", "arm", + "armv7", "arm", + "armv7a", "arm", + 0 +}; + +const char *fpus[] = +{ + "387", "x86", + "sse", "x86", + "vfpv3", "arm", + "neon", "arm", 0 }; @@ -47,13 +64,29 @@ const char *systems[] = 0 }; +const char *toolchains[] = +{ + "gnu", + "clang", + 0 +}; + const char *aliases[] = { - "x86", "pc", - "i586", "pentium", - "i686", "pentiumpro", - "x86_64", "athlon64", - "win32", "windows", + "pc", "x86", + "x86_64", "x86-64", + "x64", "x86-64", + "amd64", "x86-64", + "i586", "pentium", + "i686", "pentiumpro", + "corei7", "nehalem", + "win32", "windows-32", + "win64", "windows-64", + "power macintosh", "ppc", + "armeabi", "arm", + "v7a", "armv7a", + "gcc", "gnu", + "mingw", "windows-gnu", 0 }; @@ -66,18 +99,9 @@ Architecture::Architecture(Builder &b, const string &spec): { if(spec.empty()) { -#ifdef WIN32 - system = "windows"; -#else - utsname un; - if(uname(&un)==0) - { - system = tolower(un.sysname); - parse_specification(tolower(un.machine)); - // We really only want to set type for the default arch - cpu.clear(); - } -#endif + parse_specification(get_system_type()); + // We really only want to set type for the default arch + cpu.clear(); bits = sizeof(void *)*numeric_limits::digits; native = true; } @@ -102,29 +126,40 @@ Architecture::Architecture(Builder &b, const string &spec): else if(bits==native_arch.bits) native = true; } + + if(toolchain.empty()) + { + if((system=="darwin" || system=="freebsd") && builder.get_vfs().find_binary("clang")) + toolchain = "clang"; + else + toolchain = "gnu"; + } + name = type; if(!cpu.empty()) name += format("-%s", cpu); - name += format("-%d-%s", bits, system); + if(!fpu.empty()) + name += format("-%s", fpu); + name += format("-%d-%s-%s", bits, system, toolchain); + add_pattern("%.o"); if(system=="windows") { - sharedlib_patterns.push_back(Pattern("%.dll")); - sharedlib_patterns.push_back(Pattern("lib%.dll")); - /* XXX Hack: Consider import libraries (*.dll.a) as dynamic libraries, - even though technically they are linked statically. */ - sharedlib_patterns.push_back(Pattern("lib%.dll.a")); - staticlib_patterns.push_back(Pattern("lib%.a")); - executable_patterns.push_back(Pattern("%.exe")); + add_pattern("%.dll"); + add_pattern("lib%.dll"); + add_pattern("lib%.dll.a"); + add_pattern("lib%.a"); + add_pattern("%.lib"); + add_pattern("%.exe"); } else { if(system=="darwin") - sharedlib_patterns.push_back(Pattern("lib%.dylib")); + add_pattern("lib%.dylib"); else - sharedlib_patterns.push_back(Pattern("lib%.so")); - staticlib_patterns.push_back(Pattern("lib%.a")); - executable_patterns.push_back(Pattern("%")); + add_pattern("lib%.so"); + add_pattern("lib%.a"); + add_pattern("%"); } } @@ -132,65 +167,130 @@ bool Architecture::match_name(const string &pattern) const { bool negate = (pattern[0]=='!'); vector parts = split(pattern.substr(negate), "-"); + resolve_aliases(parts); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) { - string part = resolve_alias(*i); - if((part=="32" && bits==32) || (part=="64" && bits==64)) + if((*i=="32" && bits==32) || (*i=="64" && bits==64)) ; - else if(part!=type && part!=cpu && part!=system) + else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain) return negate; } return !negate; } -string Architecture::resolve_alias(const string &part) const +string Architecture::best_match(const vector &names) const +{ + string best; + unsigned best_size = 0; + for(vector::const_iterator i=names.begin(); i!=names.end(); ++i) + if(match_name(*i)) + { + /* TODO Do full parse and alias resolution here? Otherwise x86 and + x86_64 are treated as equally good, even though the latter is more + specific. */ + unsigned size = 1; + for(string::const_iterator j=i->begin(); j!=i->end(); ++j) + size += (*j=='-'); + + if(size>best_size) + { + best = *i; + best_size = size; + } + } + + return best; +} + +template +void Architecture::add_pattern(const string &pat) +{ + filename_patterns[typeid(T).name()].push_back(Pattern(pat)); +} + +void Architecture::resolve_aliases(vector &parts) { - for(unsigned j=0; aliases[j]; j+=2) - if(part==aliases[j]) - return aliases[j+1]; + for(unsigned i=0; i rparts = split(replace, "-"); + parts[i] = rparts[0]; + parts.insert(parts.begin()+i+1, rparts.begin()+1, rparts.end()); + i += rparts.size()-1; + } + else + parts[i] = replace; + } + } } void Architecture::parse_specification(const string &spec) { vector parts = split(spec, "-"); + resolve_aliases(parts); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) { - string part = resolve_alias(*i); - bool ok = false; for(unsigned j=0; (!ok && types[j]); ++j) - if(part==types[j]) + if(*i==types[j]) { - if(!type.empty() && part!=type) + if(!type.empty() && *i!=type) throw invalid_argument("Conflicting type specification"); - type = part; + type = *i; ok = true; } for(unsigned j=0; (!ok && cpus[j]); j+=2) - if(part==cpus[j]) + if(*i==cpus[j]) { if(type.empty()) type = cpus[j+1]; else if(cpus[j+1]!=type) throw invalid_argument("Conflicting CPU specification"); - cpu = part; + cpu = *i; + ok = true; + } + + for(unsigned j=0; (!ok && fpus[j]); j+=2) + if(*i==fpus[j]) + { + if(fpus[j+1]!=type) + throw invalid_argument("Conflicting FPU specification"); + fpu = *i; ok = true; } for(unsigned j=0; (!ok && systems[j]); ++j) - if(part==systems[j]) + if(*i==systems[j]) + { + system = *i; + ok = true; + } + + for(unsigned j=0; (!ok && toolchains[j]); ++j) + if(*i==toolchains[j]) { - system = part; + toolchain = *i; ok = true; } - if(!ok && (part=="32" || part=="64")) + if(!ok && (*i=="32" || *i=="64")) { - bits = lexical_cast(part); + bits = lexical_cast(*i); ok = true; }