[gentoo-commits] gentoo-alt r1602 - in trunk/toolchain-prefix-wrapper: . ld

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2008-02-04 21:42:40 +0000 (Mon, 04 Feb 2008)
New Revision: 1602

Added:
   trunk/toolchain-prefix-wrapper/ld/binutils-config.h
Modified:
   trunk/toolchain-prefix-wrapper/binutils-config.in
   trunk/toolchain-prefix-wrapper/ld/Makefile.am
   trunk/toolchain-prefix-wrapper/ld/ldplugin.h
   trunk/toolchain-prefix-wrapper/ld/ldwrapper.c
Log:
during binutils-config for native ld, ld-wrapper is configured using env-vars
to use the new binutils without etc/env.d/ configfile, because this is
invalid in case that version might have just been unmerged.


Modified: trunk/toolchain-prefix-wrapper/binutils-config.in
===================================================================
--- trunk/toolchain-prefix-wrapper/binutils-config.in	2008-02-04 17:56:28 UTC (rev 1601)
+++ trunk/toolchain-prefix-wrapper/binutils-config.in	2008-02-04 21:42:40 UTC (rev 1602)
@@ -125,53 +125,40 @@
 				# the target in the cp that follows
 				local oldumask=$(umask)
 				umask 077
-				local ctargetfile="${TMPDIR:-${BPREFIX}/tmp}"/ctarget-$$.c
-				rm -f "${ctargetfile}"
+				local ctargetstem="${TMPDIR:-${BPREFIX}/tmp}"/binutils-config-ctarget-$$
+				local plugins=
+				if [[ ${TARGET} != ${HOST} ]]; then
+					# cross linker
+					plugins="${plugins}${plugins:+,}gnu"
+					# allow debugging any plugin
+					[[ -z ${LDPLUGINS} ]] || plugins=${LDPLUGINS}
+				else
+					case ${TARGET} in
+					*-darwin*) plugins="${plugins}${plugins:+,}darwin" ;;
+					*-aix*) plugins="${plugins}${plugins:+,}aix" ;;
+					*-hpux*) plugins="${plugins}${plugins:+,}hpux" ;;
+					*-linux* | *-solaris*) plugins="${plugins}${plugins:+,}gnu" ;;
+					*)	eerror "unknown platform ${CTARGET}"
+						exit 1
+						;;
+					esac
+				fi
+				rm -f "${ctargetstem}".*
 				(
-					plugins=
-					echo "#include <ldplugin.h>"
-					echo "char const *CTARGET=\"${TARGET}\";"
-					if [[ ${TARGET} != ${HOST} ]]; then
-						# cross linker
-						plugins="${plugins} gnu"
-						# allow debugging any plugin
-						[[ -z ${LDPLUGINS} ]] || plugins=${LDPLUGINS}
-					else
-						local ldversion=$("${EROOT}${BINPATH}/${x}" --version 2>/dev/null)
-						if [[ $? -eq 0 && ${ldversion} == *GNU* ]]; then
-							plugins="${plugins} gnu"
-						else
-							case ${TARGET} in
-							*-darwin*) plugins="${plugins} darwin" ;;
-							*-aix*) plugins="${plugins} aix" ;;
-							*-hpux*) plugins="${plugins} hpux" ;;
-							*-linux* | *-solaris*) plugins="${plugins} gnu" ;;
-							*)	eerror "unknown platform ${CTARGET}"
-								exit 1
-								;;
-							esac
-						fi
-					fi
-					for plugin in ${plugins}; do
-						echo "#include <${plugin}plugin.h>"
-					done
-					echo "LdPluginFct const* LDPLUGINS() {"
-					echo "  static const LdPluginFct plugins[] = {"
-					for plugin in ${plugins}; do
-						echo " ${plugin}plugin,"
-					done
-					echo " 0 };"
-					echo " return plugins; };"
-					echo -n "int DEBUG(void) { return "
-					[[ ${DEBUG} == yes ]] && echo "1; }" || echo "0; }"
-				) > "${ctargetfile}" || return 1
+					echo "#include <binutils-config.h>"
+					echo "char const *CTARGET(void) { return \"${TARGET}\"; }"
+					echo "char const* LDPLUGINS() { return \"${plugins}\"; }"
+					[[ ${DEBUG} == yes ]] \
+						&& echo "int DEBUG(void) { return 1; }" \
+						|| echo "int DEBUG(void) { return 0; }"
+				) > "${ctargetstem}".c || return 1
 				umask ${oldumask} || return 1
+				set_BUILD
 				local cc=$(type -p "${CC}")
-				[[ -z ${cc} ]] && set_BUILD
-				[[ -z ${cc} ]] && [[ ${HOST} == ${BUILD} ]] && cc=$(type -p "${BUILD_CC}")
 				[[ -z ${cc} ]] && cc=$(type -p "${HOST}-gcc")
 				[[ -z ${cc} ]] && cc=$(type -p "${HOST}-cc")
-				if [[ -z ${cc} && ${HOST} == ${BUILD} ]]; then
+				if [[ ${HOST} == ${BUILD} ]]; then
+					[[ -z ${cc} ]] && cc=$(type -p "${BUILD_CC}")
 					[[ -z ${cc} ]] && cc=$(type -p gcc)
 					[[ -z ${cc} ]] && cc=$(type -p cc)
 				fi
@@ -179,15 +166,19 @@
 					echo -n "Cannot find compiler for ${HOST} (try setting CC)"
 					return 1
 				fi
-				rm -f "${EROOT}${BINPATH_LINKS}/${x}.new" > /dev/null || return 1
-				if [[ -z ${ROOT%/} && ${TARGET} == ${HOST} ]]; then
-					# allow current ld-wrapper find the new ld,
-					# since the old one may be unmerged already.
-					export PATH="${EPREFIX}/${BINPATH}:${PATH}"
+
+				if [[ -z ${ROOT%/} && ${TARGET} == ${HOST} && ${EPREFIX} == ${BPREFIX} ]]; then
+					# builtin ld-wrapper config may be out-of-date,
+					# so configure it by environment.
+					export BINUTILS_CONFIG_LD="${EPREFIX}/${BINPATH}/${x}"
+					export BINUTILS_CONFIG_LDTARGET="${HOST}"
+					export BINUTILS_CONFIG_LDPLUGINS="${plugins}"
 				fi
-				"${cc}" -o "${EROOT}${BINPATH_LINKS}/${x}.new" "${ctargetfile}" \
-					"-I${wrapper}" "${wrapper}/libbinutils-config.a" ${CFLAGS} || return 1
-				[[ ${DEBUG} == yes ]] || rm -f "${ctargetfile}" || return 1
+				rm -f "${EROOT}${BINPATH_LINKS}/${x}.new" > /dev/null || return 1
+				"${cc}" ${CFLAGS} -o "${EROOT}${BINPATH_LINKS}/${x}.new" \
+					"${ctargetstem}".c "-I${wrapper}" \
+					"${wrapper}/libbinutils-config.a" || return 1
+				[[ ${DEBUG} == yes ]] || rm -f "${ctargetstem}".* || return 1
 				mv -f "${EROOT}${BINPATH_LINKS}/${x}"{.new,} || return 1
 				touch -r "${EROOT}/${BINPATH}/${x}" "${EROOT}${BINPATH_LINKS}/${x}" || return 1
 			;;

Modified: trunk/toolchain-prefix-wrapper/ld/Makefile.am
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/Makefile.am	2008-02-04 17:56:28 UTC (rev 1601)
+++ trunk/toolchain-prefix-wrapper/ld/Makefile.am	2008-02-04 21:42:40 UTC (rev 1602)
@@ -7,6 +7,7 @@
 libmisc_LIBRARIES = libbinutils-config.a
 libbinutils_config_a_SOURCES = ldwrapper.c
 
+libbinutils_config_a_SOURCES += ldplugin.h binutils-config.h
 libbinutils_config_a_SOURCES += darwinplugin.c darwinplugin.h
 libbinutils_config_a_SOURCES += aixplugin.c aixplugin.h
 libbinutils_config_a_SOURCES += hpuxplugin.c hpuxplugin.h
@@ -16,13 +17,7 @@
 libbinutils_config_a_SOURCES += $(top_srcdir)/utils/textfile.c
 libbinutils_config_a_SOURCES += $(top_srcdir)/utils/textfile.h
 
-libmisc_HEADERS = ldplugin.h
-libmisc_HEADERS += darwinplugin.h
-libmisc_HEADERS += aixplugin.h
-libmisc_HEADERS += hpuxplugin.h
-libmisc_HEADERS += gnuplugin.h
-libmisc_HEADERS += $(top_srcdir)/utils/stringutil.h
-libmisc_HEADERS += $(top_srcdir)/utils/textfile.h
+libmisc_HEADERS = binutils-config.h
 
 libbinutils_config_a_CPPFLAGS = -I$(top_srcdir)/utils
 

Copied: trunk/toolchain-prefix-wrapper/ld/binutils-config.h (from rev 1598, trunk/toolchain-prefix-wrapper/ld/ldplugin.h)
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/binutils-config.h	                        (rev 0)
+++ trunk/toolchain-prefix-wrapper/ld/binutils-config.h	2008-02-04 21:42:40 UTC (rev 1602)
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2008 Gentoo Foundation
+ * Distributed under the terms of the GNU General Public License v2
+ * Authors: Michael Haubenwallner <haubi@g.o>
+ */
+
+#ifndef _BINUTILS_CONFIG_H_
+#define _BINUTILS_CONFIG_H_
+
+/* return comma separated list of plugin names to be called */
+extern char const* CTARGET(void);
+extern char const* LDPLUGINS(void);
+extern int DEBUG(void);
+
+#endif /* _BINUTILS_CONFIG_H_ */

Modified: trunk/toolchain-prefix-wrapper/ld/ldplugin.h
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/ldplugin.h	2008-02-04 17:56:28 UTC (rev 1601)
+++ trunk/toolchain-prefix-wrapper/ld/ldplugin.h	2008-02-04 21:42:40 UTC (rev 1602)
@@ -31,8 +31,4 @@
 	LdPluginOut* out;
 };
 
-extern LdPluginFct const* LDPLUGINS();
-
-extern int DEBUG(void);
-
 #endif /* _LDPLUGIN_H_ */

Modified: trunk/toolchain-prefix-wrapper/ld/ldwrapper.c
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/ldwrapper.c	2008-02-04 17:56:28 UTC (rev 1601)
+++ trunk/toolchain-prefix-wrapper/ld/ldwrapper.c	2008-02-04 21:42:40 UTC (rev 1602)
@@ -12,7 +12,12 @@
 #include <stringutil.h>
 #include <textfile.h>
 
+#include "binutils-config.h"
 #include "ldplugin.h"
+#include "aixplugin.h"
+#include "gnuplugin.h"
+#include "hpuxplugin.h"
+#include "darwinplugin.h"
 
 #define _REENTRANT
 #if !defined(_GNU_SOURCE)
@@ -38,8 +43,6 @@
 
 #define dprintf DEBUG() && fprintf
 
-extern const char* CTARGET;
-
 typedef struct _GccConfig {
 	String* version;
 	StringList* ldpath;
@@ -442,6 +445,20 @@
 	FILE *inpipe = NULL;
 	String* binpath_command;
 	char str[MAXPATHLEN + 1];
+	char const* env = getenv("BINUTILS_CONFIG_LD");
+	
+	if (env != NULL && *env != '\0') {
+		/* as we do linking during binutils-config,
+		 * we need some working ld-wrapper for gcc,
+		 * but the old one may be configured for the now unmerged ld.
+		 */
+		data->bin = StringCreateConcat(env, -1, NULL);
+		if (data->bin == NULL) {
+			wrapper_exit("%s wrapper: %s\n",
+				StringGetBuffer(data->name), strerror(errno));
+		}
+		return;
+	}
 
 	setup_ctarget_binutilsbin(data);
 
@@ -732,7 +749,7 @@
 		{ NULL, -1 },
 	};
 	struct libdir const * l = libdirs;
-	if (!data->isCrossTriplet && StringGetLength(data->root) == 0) {
+	if (data->isCrossTriplet || StringGetLength(data->root) == 0) {
 		return;
 	}
 	while(l->path != NULL) {
@@ -745,41 +762,87 @@
 	}
 }
 
-static void callPlugins(LdWrapperData* data, LdPluginFct const* plugins)
+static void callPlugin(LdWrapperData* data, LdPluginFct plugins)
 {
 	LdPluginData pluginData = {0};
 	LdPluginOut pluginOut = {0};
 
-	if (plugins == NULL) {
-		return;
+	pluginData.in = &data->pluginIn;
+	pluginData.out = &pluginOut;
+	pluginData.plugin = *plugins;
+
+	/* keep argv[0] */
+	pluginData.out->argList = StringListCreate(pluginData.in->argList, 0, 1);
+	if (pluginData.out->argList == NULL) {
+		wrapper_exit("%s wrapper: %s\n",
+			StringGetBuffer(data->name), strerror(errno));
 	}
 
-	while(*plugins != NULL) {
-		pluginData.in = &data->pluginIn;
-		pluginData.out = &pluginOut;
-		pluginData.plugin = *plugins;
-
-		/* keep argv[0] */
-		pluginData.out->argList = StringListCreate(pluginData.in->argList, 0, 1);
-		if (pluginData.out->argList == NULL) {
-			wrapper_exit("%s wrapper: %s\n",
+	if ((*plugins)(&pluginData) < 0) {
+		if (pluginData.out->diagnostics == NULL) {
+			wrapper_exit("%s wrapper: %s: %s\n",
+				StringGetBuffer(data->name), pluginData.out->diagnostics, strerror(errno));
+		} else {
+			wrapper_exit("%s wrapper could not run plugin: %s\n",
 				StringGetBuffer(data->name), strerror(errno));
 		}
+	}
+	if (pluginOut.argList != NULL) {
+		StringListDestroy(data->pluginIn.argList);
+		data->pluginIn.argList = pluginOut.argList;
+	}
+}
 
-		if ((*plugins)(&pluginData) < 0) {
-			if (pluginData.out->diagnostics == NULL) {
-				wrapper_exit("%s wrapper: %s: %s\n",
-					StringGetBuffer(data->name), pluginData.out->diagnostics, strerror(errno));
-			} else {
-				wrapper_exit("%s wrapper could not run plugin: %s\n",
-					StringGetBuffer(data->name), strerror(errno));
-			}
+typedef struct _KnownPlugin {
+	int namelen;
+	char const *name;
+	LdPluginFct plugin;
+} KnownPlugin;
+
+static int compareKnownPluginName(void const *v1, void const *v2)
+{
+	KnownPlugin const* p1 = (KnownPlugin const*)v1;
+	KnownPlugin const* p2 = (KnownPlugin const*)v2;
+	int rv;
+	rv = p1->namelen - p2->namelen;
+	if (rv) return rv;
+	return strncmp(p1->name, p2->name, p1->namelen);
+}
+
+/* call the plugins from comma-separated list of plugin-names */
+static void callPlugins(LdWrapperData* data, char const* plugins)
+{
+	char const *end;
+	static KnownPlugin const knownPlugins[] = {
+		/* keep sorted on namelen,name */
+		{ 3, "aix", aixplugin },
+		{ 3, "gnu", gnuplugin },
+		{ 4, "hpux", hpuxplugin },
+		{ 6, "darwin", darwinplugin },
+	};
+	KnownPlugin search;
+	KnownPlugin *found;
+
+	if (plugins == NULL) {
+		return;
+	}
+
+	while(plugins != NULL && *plugins != '\0') {
+		end = strchr(plugins, ',');
+		if (end == NULL) {
+			end = plugins + strlen(plugins);
 		}
-		if (pluginOut.argList != NULL) {
-			StringListDestroy(data->pluginIn.argList);
-			data->pluginIn.argList = pluginOut.argList;
+		search.name = plugins;
+		search.namelen = end - plugins;
+		found = bsearch(&search, knownPlugins,
+				sizeof(knownPlugins) / sizeof(knownPlugins[0]),
+				sizeof(knownPlugins[0]),
+				compareKnownPluginName);
+		if (found != NULL) {
+			callPlugin(data, found->plugin);
 		}
-		plugins++;
+		while (*end == ',') end++;
+		plugins = end;
 	}
 
 	return;
@@ -794,7 +857,6 @@
 	char **newargv = argv;
 	char const *found;
 	char const *tmp;
-	LdPluginFct builtinPlugins[] = { filterSysLibpath, NULL };
 
 	memset(&data, 0, sizeof(data));
 
@@ -881,12 +943,25 @@
 			StringGetBuffer(data.name), strerror(errno));
 	}
 
-	data.target.triplet = StringCreateConcat(CTARGET, -1, NULL);
+	found = getenv("BINUTILS_CONFIG_LDTARGET");
+	if (found == NULL) {
+		found = CTARGET();
+	}
+	data.target.triplet = StringCreateConcat(found, -1, NULL);
 	if (data.target.triplet == NULL) {
 		wrapper_exit("%s wrapper: %s\n",
 			StringGetBuffer(data.name), strerror(errno));
 	}
 
+	dprintf(stderr, "%s wrapper: chost '%s'\n",
+		StringGetBuffer(data.name), StringGetBuffer(data.host.triplet));
+	dprintf(stderr, "%s wrapper: ctarget '%s'\n",
+		StringGetBuffer(data.name), StringGetBuffer(data.target.triplet));
+	dprintf(stderr, "%s wrapper: host eprefix '%s'\n",
+		StringGetBuffer(data.name), StringGetBuffer(data.host.eprefix));
+	dprintf(stderr, "%s wrapper: target eprefix '%s'\n",
+		StringGetBuffer(data.name), StringGetBuffer(data.target.eprefix));
+
 	data.isCrossTriplet = StringIsEqualString(data.host.triplet, data.target.triplet) ? 0 : 1;
 
 	find_wrapper_binutils(&data);
@@ -965,10 +1040,14 @@
 	add_host_system_libdirs(&data);
 
 	/* filter out sys libpath's passed with "-L" */
-	callPlugins(&data, builtinPlugins);
+	callPlugin(&data, filterSysLibpath);
 
+	found = getenv("BINUTILS_CONFIG_LDPLUGINS");
+	if (found == NULL) {
+		found = LDPLUGINS();
+	}
 	/* call the target specific plugin */
-	callPlugins(&data, LDPLUGINS());
+	callPlugins(&data, found);
 
 	newargv = StringListToArgv(data.pluginIn.argList);
 	if (newargv == NULL) {

-- 
gentoo-commits@l.g.o mailing list