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
};
{
"linux",
"freebsd",
+ "darwin",
"windows",
+ "android",
0
};
const char *aliases[] =
{
- "i586", "pentium",
- "i686", "pentiumpro",
- "x86_64", "athlon64",
- "win32", "windows",
+ "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",
0
};
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)
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));
}
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;
-}
-
-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())
+ 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"));
+ 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 invalid_argument("Unknown tool");
}
bool Architecture::match_name(const string &pattern) const
{
- vector<string> parts = split(pattern, "-");
+ bool negate = (pattern[0]=='!');
+ vector<string> parts = split(pattern.substr(negate), "-");
+ resolve_aliases(parts);
for(vector<string>::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)
- return false;
+ else if(*i!=type && *i!=cpu && *i!=system)
+ return negate;
}
- return true;
+ return !negate;
}
-string Architecture::resolve_alias(const string &part) const
+void Architecture::resolve_aliases(vector<string> &parts)
{
- for(unsigned j=0; aliases[j]; j+=2)
- if(part==aliases[j])
- return aliases[j+1];
+ for(unsigned i=0; i<parts.size(); ++i)
+ {
+ const string &part = parts[i];
+ const char *replace = 0;
+ for(unsigned j=0; (!replace && aliases[j]); j+=2)
+ if(part==aliases[j])
+ replace = aliases[j+1];
- return part;
+ if(replace)
+ {
+ bool has_dash = false;
+ for(const char *c=replace; (!has_dash && *c); ++c)
+ has_dash = (*c=='-');
+
+ if(has_dash)
+ {
+ vector<string> 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<string> parts = split(spec, "-");
+ resolve_aliases(parts);
for(vector<string>::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 && systems[j]); ++j)
- if(part==systems[j])
+ if(*i==systems[j])
{
- system = part;
+ system = *i;
ok = true;
}
- if(!ok && (part=="32" || part=="64"))
+ if(!ok && (*i=="32" || *i=="64"))
{
- bits = lexical_cast<unsigned>(part);
+ bits = lexical_cast<unsigned>(*i);
ok = true;
}
Architecture::Loader::Loader(Architecture &a):
- arch(a)
+ DataFile::ObjectLoader<Architecture>(a)
{
add("prefix", &Architecture::cross_prefix);
- add("tool", &Loader::tool);
-}
-
-void Architecture::Loader::tool(const string &t, const string &p)
-{
- arch.tools[t] = p;
}
projects / builder.git / blobdiff