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

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2008-02-06 14:55:40 +0000 (Wed, 06 Feb 2008)
New Revision: 1605

Modified:
   trunk/toolchain-prefix-wrapper/ld/aixplugin.c
Log:
fixed aix plugin to behave more like aix system ld regarding options
-bsvr4, -R<runpath>, -blibpath:<runpath>, -bnolibpath. But still
keep extension to understand "-R<runpath>" even without "-bsvr4".


Modified: trunk/toolchain-prefix-wrapper/ld/aixplugin.c
===================================================================
--- trunk/toolchain-prefix-wrapper/ld/aixplugin.c	2008-02-06 14:52:55 UTC (rev 1604)
+++ trunk/toolchain-prefix-wrapper/ld/aixplugin.c	2008-02-06 14:55:40 UTC (rev 1605)
@@ -25,8 +25,11 @@
 	int err;
 	StringList *defaultRunpathList = NULL;
 	StringList *runpathList = NULL;
+	StringList *aixRunpathList = NULL;
 	String const *argString;
 	String *newString = NULL;
+	char libpath2runpath = 1; /* whether to record -L as runpath */
+	char svr4mode = 0; /* whether we are in -bsvr4 mode */
 	char const *argBuffer;
 	int argBufferLength;
 
@@ -41,20 +44,62 @@
 		if (runpathList == NULL)
 			break;
 
-		/* always pass "-brtl" */
-		if (StringListAppendConcat(data->out->argList, "-brtl", 5, NULL) < 0)
+		aixRunpathList = StringListCreate(NULL, 0, 0);
+		if (aixRunpathList == NULL
+		 || StringListAppendConcat(aixRunpathList, "/usr/lib", strlen("/usr/lib"), NULL) < 0
+		 || StringListAppendConcat(aixRunpathList, "/lib", strlen("/lib"), NULL) < 0
+		) break;
+
+		/* always use runtime linking (-brtl) */
+		if (StringListAppendConcat(data->out->argList, "-brtl", strlen("-brtl"), NULL) < 0)
 			break;
 
+		/* detect if we are in svr4 mode (-bsvr4).
+		 * "-R runpath" is only accepted in svr4 mode,
+		 * but we add "-R runpath" as extension in normal mode to add default runpath.
+		 */
 		for(argc = 1; argc < StringListGetSize(data->in->argList); argc++) {
 			argString = StringListGetString(data->in->argList, argc);
 			argBuffer = StringGetBuffer(argString);
+			if (strcmp(argBuffer, "-bsvr4") == 0) {
+				svr4mode = 1;
+			}
+		}
+
+		for(argc = 1; argc < StringListGetSize(data->in->argList); argc++) {
+			argString = StringListGetString(data->in->argList, argc);
+			argBuffer = StringGetBuffer(argString);
 			argBufferLength = StringGetLength(argString);
 
-			if (strncmp(argBuffer, "-blibpath:", 10) == 0) {
+			if (strcmp(argBuffer, "-bnolibpath") == 0) {
+				/* explicitly specified:
+				 * do not record -L path as runpath, specified explicitly.
+				 */
+				libpath2runpath = 0;
+				/* This also removes each runpath specified before. */
+				StringListClear(runpathList);
+				if (svr4mode) {
+					/* if not in svr4-mode, we accept -R as extension */
+					StringListClear(defaultRunpathList);
+				}
+				continue;
+			} else
+			if (strncmp(argBuffer, "-blibpath:", strlen("-blibpath:")) == 0) {
 				char const *curr, *next;
 
-				argBuffer += 10;
+				argBuffer += strlen("-blibpath:");
 
+				/* do not record -L path as runpath, we have explicit -blibpath: */
+				libpath2runpath = 0;
+
+				/* '-blibpath:' kills previous '-blibpath:' */
+				StringListClear(runpathList);
+
+				if (svr4mode) {
+					/* it also kills previous '-Rrunpathlist' in svr4mode */
+					StringListClear(defaultRunpathList);
+				}
+
 				for(curr = next = argBuffer; *next != '\0'; curr = next+1) {
 					for(next = curr; *next != '\0' && *next != ':'; next++);
 
@@ -63,12 +108,11 @@
 						continue;
 					}
 
-					/* search default path list */
-					if (StringListContains(data->in->sysLibpath, curr, next - curr))
-						continue;
-
 					/* unique out runpath */
-					if (StringListContains(runpathList, curr, next - curr))
+					if (StringListContains(runpathList, curr, next - curr)
+					 || StringListContains(data->in->sysLibpath, curr, next - curr)
+					 || StringListContains(aixRunpathList, curr, next - curr)
+					)
 						continue;
 
 					/* record this path into runpath list */
@@ -79,13 +123,19 @@
 				/* end "-blibpath:" handling */
 				continue;
 			} else
-			if (strncmp(argBuffer, "-R", 2) == 0) {
+			if (strncmp(argBuffer, "-R", strlen("-R")) == 0) {
 				/* extension:
 				 * collect additional default runpath from "-R runpath"
 				 */
 
-				argBuffer += 2;
-				argBufferLength -= 2;
+				if (svr4mode) {
+					/* in svr4 mode, '-R' kills previous '-blibpath:' arguments.
+					 * in normal mode, we implement -R as an extension.
+					 */
+					StringListClear(runpathList);
+				}
+				argBuffer += strlen("-R");
+				argBufferLength -= strlen("-R");
 
 				if (*argBuffer == 0 && argc < StringListGetSize(data->in->argList)) {
 					argc++;
@@ -93,7 +143,10 @@
 					argBuffer = StringGetBuffer(argString);
 					argBufferLength = StringGetLength(argString);
 				}
-				if (StringListContains(data->in->sysLibpath, argBuffer, argBufferLength))
+				if (StringListContains(defaultRunpathList, argBuffer, argBufferLength)
+				 || StringListContains(data->in->sysLibpath, argBuffer, argBufferLength)
+				 || StringListContains(aixRunpathList, argBuffer, argBufferLength)
+				)
 					continue;
 
 				if (StringListAppendConcat(defaultRunpathList, argBuffer, argBufferLength, NULL) < 0)
@@ -118,14 +171,16 @@
 		if (StringListAppendList(runpathList, data->in->sysRunpath, 0, -1) < 0)
 			break;
 
-		/* need to add /usr/lib:/lib to explicit runpath if any */
-		if (StringListAppendConcat(runpathList, "/usr/lib", 8, NULL) < 0)
+		/* need to add /usr/lib:/lib myself */
+		if (StringListAppendList(runpathList, aixRunpathList, 0, -1) < 0)
 			break;
-		if (StringListAppendConcat(runpathList, "/lib", 4, NULL) < 0)
-			break;
 
 		/* create runpath string: "-blibpath:libpath1:libpathN" */
-		newString = StringListJoin(runpathList, "-blibpath:", strlen("-blibpath:"), ":", strlen(":"), NULL, 0);
+		newString = StringListJoin(runpathList
+			, "-blibpath:", strlen("-blibpath:") /* start */
+			, ":", strlen(":")                   /* separator */
+			, NULL, 0                            /* end */
+		);
 		if (newString == NULL)
 			break;
 
@@ -140,9 +195,10 @@
 		err = 0;
 	} while(0);	/* end dummy loop */
 
-	if (newString != NULL) newString = StringDestroy(newString);
-	if (runpathList != NULL) runpathList = StringListDestroy(runpathList);
-	if (defaultRunpathList != NULL) defaultRunpathList = StringListDestroy(defaultRunpathList);
+	newString = StringDestroy(newString);
+	runpathList = StringListDestroy(runpathList);
+	defaultRunpathList = StringListDestroy(defaultRunpathList);
+	aixRunpathList = StringListDestroy(aixRunpathList);
 
 	return err;
 }

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