#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;
0
};
+const char *fpus[] =
+{
+ "387", "x86",
+ "sse", "x86",
+ "vfpv3", "arm",
+ "neon", "arm",
+ 0
+};
+
const char *systems[] =
{
"linux",
0
};
+const char *toolchains[] =
+{
+ "gnu",
+ "clang",
+ 0
+};
+
const char *aliases[] =
{
"pc", "x86",
"power macintosh", "ppc",
"armeabi", "arm",
"v7a", "armv7a",
+ "gcc", "gnu",
+ "mingw", "windows-gnu",
0
};
{
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;
}
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"));
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"));
}
else
{
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 vector<string> &names) const
+{
+ string best;
+ unsigned best_size = 0;
+ 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
+ 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<string> &parts)
{
for(unsigned i=0; i<parts.size(); ++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])
{
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);