Adapt to changes in mspcore

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index fe0033891feb903867bc7eb037b8ca9d480c0943..3dd76fbf19f86e0e52fca14fee800fee04675dd6 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -1,11 +1,9 @@
 #include <limits>
-#ifndef WIN32
-#include <sys/utsname.h>
-#endif
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
+#include "sysutils.h"
 
 using namespace std;
 using namespace Msp;
@@ -42,6 +40,15 @@ const char *cpus[] =
        0
 };
 
+const char *fpus[] =
+{
+       "387",   "x86",
+       "sse",   "x86",
+       "vfpv3", "arm",
+       "neon",  "arm",
+       0
+};
+
 const char *systems[] =
 {
        "linux",
@@ -52,6 +59,13 @@ const char *systems[] =
        0
 };
 
+const char *toolchains[] =
+{
+       "gnu",
+       "clang",
+       0
+};
+
 const char *aliases[] =
 {
        "pc",              "x86",
@@ -65,6 +79,8 @@ const char *aliases[] =
        "power macintosh", "ppc",
        "armeabi",         "arm",
        "v7a",             "armv7a",
+       "gcc",             "gnu",
+       "mingw",           "windows-gnu",
        0
 };
 
@@ -77,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<unsigned char>::digits;
                native = true;
        }
@@ -113,11 +120,23 @@ 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);
 
+       object_patterns.push_back(Pattern("%.o"));
        if(system=="windows")
        {
                sharedlib_patterns.push_back(Pattern("%.dll"));
@@ -149,17 +168,17 @@ bool Architecture::match_name(const string &pattern) const
        {
                if((*i=="32" && bits==32) || (*i=="64" && bits==64))
                        ;
-               else if(*i!=type && *i!=cpu && *i!=system)
+               else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain)
                        return negate;
        }
        return !negate;
 }
 
-string Architecture::best_match(const list<string> &names) const
+string Architecture::best_match(const vector<string> &names) const
 {
        string best;
        unsigned best_size = 0;
-       for(list<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
+       for(vector<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
                if(match_name(*i))
                {
                        /* TODO Do full parse and alias resolution here?  Otherwise x86 and
@@ -236,6 +255,15 @@ void Architecture::parse_specification(const string &spec)
                                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])
                        {
@@ -243,6 +271,13 @@ void Architecture::parse_specification(const string &spec)
                                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<unsigned>(*i);