[gentoo-commits] gentoo-alt r1625 - trunk/toolchain-prefix-wrapper/ld

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2008-04-21 09:39:21 +0000 (Mon, 21 Apr 2008)
New Revision: 1625

Modified:
   trunk/toolchain-prefix-wrapper/ld/ldplugin.h
   trunk/toolchain-prefix-wrapper/ld/ldwrapper.c
Log:
provide root (without trailing slash), eprefix and triplet for both host and target in LdPluginIn data

Modified: trunk/toolchain-prefix-wrapper/ld/ldplugin.h
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/ldplugin.h	2008-04-21 09:37:29 UTC (rev 1624)
+++ trunk/toolchain-prefix-wrapper/ld/ldplugin.h	2008-04-21 09:39:21 UTC (rev 1625)
@@ -13,11 +13,24 @@
 
 typedef int (*LdPluginFct)(LdPluginData*);
 
+typedef struct _HostConfig {
+	String* eprefix;
+	String* triplet;
+} HostConfig;
+
 typedef struct _LdPluginIn {
+	HostConfig  host;
+	String*     root; /* "${ROOT%/}" */
+	HostConfig  target;
 	StringList* argList;
 	StringList* userLibpath;
 	StringList* sysLibpath;
 	StringList* sysRunpath;
+
+	/* cached flags */
+	int haveRoot:1;
+	int isCrossTriplet:1;
+	int isCrossEprefix:1;
 } LdPluginIn;
 
 typedef struct _LdPluginOut {

Modified: trunk/toolchain-prefix-wrapper/ld/ldwrapper.c
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/ldwrapper.c	2008-04-21 09:37:29 UTC (rev 1624)
+++ trunk/toolchain-prefix-wrapper/ld/ldwrapper.c	2008-04-21 09:39:21 UTC (rev 1625)
@@ -41,25 +41,12 @@
 
 #define dprintf DEBUG() && fprintf
 
-typedef struct _HostConfig {
-	String* eprefix;
-	String* triplet;
-} HostConfig;
-
 typedef struct _LdWrapperData {
 	String* name; /* basename(argv[0]), mainly for diagnostics */
 	struct stat arg0stat; /* stat(argv[0]) */
 
 	String* bin; /* the target binary to be executed (on host) */
 
-	HostConfig host;
-
-	String* root; /* ROOT the target is (temporary) installed in */
-	HostConfig target;
-
-	int isCrossTriplet:1;
-	int isCrossEprefix:1;
-
 	StringList* envpath;
 	String* _ctarget_binutilsbin_; /* cached string "/${CTARGET}/binutils-bin/" */
 
@@ -85,7 +72,8 @@
 		/* cache the string "/${CTARGET}/binutils-bin/" */
 		char const binutilsbin[] = "/binutils-bin/";
 		data->_ctarget_binutilsbin_ = StringCreateConcat("/", 1
-			, StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet)
+			, StringGetBuffer(data->pluginIn.target.triplet)
+			, StringGetLength(data->pluginIn.target.triplet)
 			, "/binutils-bin/", strlen("/binutils-bin/")
 		, NULL);
 		if (data->_ctarget_binutilsbin_ == NULL) {
@@ -253,7 +241,8 @@
 
 	envfile = TextfileOpenConcatName(ENVD_BASE_BINUTILS, strlen(ENVD_BASE_BINUTILS),
 		"config-", strlen("config-"),
-		StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+		StringGetBuffer(data->pluginIn.target.triplet),
+		StringGetLength(data->pluginIn.target.triplet),
 	NULL);
 	if (envfile == NULL && errno != ENOENT) {
 		wrapper_exit("%s wrapper: %s\n",
@@ -286,11 +275,12 @@
 	 * CHOST == CTARGET: PATH=/gentoo/portage/host.eprefix/usr/${CHOST}/binutils-bin/${BVER}
 	 * CHOST != CTARGET: PATH=/gentoo/portage/host.eprefix/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
 	 */
-	if (data->isCrossTriplet) {
+	if (data->pluginIn.isCrossTriplet) {
 		bindir = StringCreateConcat(
 			GENTOO_PORTAGE_EPREFIX, strlen(GENTOO_PORTAGE_EPREFIX),
 			"/usr/", strlen("/usr/"),
-			StringGetBuffer(data->host.triplet), StringGetLength(data->host.triplet),
+			StringGetBuffer(data->pluginIn.host.triplet),
+			StringGetLength(data->pluginIn.host.triplet),
 			StringGetBuffer(data->_ctarget_binutilsbin_),
 				StringGetLength(data->_ctarget_binutilsbin_),
 			StringGetBuffer(currentBVER), StringGetLength(currentBVER),
@@ -352,7 +342,8 @@
 	   execute the real binary in there... */
 	binpath_command = StringCreateConcat(BINUTILS_CONFIG, strlen(BINUTILS_CONFIG),
 		" --get-bin-path ", strlen(" --get-bin-path "),
-		StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+		StringGetBuffer(data->pluginIn.target.triplet),
+		StringGetLength(data->pluginIn.target.triplet),
 	NULL);
 	if (binpath_command == NULL) {
 		wrapper_exit("%s wrapper: %s\n",
@@ -494,16 +485,20 @@
 {
 	add_libpath(data, data->pluginIn.sysRunpath, AddLibpath,
 		"append target's toolchain-libdir to sys-runpath",
-		StringGetBuffer(data->target.eprefix), StringGetLength(data->target.eprefix),
+		StringGetBuffer(data->pluginIn.target.eprefix),
+		StringGetLength(data->pluginIn.target.eprefix),
 		"/usr/", strlen("/usr/"),
-		StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+		StringGetBuffer(data->pluginIn.target.triplet),
+		StringGetLength(data->pluginIn.target.triplet),
 		"/lib/gcc", strlen("/lib/gcc"),
 	NULL);
 	add_libpath(data, data->pluginIn.sysRunpath, AddLibpath,
 		"append target's toolchain-libdir to sys-runpath",
-		StringGetBuffer(data->target.eprefix), StringGetLength(data->target.eprefix),
+		StringGetBuffer(data->pluginIn.target.eprefix),
+		StringGetLength(data->pluginIn.target.eprefix),
 		"/usr/", strlen("/usr/"),
-		StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+		StringGetBuffer(data->pluginIn.target.triplet),
+		StringGetLength(data->pluginIn.target.triplet),
 		"/lib", strlen("/lib"),
 	NULL);
 }
@@ -529,13 +524,16 @@
 	while(l->path != NULL) {
 		if (add_libpath(data, data->pluginIn.sysLibpath, TestAndAddLibpath,
 				"append target's system-libdir to sys-libpath",
-				StringGetBuffer(data->root), StringGetLength(data->root),
-				StringGetBuffer(data->target.eprefix), StringGetLength(data->target.eprefix),
+				StringGetBuffer(data->pluginIn.root),
+				StringGetLength(data->pluginIn.root),
+				StringGetBuffer(data->pluginIn.target.eprefix),
+				StringGetLength(data->pluginIn.target.eprefix),
 				l->path, l->len,
 		NULL)) {
 			add_libpath(data, data->pluginIn.sysRunpath, AddLibpath,
 				"append target's system-libdir to sys-runpath",
-				StringGetBuffer(data->target.eprefix), StringGetLength(data->target.eprefix),
+				StringGetBuffer(data->pluginIn.target.eprefix),
+				StringGetLength(data->pluginIn.target.eprefix),
 				l->path, l->len,
 			NULL);
 		}
@@ -549,38 +547,48 @@
 	/* if "${ROOT}${TPREFIX}/usr/${CTARGET}/lib" exists,
 	 * 1) add it to sysLibpath
 	 */
-	if (data->isCrossTriplet) {
+	if (data->pluginIn.isCrossTriplet) {
 		add_libpath(data, data->pluginIn.sysLibpath, AddLibpath,
 			"append host's target-binutils libdir to sys-libpath",
-			StringGetBuffer(data->host.eprefix), StringGetLength(data->host.eprefix),
+			StringGetBuffer(data->pluginIn.host.eprefix),
+			StringGetLength(data->pluginIn.host.eprefix),
 			"/usr/", strlen("/usr/"),
-			StringGetBuffer(data->host.triplet), StringGetLength(data->host.triplet),
+			StringGetBuffer(data->pluginIn.host.triplet),
+			StringGetLength(data->pluginIn.host.triplet),
 			"/", strlen("/"),
-			StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+			StringGetBuffer(data->pluginIn.target.triplet),
+			StringGetLength(data->pluginIn.target.triplet),
 			"/lib/gcc", strlen("/lib/gcc"),
 		NULL);
 		add_libpath(data, data->pluginIn.sysLibpath, AddLibpath,
 			"append host's target-binutils libdir to sys-libpath",
-			StringGetBuffer(data->host.eprefix), StringGetLength(data->host.eprefix),
+			StringGetBuffer(data->pluginIn.host.eprefix),
+			StringGetLength(data->pluginIn.host.eprefix),
 			"/usr/", strlen("/usr/"),
-			StringGetBuffer(data->host.triplet), StringGetLength(data->host.triplet),
+			StringGetBuffer(data->pluginIn.host.triplet),
+			StringGetLength(data->pluginIn.host.triplet),
 			"/", strlen("/"),
-			StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+			StringGetBuffer(data->pluginIn.target.triplet),
+			StringGetLength(data->pluginIn.target.triplet),
 			"/lib", strlen("/lib"),
 		NULL);
 	} else {
 		add_libpath(data, data->pluginIn.sysLibpath, AddLibpath,
 			"append host's target-binutils libdir to sys-libpath",
-			StringGetBuffer(data->host.eprefix), StringGetLength(data->host.eprefix),
+			StringGetBuffer(data->pluginIn.host.eprefix),
+			StringGetLength(data->pluginIn.host.eprefix),
 			"/usr/", strlen("/usr/"),
-			StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+			StringGetBuffer(data->pluginIn.target.triplet),
+			StringGetLength(data->pluginIn.target.triplet),
 			"/lib/gcc", strlen("/lib/gcc"),
 		NULL);
 		add_libpath(data, data->pluginIn.sysLibpath, AddLibpath,
 			"append host's target-binutils libdir to sys-libpath",
-			StringGetBuffer(data->host.eprefix), StringGetLength(data->host.eprefix),
+			StringGetBuffer(data->pluginIn.host.eprefix),
+			StringGetLength(data->pluginIn.host.eprefix),
 			"/usr/", strlen("/usr/"),
-			StringGetBuffer(data->target.triplet), StringGetLength(data->target.triplet),
+			StringGetBuffer(data->pluginIn.target.triplet),
+			StringGetLength(data->pluginIn.target.triplet),
 			"/lib", strlen("/lib"),
 		NULL);
 	}
@@ -613,23 +621,25 @@
 	struct libdir const * l = libdirs;
 
 	/* native build only */
-	if (data->isCrossTriplet) return;
+	if (data->pluginIn.isCrossTriplet) return;
 	/* not needed when same-prefix without ROOT */
-	if (! data->isCrossEprefix && StringGetLength(data->root) == 0) return;
+	if (! data->pluginIn.isCrossEprefix && !data->pluginIn.haveRoot) return;
 
 	while(l->path != NULL) {
 		if (add_libpath(data, data->pluginIn.sysLibpath, TestAndAddLibpath,
 				"append host's system-libdir to sys-libpath",
-				StringGetBuffer(data->host.eprefix), StringGetLength(data->host.eprefix),
+				StringGetBuffer(data->pluginIn.host.eprefix),
+				StringGetLength(data->pluginIn.host.eprefix),
 				l->path, l->len,
 			NULL)
-		 && data->isCrossEprefix
-		 && StringGetLength(data->root) == 0
+		 && data->pluginIn.isCrossEprefix
+		 && ! data->pluginIn.haveRoot
 		) {
 			/* add to runpath only when cross-prefix without ROOT */
 			add_libpath(data, data->pluginIn.sysRunpath, AddLibpath,
 				"append host's system-libdir to sys-runpath",
-				StringGetBuffer(data->host.eprefix), StringGetLength(data->host.eprefix),
+				StringGetBuffer(data->pluginIn.host.eprefix),
+				StringGetLength(data->pluginIn.host.eprefix),
 				l->path, l->len,
 			NULL);
 		}
@@ -760,23 +770,24 @@
 	}
 
 	/* builtins */
-	data.host.triplet = StringCreateConcat(CHOST, strlen(CHOST), NULL);
-	if (data.host.triplet == NULL) {
+	data.pluginIn.host.triplet = StringCreateConcat(CHOST, strlen(CHOST), NULL);
+	if (data.pluginIn.host.triplet == NULL) {
 		wrapper_exit("%s wrapper: %s\n",
 			StringGetBuffer(data.name), strerror(errno));
 	}
 
-	data.host.eprefix = StringCreateConcat(
+	data.pluginIn.host.eprefix = StringCreateConcat(
 		GENTOO_PORTAGE_EPREFIX, strlen(GENTOO_PORTAGE_EPREFIX),
 	NULL);
-	if (data.host.eprefix == NULL) {
+	if (data.pluginIn.host.eprefix == NULL) {
 		wrapper_exit("%s wrapper: %s\n",
 			StringGetBuffer(data.name), strerror(errno));
 	}
 
 	if (stat(argv[0], &data.arg0stat) != 0) {
 		tmpString = StringCreateConcat(
-			StringGetBuffer(data.host.eprefix), StringGetLength(data.host.eprefix),
+			StringGetBuffer(data.pluginIn.host.eprefix),
+			StringGetLength(data.pluginIn.host.eprefix),
 			"/usr/bin/", strlen("/usr/bin/"),
 			StringGetBuffer(data.name), StringGetLength(data.name),
 		NULL);
@@ -799,21 +810,22 @@
 	}
 	len = strlen(found);
 	while(len > 0 && found[len-1] == '/') len --;
-	data.root = StringCreateConcat(found, len, NULL);
-	if (data.root == NULL) {
+	data.pluginIn.root = StringCreateConcat(found, len, NULL);
+	if (data.pluginIn.root == NULL) {
 		wrapper_exit("%s wrapper: %s\n",
 			StringGetBuffer(data.name), strerror(errno));
 	}
+	data.pluginIn.haveRoot = StringGetLength(data.pluginIn.root) > 0 ? 1 : 0;
 
 	found = getenv("EPREFIX");
-	if (found && !StringIsEqual(data.host.eprefix, 0, found, -1)) {
-		data.target.eprefix = StringCreateConcat(found, -1, NULL);
-		data.isCrossEprefix = 1;
+	if (found && !StringIsEqual(data.pluginIn.host.eprefix, 0, found, -1)) {
+		data.pluginIn.target.eprefix = StringCreateConcat(found, -1, NULL);
+		data.pluginIn.isCrossEprefix = 1;
 	} else {
-		data.target.eprefix = StringDup(data.host.eprefix);
-		data.isCrossEprefix = 0;
+		data.pluginIn.target.eprefix = StringDup(data.pluginIn.host.eprefix);
+		data.pluginIn.isCrossEprefix = 0;
 	}
-	if (data.target.eprefix == NULL) {
+	if (data.pluginIn.target.eprefix == NULL) {
 		wrapper_exit("%s wrapper: %s\n",
 			StringGetBuffer(data.name), strerror(errno));
 	}
@@ -822,22 +834,24 @@
 	if (found == NULL) {
 		found = CTARGET();
 	}
-	data.target.triplet = StringCreateConcat(found, -1, NULL);
-	if (data.target.triplet == NULL) {
+	data.pluginIn.target.triplet = StringCreateConcat(found, -1, NULL);
+	if (data.pluginIn.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));
+		StringGetBuffer(data.name), StringGetBuffer(data.pluginIn.host.triplet));
 	dprintf(stderr, "%s wrapper: ctarget '%s'\n",
-		StringGetBuffer(data.name), StringGetBuffer(data.target.triplet));
+		StringGetBuffer(data.name), StringGetBuffer(data.pluginIn.target.triplet));
 	dprintf(stderr, "%s wrapper: host eprefix '%s'\n",
-		StringGetBuffer(data.name), StringGetBuffer(data.host.eprefix));
+		StringGetBuffer(data.name), StringGetBuffer(data.pluginIn.host.eprefix));
 	dprintf(stderr, "%s wrapper: target eprefix '%s'\n",
-		StringGetBuffer(data.name), StringGetBuffer(data.target.eprefix));
+		StringGetBuffer(data.name), StringGetBuffer(data.pluginIn.target.eprefix));
 
-	data.isCrossTriplet = StringIsEqualString(data.host.triplet, data.target.triplet) ? 0 : 1;
+	data.pluginIn.isCrossTriplet = StringIsEqualString(
+		data.pluginIn.host.triplet, data.pluginIn.target.triplet
+	) ? 0 : 1;
 
 	find_wrapper_binutils(&data);
 
@@ -898,7 +912,10 @@
 
 	/* Ok, lets do it one more time ... */
 	if (execv(StringGetBuffer(data.bin), newargv) < 0)
-		wrapper_exit("Could not run/locate \"%s/%s\" (%s)\n", StringGetBuffer(data.target.triplet), StringGetBuffer(data.name), StringGetBuffer(data.bin));
+		wrapper_exit("Could not run/locate \"%s/%s\" (%s)\n",
+			StringGetBuffer(data.pluginIn.target.triplet),
+			StringGetBuffer(data.name),
+			StringGetBuffer(data.bin));
 
 	return 0;
 }

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