-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <limits>
#ifndef WIN32
#include <sys/utsname.h>
#endif
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/strings/utils.h>
#include "architecture.h"
#include "builder.h"
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())
return native_arch.get_tool(t);
}
else
- throw KeyError("Unknown tool", t);
+ throw invalid_argument("Unknown tool");
}
bool Architecture::match_name(const string &pattern) const
for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
{
string part = resolve_alias(*i);
- if(part!=type && part!=cpu && part!=system)
+ if((part=="32" && bits==32) || (part=="64" && bits==64))
+ ;
+ else if(part!=type && part!=cpu && part!=system)
return false;
}
return true;
if(part==types[j])
{
if(!type.empty() && part!=type)
- throw InvalidParameterValue("Conflicting type specification");
+ throw invalid_argument("Conflicting type specification");
type = part;
ok = true;
}
if(type.empty())
type = cpus[j+1];
else if(cpus[j+1]!=type)
- throw InvalidParameterValue("Conflicting CPU specification");
+ throw invalid_argument("Conflicting CPU specification");
cpu = part;
ok = true;
}
}
if(!ok)
- throw InvalidParameterValue("Unrecognized part in arch specification: "+*i);
+ throw invalid_argument("Unrecognized part in arch specification: "+*i);
}
}