X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=0ec9222a2d28587f8127f01cbaa1e01008496459;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=470934e0fe7e32432f7d9b344690e9bcbd5be047;hpb=08731ed6bc22bdd9324081fe99fff69dde1a7951;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 470934e..0ec9222 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")
 	{
@@ -50,6 +51,7 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
 		throw invalid_argument("GnuCompiler::GnuCompiler");
 
 	set_command((tag=="CXX" ? "g++" : "gcc"), true);
+	set_run(_run);
 }
 
 Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -68,10 +70,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);
@@ -83,13 +85,14 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 	if(!executable)
 		return string();
 
-	string result = FS::basename(executable->get_path());
+	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)
@@ -101,11 +104,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;
@@ -118,7 +127,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);
@@ -137,44 +146,77 @@ 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()));
 	}
 }
 
-Task *GnuCompiler::run(const Target &target) const
+void GnuCompiler::prepare_version()
 {
-	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
+	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 ObjectFile &object)
+{
+	const GnuCompiler &tool = dynamic_cast<const GnuCompiler &>(*object.get_tool());
+	const Architecture &arch = *tool.get_architecture();
+
+	ExternalTask::Arguments argv;
+	argv.push_back(tool.get_executable()->get_path().str());
 	argv.push_back("-c");
 
 	BuildInfo binfo;
-	target.collect_build_info(binfo);
+	object.collect_build_info(binfo);
 
-	string tag_for_std = (tag=="OBJC" ? "CC" : tag);
+	const std::string &tool_tag = tool.get_tag();
+	string tag_for_std = (tool_tag=="OBJC" ? "CC" : tool_tag);
 	if(binfo.standards.count(tag_for_std))
-		argv.push_back("-std="+get_item(binfo.standards, tag_for_std));
-	if(tag=="OBJC" && binfo.standards.count(tag))
-		argv.push_back("-fobjc-std="+get_item(binfo.standards, tag));
+		argv.push_back("-std="+get_item(binfo.standards, tag_for_std).str());
+	if(tool_tag=="OBJC" && binfo.standards.count(tool_tag))
+		argv.push_back("-fobjc-std="+get_item(binfo.standards, tool_tag).str());
 
 	if(binfo.warning_level>=1)
 	{
@@ -183,13 +225,15 @@ Task *GnuCompiler::run(const Target &target) const
 		{
 			argv.push_back("-Wextra");
 			argv.push_back("-Wundef");
+			if(tool.version>=0x80000)
+				argv.push_back("-Wno-cast-function-type");
 		}
 		if(binfo.warning_level>=3)
 		{
 			argv.push_back("-pedantic");
 			argv.push_back("-Wno-long-long");
 			argv.push_back("-Wshadow");
-			if(tag=="CC")
+			if(tool_tag=="CC")
 			{
 				argv.push_back("-Wc++-compat");
 				argv.push_back("-Wstrict-prototypes");
@@ -214,20 +258,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)
@@ -238,17 +282,18 @@ 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")
+	if(binfo.threads && arch.get_system()!="windows" && arch.get_system()!="darwin")
 		argv.push_back("-pthread");
-	if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
+	if(object.is_used_in_shared_library() && arch.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())
-		argv.push_back(format("-m%d", architecture->get_bits()));
+	if((arch.get_type()=="x86" || arch.get_type()=="ppc") && !arch.is_native())
+		argv.push_back(format("-m%d", arch.get_bits()));
 
-	string cpu = architecture->get_cpu();
+	string cpu = arch.get_cpu();
 	if(!cpu.empty())
 	{
 		for(unsigned i=0; cpus[i]; i+=2)
@@ -260,17 +305,25 @@ Task *GnuCompiler::run(const Target &target) const
 		argv.push_back("-march="+cpu);
 	}
 
-	if(!architecture->get_fpu().empty())
+	if(!arch.get_fpu().empty())
 	{
-		if(architecture->get_type()=="x86")
+		if(arch.get_type()=="x86")
 		{
-			argv.push_back("-mfpmath="+architecture->get_fpu());
-			if(architecture->get_fpu()=="sse")
+			if(arch.get_fpu()=="387")
+				argv.push_back("-mfpmath=387");
+			else if(!arch.get_fpu().compare(0, 3, "sse"))
+				argv.push_back("-mfpmath=sse");
+
+			if(arch.get_fpu()=="sse")
 				argv.push_back("-msse2");
+			else if(arch.get_fpu()=="sse3")
+				argv.push_back("-msse3");
+			else if(arch.get_fpu()=="sse4.1")
+				argv.push_back("-msse4.1");
 		}
-		else if(architecture->get_type()=="arm")
+		else if(arch.get_type()=="arm")
 		{
-			argv.push_back("-mfpu="+architecture->get_fpu());
+			argv.push_back("-mfpu="+arch.get_fpu());
 			argv.push_back("-mfloat-abi=softfp");
 		}
 	}