X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=8bdd1bfe8fceef06070f91c6db73b20111e08b5d;hb=1f694afd5fc5e282c3e814d4f3a96ff0f7c928cd;hp=436a45afcfb8e0036381089ae7f596adf98e1b03;hpb=433f9ef196b6f5af6bb38447b650f5afaa5a783a;p=builder.git diff --git a/source/architecture.cpp b/source/architecture.cpp index 436a45a..8bdd1bf 100644 --- a/source/architecture.cpp +++ b/source/architecture.cpp @@ -1,18 +1,9 @@ -/* $Id$ - -This file is part of builder -Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include -#ifndef WIN32 -#include -#endif -#include +#include #include #include "architecture.h" #include "builder.h" +#include "sysutils.h" using namespace std; using namespace Msp; @@ -21,28 +12,40 @@ namespace { const char *types[] = { - "pc", + "x86", "arm", + "ppc", 0 }; const char *cpus[] = { - "i386", "pc", 0, - "i486", "pc", 0, - "pentium", "pc", 0, - "i586", "pc", "pentium", - "pentiumpro", "pc", 0, - "i686", "pc", "pentiumpro", - "pentium2", "pc", 0, - "pentium3", "pc", 0, - "pentium4", "pc", 0, - "core2", "pc", 0, - "k6", "pc", 0, - "athlon", "pc", 0, - "athlonxp", "pc", 0, - "athlon64", "pc", 0, - "armv5", "arm", 0, + "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 }; @@ -50,7 +53,34 @@ const char *systems[] = { "linux", "freebsd", + "darwin", "windows", + "android", + 0 +}; + +const char *toolchains[] = +{ + "gnu", + "clang", + 0 +}; + +const char *aliases[] = +{ + "pc", "x86", + "x86_64", "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 }; @@ -63,18 +93,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; } @@ -84,8 +105,6 @@ Architecture::Architecture(Builder &b, const string &spec): const Architecture &native_arch = builder.get_native_arch(); if(type.empty()) type = native_arch.type; - if(cpu.empty()) - cpu = native_arch.cpu; if(system.empty()) system = native_arch.system; if(!bits) @@ -98,116 +117,181 @@ Architecture::Architecture(Builder &b, const string &spec): if(type!=native_arch.type || system!=native_arch.system) cross_prefix = format("%s-%s", type, system); - else if(bits!=native_arch.bits) - { - build_info.cflags.push_back(format("-m%d", bits)); - build_info.ldflags.push_back(format("-m%d", bits)); - } - else + else if(bits==native_arch.bits) native = true; + } - if(!cpu.empty()) - build_info.cflags.push_back(format("-march=%s", cpu)); + 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); -} - -void Architecture::set_tool(const string &t, const string &p) -{ - tools[t] = p; -} + if(!fpu.empty()) + name += format("-%s", fpu); + name += format("-%d-%s-%s", bits, system, toolchain); -void Architecture::set_cross_prefix(const string &p) -{ - cross_prefix = p; -} - -std::string Architecture::get_tool(const string &t) const -{ - StringMap::const_iterator i = tools.find(t); - if(i!=tools.end()) + object_patterns.push_back(Pattern("%.o")); + if(system=="windows") { - if(i->second[0]=='-') - return cross_prefix+i->second; - else - return i->second; + 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")); } - - const Architecture &native_arch = builder.get_native_arch(); - if(this!=&native_arch) + else { - if(!cross_prefix.empty()) - return cross_prefix+"-"+native_arch.get_tool(t); + if(system=="darwin") + sharedlib_patterns.push_back(Pattern("lib%.dylib")); else - return native_arch.get_tool(t); + sharedlib_patterns.push_back(Pattern("lib%.so")); + staticlib_patterns.push_back(Pattern("lib%.a")); + executable_patterns.push_back(Pattern("%")); } - else - throw KeyError("Unknown tool", t); } bool Architecture::match_name(const string &pattern) const { - vector parts = split(pattern, "-"); + bool negate = (pattern[0]=='!'); + vector parts = split(pattern.substr(negate), "-"); + resolve_aliases(parts); for(vector::const_iterator i=parts.begin(); i!=parts.end(); ++i) { - if(*i!=type && *i!=cpu && *i!=system) - return false; + if((*i=="32" && bits==32) || (*i=="64" && bits==64)) + ; + else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain) + return negate; + } + return !negate; +} + +string Architecture::best_match(const list &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) + { + best = *i; + best_size = size; + } + } + + return best; +} + +void Architecture::resolve_aliases(vector &parts) +{ + 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; + } } - return true; } 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) { bool ok = false; + for(unsigned j=0; (!ok && types[j]); ++j) if(*i==types[j]) { if(!type.empty() && *i!=type) - throw InvalidParameterValue("Conflicting type specification"); + throw invalid_argument("Conflicting type specification"); type = *i; ok = true; } - for(unsigned j=0; (!ok && cpus[j]); j+=3) + + for(unsigned j=0; (!ok && cpus[j]); j+=2) if(*i==cpus[j]) { if(type.empty()) type = cpus[j+1]; else if(cpus[j+1]!=type) - throw InvalidParameterValue("Conflicting CPU specification"); - cpu = (cpus[j+2] ? cpus[j+2] : *i); + throw invalid_argument("Conflicting CPU specification"); + 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(*i==systems[j]) { system = *i; ok = true; } + + for(unsigned j=0; (!ok && toolchains[j]); ++j) + if(*i==toolchains[j]) + { + toolchain = *i; + ok = true; + } + if(!ok && (*i=="32" || *i=="64")) { bits = lexical_cast(*i); ok = true; } + if(!ok) - throw InvalidParameterValue("Unrecognized part in arch specification: "+*i); + throw invalid_argument("Unrecognized part in arch specification: "+*i); } } Architecture::Loader::Loader(Architecture &a): - arch(a) + DataFile::ObjectLoader(a) { add("prefix", &Architecture::cross_prefix); - add("tool", &Loader::tool); -} - -void Architecture::Loader::tool(const string &t, const string &p) -{ - arch.tools[t] = p; }