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

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 0517228..8d0bca7 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,13 +1,14 @@
 #include <msp/core/maputils.h>
-#include <msp/fs/dir.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,18 +16,59 @@
 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(!sysroot.empty())
+	if(tag=="CC")
 	{
-		build_info.sysroot = sysroot;
-		system_path.push_back(sysroot/"usr/include");
+		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 if(architecture->is_native())
-		system_path.push_back("/usr/include");
 	else
-		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+		throw invalid_argument("GnuCompiler::GnuCompiler");
+
+	set_command((tag=="CXX" ? "g++" : "gcc"), true);
+
+	if(!sysroot.empty())
+		build_info.sysroot = sysroot;
+}
+
+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 &)
@@ -65,23 +107,48 @@ void GnuCompiler::do_prepare()
 	{
 		ExternalTask::Arguments argv;
 		argv.push_back(executable->get_path().str());
-		argv.push_back("-dumpversion");
+		argv.push_back("-Wp,-v");
+		argv.push_back("-E");
+		if(tag=="CXX")
+			argv.push_back("-xc++");
+		const FS::Path &sysroot = build_info.sysroot;
+		if(!sysroot.empty())
+			argv.push_back("--sysroot="+sysroot.str());
+		argv.push_back("-");
 
+		string prog = FS::basename(executable->get_path());
 		builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
 		try
 		{
-			version = strip(ExternalTask::run_and_capture_output(argv));
-			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+			string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
+			string::size_type start = 0;
+			bool record_path = false;
+			while(start<output.size())
+			{
+				string::size_type newline = output.find('\n', start);
+				if(!output.compare(start, 34, "#include <...> search starts here:"))
+					record_path = true;
+				else if(!output.compare(start, 19, "End of search list."))
+					record_path = false;
+				else if(record_path)
+				{
+					FS::Path path = strip(output.substr(start, newline-start));
+					builder.get_logger().log("tools", format("Got %s (%s) system path: %s", prog, tag, path));
+					system_path.push_back(path);
+				}
+				start = newline+1;
+			}
+		}
+		catch(const runtime_error &e)
+		{
+			problems.push_back("Unable to determine system path");
 		}
-		catch(const runtime_error &)
-		{ }
 	}
 }
 
 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 +192,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 +235,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());