X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=627ba66ccf6ab6defbcaa960c09fbca775845b14;hb=HEAD;hp=436a45afcfb8e0036381089ae7f596adf98e1b03;hpb=433f9ef196b6f5af6bb38447b650f5afaa5a783a;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
deleted file mode 100644
index 436a45a..0000000
--- a/source/architecture.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/* $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/utils.h>
-#include "architecture.h"
-#include "builder.h"
-
-using namespace std;
-using namespace Msp;
-
-namespace {
-
-const char *types[] =
-{
-	"pc",
-	"arm",
-	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,
-	0
-};
-
-const char *systems[] =
-{
-	"linux",
-	"freebsd",
-	"windows",
-	0
-};
-
-}
-
-Architecture::Architecture(Builder &b, const string &spec):
-	builder(b),
-	bits(0),
-	native(false)
-{
-	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
-		bits = sizeof(void *)*numeric_limits<unsigned char>::digits;
-		native = true;
-	}
-	else
-	{
-		parse_specification(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)
-		{
-			if(type==native_arch.type)
-				bits = native_arch.bits;
-			else
-				bits = 32;
-		}
-
-		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
-			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(i->second[0]=='-')
-			return cross_prefix+i->second;
-		else
-			return i->second;
-	}
-
-	const Architecture &native_arch = builder.get_native_arch();
-	if(this!=&native_arch)
-	{
-		if(!cross_prefix.empty())
-			return cross_prefix+"-"+native_arch.get_tool(t);
-		else
-			return native_arch.get_tool(t);
-	}
-	else
-		throw KeyError("Unknown tool", t);
-}
-
-bool Architecture::match_name(const string &pattern) const
-{
-	vector<string> parts = split(pattern, "-");
-	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-	{
-		if(*i!=type && *i!=cpu && *i!=system)
-			return false;
-	}
-	return true;
-}
-
-void Architecture::parse_specification(const string &spec)
-{
-	vector<string> parts = split(spec, "-");
-	for(vector<string>::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");
-				type = *i;
-				ok = true;
-			}
-		for(unsigned j=0; (!ok && cpus[j]); j+=3)
-			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);
-				ok = true;
-			}
-		for(unsigned j=0; (!ok && systems[j]); ++j)
-			if(*i==systems[j])
-			{
-				system = *i;
-				ok = true;
-			}
-		if(!ok && (*i=="32" || *i=="64"))
-		{
-			bits = lexical_cast<unsigned>(*i);
-			ok = true;
-		}
-		if(!ok)
-			throw InvalidParameterValue("Unrecognized part in arch specification: "+*i);
-	}
-}
-
-
-Architecture::Loader::Loader(Architecture &a):
-	arch(a)
-{
-	add("prefix", &Architecture::cross_prefix);
-	add("tool",   &Loader::tool);
-}
-
-void Architecture::Loader::tool(const string &t, const string &p)
-{
-	arch.tools[t] = p;
-}