X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=ea04fbeacfb79ca92f444b8b374b68f592477271;hb=a4f02f02d4682c7f504e46ff2ce8f93035fd36dd;hp=051722832ea66402e515733fb51cd5c6ad78aa8e;hpb=d1a42f852e58918708b5b0cbd90219f6a95aa75b;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 0517228..ea04fbe 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,13 +1,16 @@
 #include <msp/core/maputils.h>
 #include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
 #include "component.h"
+#include "csourcefile.h"
 #include "externaltask.h"
 #include "gnucompiler.h"
+#include "objcsourcefile.h"
 #include "objectfile.h"
 #include "sourcefile.h"
 #include "sourcepackage.h"
@@ -15,9 +18,41 @@
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+const char *cpus[] =
+{
+	"athlonxp", "athlon-xp",
+	"armv7a",   "armv7-a",
+	0
+};
+
+}
+
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const FS::Path &sysroot):
 	Tool(b, a, t)
 {
+	if(tag=="CC")
+	{
+		input_suffixes.push_back(".c");
+		aux_suffixes.push_back(".h");
+	}
+	else if(tag=="CXX")
+	{
+		input_suffixes.push_back(".cpp");
+		input_suffixes.push_back(".cc");
+		aux_suffixes.push_back(".hpp");
+	}
+	else if(tag=="OBJC")
+	{
+		input_suffixes.push_back(".m");
+		build_info.libs.push_back("objc");
+	}
+	else
+		throw invalid_argument("GnuCompiler::GnuCompiler");
+
+	set_command((tag=="CXX" ? "g++" : "gcc"), true);
+
 	if(!sysroot.empty())
 	{
 		build_info.sysroot = sysroot;
@@ -29,6 +64,22 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, con
 		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
 }
 
+Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
+{
+	if(tag=="OBJC")
+		return new ObjCSourceFile(builder, comp, path);
+	else
+		return new CSourceFile(builder, comp, path);
+}
+
+Target *GnuCompiler::create_source(const FS::Path &path) const
+{
+	if(tag=="OBJC")
+		return new ObjCSourceFile(builder, path);
+	else
+		return new CSourceFile(builder, path);
+}
+
 Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
 {
 	if(sources.size()!=1)
@@ -72,6 +123,14 @@ void GnuCompiler::do_prepare()
 		{
 			version = strip(ExternalTask::run_and_capture_output(argv));
 			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+
+			if(tag=="CXX")
+			{
+				const FS::Path &sysroot = build_info.sysroot;
+				FS::Path cxx_path = sysroot/"usr"/"include"/"c++"/version;
+				if(FS::is_dir(cxx_path))
+					system_path.push_back(cxx_path);
+			}
 		}
 		catch(const runtime_error &)
 		{ }
@@ -81,7 +140,6 @@ void GnuCompiler::do_prepare()
 Task *GnuCompiler::run(const Target &target) const
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
-	const Component &comp = *object.get_component();
 
 	ExternalTask::Arguments argv;
 	argv.push_back(executable->get_path().str());
@@ -125,7 +183,10 @@ Task *GnuCompiler::run(const Target &target) const
 			argv.push_back("-Winline");
 		}
 		if(binfo.fatal_warnings)
+		{
 			argv.push_back("-Werror");
+			argv.push_back("-Wno-error=deprecated-declarations");
+		}
 	}
 
 	const FS::Path &sysroot = binfo.sysroot;
@@ -165,13 +226,36 @@ Task *GnuCompiler::run(const Target &target) const
 	if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
-	const string &cpu = architecture->get_cpu();
+	string cpu = architecture->get_cpu();
 	if(!cpu.empty())
+	{
+		for(unsigned i=0; cpus[i]; i+=2)
+			if(cpu==cpus[i])
+			{
+				cpu = cpus[i+1];
+				break;
+			}
 		argv.push_back("-march="+cpu);
+	}
+
+	if(!architecture->get_fpu().empty())
+	{
+		if(architecture->get_type()=="x86")
+		{
+			argv.push_back("-mfpmath="+architecture->get_fpu());
+			if(architecture->get_fpu()=="sse")
+				argv.push_back("-msse2");
+		}
+		else if(architecture->get_type()=="arm")
+		{
+			argv.push_back("-mfpu="+architecture->get_fpu());
+			argv.push_back("-mfloat-abi=softfp");
+		}
+	}
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();
-	FS::Path work_dir = comp.get_package().get_source_directory();
+	FS::Path work_dir = object.get_component()->get_package().get_source_directory();
 
 	argv.push_back("-o");
 	argv.push_back(relative(obj_path, work_dir).str());