Author: emaste
Date: Mon Mar 25 01:18:26 2019
New Revision: 345490
URL: https://svnweb.freebsd.org/changeset/base/345490

Log:
  Apply WITH_PIE changes to other binutils components
  
  Followon to r345489, explicitly specified bare .a libraries need
  ${PIE_SUFFIX} (although these still built).
  
  MFC with:     r345489

Modified:
  head/gnu/usr.bin/binutils/as/Makefile
  head/gnu/usr.bin/binutils/ld/Makefile
  head/gnu/usr.bin/binutils/objcopy/Makefile

Modified: head/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/as/Makefile       Mon Mar 25 01:06:29 2019        
(r345489)
+++ head/gnu/usr.bin/binutils/as/Makefile       Mon Mar 25 01:18:26 2019        
(r345490)
@@ -95,9 +95,9 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-f
 NO_SHARED?=    yes
 .endif
 
-DPADD= ${GNURELTOP}/libbfd/libbfd.a
-DPADD+=        ${GNURELTOP}/libiberty/libiberty.a
-DPADD+=        ${GNURELTOP}/libopcodes/libopcodes.a
+DPADD= ${GNURELTOP}/libbfd/libbfd${PIE_SUFFIX}.a
+DPADD+=        ${GNURELTOP}/libiberty/libiberty${PIE_SUFFIX}.a
+DPADD+=        ${GNURELTOP}/libopcodes/libopcodes${PIE_SUFFIX}.a
 LDADD= ${DPADD}
 
 .include <bsd.prog.mk>

Modified: head/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile       Mon Mar 25 01:06:29 2019        
(r345489)
+++ head/gnu/usr.bin/binutils/ld/Makefile       Mon Mar 25 01:18:26 2019        
(r345490)
@@ -51,8 +51,8 @@ CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
 .endif
-DPADD= ${GNURELTOP}/libbfd/libbfd.a
-DPADD+=        ${GNURELTOP}/libiberty/libiberty.a
+DPADD= ${GNURELTOP}/libbfd/libbfd${PIE_SUFFIX}.a
+DPADD+=        ${GNURELTOP}/libiberty/libiberty${PIE_SUFFIX}.a
 LDADD= ${DPADD}
 CLEANDIRS+=    ldscripts
 CLEANFILES+=   ldemul-list.h stringify.sed

Modified: head/gnu/usr.bin/binutils/objcopy/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/objcopy/Makefile  Mon Mar 25 01:06:29 2019        
(r345489)
+++ head/gnu/usr.bin/binutils/objcopy/Makefile  Mon Mar 25 01:18:26 2019        
(r345490)
@@ -9,9 +9,9 @@ SRCS=   objcopy.c not-strip.c
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd
-DPADD= ${GNURELTOP}/libbinutils/libbinutils.a
-DPADD+=        ${GNURELTOP}/libbfd/libbfd.a
-DPADD+=        ${GNURELTOP}/libiberty/libiberty.a
+DPADD= ${GNURELTOP}/libbinutils/libbinutils${PIE_SUFFIX}.a
+DPADD+=        ${GNURELTOP}/libbfd/libbfd${PIE_SUFFIX}.a
+DPADD+=        ${GNURELTOP}/libiberty/libiberty${PIE_SUFFIX}.a
 LDADD= ${DPADD}
 
 .include <bsd.prog.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to