svn commit: r284422 - head/usr.sbin/crunch/crunchgen

Tijl Coosemans tijl at FreeBSD.org
Mon Jun 15 19:48:29 UTC 2015


Author: tijl
Date: Mon Jun 15 19:48:28 2015
New Revision: 284422
URL: https://svnweb.freebsd.org/changeset/base/284422

Log:
  Change -Wl,-r back to -r so gcc doesn't pass --relax to the linker on some
  architectures.
  
  PR:		200881

Modified:
  head/usr.sbin/crunch/crunchgen/crunchgen.c

Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c
==============================================================================
--- head/usr.sbin/crunch/crunchgen/crunchgen.c	Mon Jun 15 19:28:07 2015	(r284421)
+++ head/usr.sbin/crunch/crunchgen/crunchgen.c	Mon Jun 15 19:48:28 2015	(r284422)
@@ -1110,7 +1110,7 @@ prog_makefile_rules(FILE *outmk, prog_t 
 		fprintf(outmk, " $(%s_LIBS)", p->ident);
 
 	fprintf(outmk, "\n");
-	fprintf(outmk, "\t$(CC) -nostdlib -Wl,-dc -Wl,-r -o %s.lo %s_stub.o $(%s_OBJPATHS)",
+	fprintf(outmk, "\t$(CC) -nostdlib -Wl,-dc -r -o %s.lo %s_stub.o $(%s_OBJPATHS)",
 	    p->name, p->name, p->ident);
 	if (p->libs)
 		fprintf(outmk, " $(%s_LIBS)", p->ident);


More information about the svn-src-all mailing list