X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=b8b25152e70acfce73e0c9f9e313daf8460f3979;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=6335aaf3cc4f51ce513b06ad3735de751e05db56;hpb=f41742cb2b21241634c123561b71ee1667cb1ff4;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 6335aaf..b8b2515 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -28,7 +28,8 @@ const char *cpus[] =
 }
 
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
-	Tool(b, a, t)
+	Tool(b, a, t),
+	version(0)
 {
 	if(tag=="CC")
 	{
@@ -68,10 +69,10 @@ Target *GnuCompiler::create_source(const FS::Path &path) const
 		return new CSourceFile(builder, path);
 }
 
-Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
+Target *GnuCompiler::create_target(const vector<Target *> &sources, const string &)
 {
 	if(sources.size()!=1)
-		throw invalid_argument("GnuCCompiler::create_target");
+		throw invalid_argument("GnuCompiler::create_target");
 	SourceFile &source = dynamic_cast<SourceFile &>(*sources.front());
 	ObjectFile *obj = new ObjectFile(builder, *source.get_component(), source);
 	obj->set_tool(*this);
@@ -80,13 +81,17 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 
 string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 {
-	string result = FS::basename(executable->get_path());
+	if(!executable)
+		return string();
+
+	string result = Tool::create_build_signature(binfo);
 	if(!architecture->get_cpu().empty())
 	{
 		result += ",m";
 		result += architecture->get_cpu();
 	}
-	result += ',';
+	if(binfo.debug || binfo.optimize)
+		result += ',';
 	if(binfo.debug)
 		result += 'g';
 	if(binfo.optimize)
@@ -98,11 +103,17 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 }
 
 void GnuCompiler::do_prepare()
+{
+	executable = builder.get_vfs().find_binary(command);
+	prepare_syspath();
+	prepare_version();
+}
+
+void GnuCompiler::prepare_syspath()
 {
 	bool path_found = false;
 	const FS::Path &sysroot = build_info.sysroot;
 
-	executable = builder.get_vfs().find_binary(command);
 	if(executable)
 	{
 		ExternalTask::Arguments argv;
@@ -115,7 +126,7 @@ void GnuCompiler::do_prepare()
 			argv.push_back("--sysroot="+sysroot.str());
 		argv.push_back("-");
 
-		builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+		builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
 		try
 		{
 			string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
@@ -134,26 +145,57 @@ void GnuCompiler::do_prepare()
 				else if(record_path)
 				{
 					FS::Path path = strip(output.substr(start, newline-start));
-					builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
+					builder.get_logger().log("tools", "Got %s system path: %s", tag, path);
 					system_path.push_back(path);
 				}
 				start = newline+1;
 			}
 		}
-		catch(const runtime_error &e)
+		catch(const runtime_error &)
 		{ }
 	}
 
 	if(!path_found)
 	{
-		builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+		builder.get_logger().log("tools", "No %s system path found, using defaults", tag);
 		if(!sysroot.empty())
 			system_path.push_back(sysroot/"usr/include");
 		else if(architecture->is_native())
 			system_path.push_back("/usr/include");
 		else
-			system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+			system_path.push_back(format("/usr/%s/include", architecture->get_cross_prefix()));
+	}
+}
+
+void GnuCompiler::prepare_version()
+{
+	if(!executable)
+		return;
+
+	prepare_version("-dumpversion");
+	if(version>=0x70000)
+		prepare_version("-dumpfullversion");
+	builder.get_logger().log("tools", "%s version is %d.%d.%d", FS::basename(executable->get_path()), version>>16, (version>>8)&0xFF, version&0xFF);
+}
+
+void GnuCompiler::prepare_version(const string &arg)
+{
+	ExternalTask::Arguments argv;
+	argv.push_back(executable->get_path().str());
+	argv.push_back(arg);
+
+	builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
+	try
+	{
+		string version_str = strip(ExternalTask::run_and_capture_output(argv));
+
+		vector<string> version_parts = split(version_str, '.');
+		version = 0;
+		for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
+			version |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
 	}
+	catch(const runtime_error &)
+	{ }
 }
 
 Task *GnuCompiler::run(const Target &target) const
@@ -169,9 +211,9 @@ Task *GnuCompiler::run(const Target &target) const
 
 	string tag_for_std = (tag=="OBJC" ? "CC" : tag);
 	if(binfo.standards.count(tag_for_std))
-		argv.push_back("-std="+get_item(binfo.standards, tag_for_std));
+		argv.push_back("-std="+get_item(binfo.standards, tag_for_std).str());
 	if(tag=="OBJC" && binfo.standards.count(tag))
-		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag));
+		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag).str());
 
 	if(binfo.warning_level>=1)
 	{
@@ -180,6 +222,8 @@ Task *GnuCompiler::run(const Target &target) const
 		{
 			argv.push_back("-Wextra");
 			argv.push_back("-Wundef");
+			if(version>=0x80000)
+				argv.push_back("-Wno-cast-function-type");
 		}
 		if(binfo.warning_level>=3)
 		{
@@ -211,20 +255,20 @@ Task *GnuCompiler::run(const Target &target) const
 	const FS::Path &sysroot = binfo.sysroot;
 	if(!sysroot.empty())
 		argv.push_back("--sysroot="+sysroot.str());
-	for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+	for(const FS::Path &p: binfo.local_incpath)
 	{
 		argv.push_back("-iquote");
-		argv.push_back(i->str());
+		argv.push_back(p.str());
 	}
-	for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		argv.push_back("-I"+i->str());
+	for(const FS::Path &p: binfo.incpath)
+		argv.push_back("-I"+p.str());
 
-	for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+	for(const auto &kvp: binfo.defines)
 	{
-		if(i->second.empty())
-			argv.push_back(format("-D%s", i->first));
+		if(kvp.second.empty())
+			argv.push_back(format("-D%s", kvp.first));
 		else
-			argv.push_back(format("-D%s=%s", i->first, i->second));
+			argv.push_back(format("-D%s=%s", kvp.first, kvp.second));
 	}
 
 	if(binfo.debug)
@@ -235,14 +279,15 @@ Task *GnuCompiler::run(const Target &target) const
 			argv.push_back("-Os");
 		else
 			argv.push_back(format("-O%d", binfo.optimize));
+		if(binfo.debug)
+			argv.push_back("-fno-omit-frame-pointer");
 	}
 	if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
 		argv.push_back("-pthread");
 	if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
 		argv.push_back("-fPIC");
 
-	const Architecture &native_arch = builder.get_native_arch();
-	if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
+	if((architecture->get_type()=="x86" || architecture->get_type()=="ppc") && !architecture->is_native())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
 	string cpu = architecture->get_cpu();
@@ -261,9 +306,17 @@ Task *GnuCompiler::run(const Target &target) const
 	{
 		if(architecture->get_type()=="x86")
 		{
-			argv.push_back("-mfpmath="+architecture->get_fpu());
+			if(architecture->get_fpu()=="387")
+				argv.push_back("-mfpmath=387");
+			else if(!architecture->get_fpu().compare(0, 3, "sse"))
+				argv.push_back("-mfpmath=sse");
+
 			if(architecture->get_fpu()=="sse")
 				argv.push_back("-msse2");
+			else if(architecture->get_fpu()=="sse3")
+				argv.push_back("-msse3");
+			else if(architecture->get_fpu()=="sse4.1")
+				argv.push_back("-msse4.1");
 		}
 		else if(architecture->get_type()=="arm")
 		{