X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=9662bbaa6f08e2dbcaeef2f9a75c9df77818b99d;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=63ec6ba3f3dc5da4f60bd814a592547c0c1c1d15;hpb=76ede1d44e68182a2380260c22ec7be68c9817af;p=builder.git diff --git a/source/architecture.cpp b/source/architecture.cpp index 63ec6ba..9662bba 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; @@ -46,6 +49,8 @@ const char *fpus[] = { "387", "x86", "sse", "x86", + "sse3", "x86", + "sse4.1", "x86", "vfpv3", "arm", "neon", "arm", 0 @@ -65,6 +70,7 @@ const char *toolchains[] = { "gnu", "clang", + "msvc", 0 }; @@ -72,6 +78,7 @@ const char *aliases[] = { "pc", "x86", "x86_64", "x86-64", + "x64", "x86-64", "amd64", "x86-64", "i586", "pentium", "i686", "pentiumpro", @@ -89,24 +96,13 @@ const char *aliases[] = } Architecture::Architecture(Builder &b, const string &spec): - builder(b), - bits(0), - native(false) + builder(b) { 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; } @@ -136,6 +132,8 @@ Architecture::Architecture(Builder &b, const string &spec): { if((system=="darwin" || system=="freebsd") && builder.get_vfs().find_binary("clang")) toolchain = "clang"; + else if(system=="windows" && native) + toolchain = "msvc"; else toolchain = "gnu"; } @@ -147,68 +145,82 @@ Architecture::Architecture(Builder &b, const string &spec): name += format("-%s", fpu); name += format("-%d-%s-%s", bits, system, toolchain); - object_patterns.push_back(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")); - staticlib_patterns.push_back(Pattern("%.lib")); - executable_patterns.push_back(Pattern("%.exe")); + add_pattern("%.dll"); + if(toolchain=="msvc") + { + add_pattern("%.obj"); + add_pattern("%.lib"); + add_pattern("%_static.lib"); + } + else + { + add_pattern("%.o"); + add_pattern("lib%.dll"); + add_pattern("lib%.dll.a"); + add_pattern("lib%.a"); + } + add_pattern("%.exe"); } else { + add_pattern("%.o"); 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("%"); } } -bool Architecture::match_name(const string &pattern) const +bool Architecture::match_name(const string &pattern, unsigned *quality) 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) + for(const string &p: parts) { - if((*i=="32" && bits==32) || (*i=="64" && bits==64)) + if((p=="32" && bits==32) || (p=="64" && bits==64)) ; - else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain) + else if(p!=type && p!=cpu && p!=fpu && p!=system && p!=toolchain) + { + if(quality) + *quality = 0; return negate; + } } + + if(quality) + *quality = parts.size(); return !negate; } -string Architecture::best_match(const list &names) const +string Architecture::best_match(const vector &names) const { string best; - unsigned best_size = 0; - for(list::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) + unsigned best_quality = 0; + for(const string &n: names) + { + unsigned quality; + if(match_name(n, &quality)) + if(quality>best_quality) { - best = *i; - best_size = size; + best = n; + best_quality = quality; } - } + } 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 i=0; i parts = split(spec, "-"); resolve_aliases(parts); - for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) + for(const string &p: parts) { bool ok = false; for(unsigned j=0; (!ok && types[j]); ++j) - if(*i==types[j]) + if(p==types[j]) { - if(!type.empty() && *i!=type) + if(!type.empty() && p!=type) throw invalid_argument("Conflicting type specification"); - type = *i; + type = p; ok = true; } for(unsigned j=0; (!ok && cpus[j]); j+=2) - if(*i==cpus[j]) + if(p==cpus[j]) { if(type.empty()) type = cpus[j+1]; else if(cpus[j+1]!=type) throw invalid_argument("Conflicting CPU specification"); - cpu = *i; + cpu = p; ok = true; } for(unsigned j=0; (!ok && fpus[j]); j+=2) - if(*i==fpus[j]) + if(p==fpus[j]) { if(fpus[j+1]!=type) throw invalid_argument("Conflicting FPU specification"); - fpu = *i; + fpu = p; ok = true; } for(unsigned j=0; (!ok && systems[j]); ++j) - if(*i==systems[j]) + if(p==systems[j]) { - system = *i; + system = p; ok = true; } for(unsigned j=0; (!ok && toolchains[j]); ++j) - if(*i==toolchains[j]) + if(p==toolchains[j]) { - toolchain = *i; + toolchain = p; ok = true; } - if(!ok && (*i=="32" || *i=="64")) + if(!ok && (p=="32" || p=="64")) { - bits = lexical_cast(*i); + bits = lexical_cast(p); ok = true; } if(!ok) - throw invalid_argument("Unrecognized part in arch specification: "+*i); + throw invalid_argument("Unrecognized part in arch specification: "+p); } }