shithub: scc

Info  •  Files  •  Log  •  Branches

driver/posix: Pass -s to ld

Scc was spawning a strip program to strip the symbols
of al the objects generated. It is not required to do
that because -s usually affect only to the linked
executable and it simplifies the code.

--- a/src/cmd/cc/posix/cc.c

+++ b/src/cmd/cc/posix/cc.c

@@ -40,7 +40,6 @@

 	TEEAS,

 	AS,

 	LD,

-	STRIP,

 	LAST_TOOL,

 };

@@ -61,7 +60,6 @@

 	[TEEAS]  = {.bin = "tee",   .cmd = "tee"},

 	[AS]     = {.bin = "as",    .cmd = "as"},

 	[LD]     = {.bin = "ld",    .cmd = "ld"},

-	[STRIP]  = {.bin = "strip", .cmd = "strip"},

 };

 char *argv0;

@@ -201,6 +199,9 @@

 			addarg(tool, "-L");

 			addarg(tool, path(syslibs[n]));

 		}

+		if (sflag)

+			addarg(tool, "-s");

+

 		for (n = 0; syscrtsb[n]; ++n)

 			addarg(tool, path(syscrtsb[n]));

 		break;

@@ -285,14 +286,6 @@

 		t->outfile = xstrdup(objfile);

 		addarg(tool, t->outfile);

 		break;

-	case STRIP:

-		if (cflag || kflag) {

-			for (i = 0; i < objout.n; ++i)

-				addarg(tool, xstrdup(objout.s[i]));

-		}

-		if (!cflag && tools[LD].outfile)

-			addarg(tool, tools[LD].outfile);

-		break;

 	default:

 		break;

 	}

@@ -654,12 +647,8 @@

 		addarg(LD, xstrdup("-lcrt"));

 		for (n = 0; syscrtse[n]; ++n)

 			addarg(LD, path(syscrtse[n]));

-		spawn(settool(LD, NULL, LAST_TOOL));

-		validatetools();

-	}

-	if (sflag) {

-		spawn(settool(inittool(STRIP), NULL, LAST_TOOL));

+		spawn(settool(LD, NULL, LAST_TOOL));

 		validatetools();

 	}