svn commit: r289241 - stable/10/gnu/usr.bin/binutils/ld

[Bryan Drewery]

Author: bdrewery
Date: Tue Oct 13 18:31:23 2015
New Revision: 289241
URL: https://svnweb.freebsd.org/changeset/base/289241

Log:
  MFC r288230,r288233:
  
    r288230:
      Fix emulation ldscripts not being installed since r131832.
    r288233:
      Fix subdir -j build after r287983 by adding missing dependencies.

Modified:
  stable/10/gnu/usr.bin/binutils/ld/Makefile
  stable/10/gnu/usr.bin/binutils/ld/Makefile.amd64
  stable/10/gnu/usr.bin/binutils/ld/Makefile.mips
  stable/10/gnu/usr.bin/binutils/ld/Makefile.powerpc64
  stable/10/gnu/usr.bin/binutils/ld/Makefile.sparc64
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- stable/10/gnu/usr.bin/binutils/ld/Makefile	Tue Oct 13 18:27:55 2015	(r289240)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile	Tue Oct 13 18:31:23 2015	(r289241)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+ELF_SCR_EXT=	x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw
 .include "../Makefile.inc0"
 .include <bsd.own.mk>
 
@@ -51,9 +52,9 @@ CLEANFILES+=	ldemul-list.h stringify.sed
 
 HOST=		${TARGET_TUPLE}
 LIBSEARCHPATH=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
-ELF_SCR_EXT=	x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	${NATIVE_EMULATION}.${ext}
+ldscripts/${NATIVE_EMULATION}.${ext}: e${NATIVE_EMULATION}.c
 .endfor
 
 EMXFR=

Modified: stable/10/gnu/usr.bin/binutils/ld/Makefile.amd64
==============================================================================
--- stable/10/gnu/usr.bin/binutils/ld/Makefile.amd64	Tue Oct 13 18:27:55 2015	(r289240)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile.amd64	Tue Oct 13 18:31:23 2015	(r289241)
@@ -16,6 +16,7 @@ _i386_path=	\"${TOOLS_PREFIX}/usr/lib32\
 EMS+=		${X86_EMULATION}
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	${X86_EMULATION}.${ext}
+ldscripts/${X86_EMULATION}.${ext}: e${X86_EMULATION}.c
 .endfor
 
 SRCS+=		e${X86_EMULATION}.c

Modified: stable/10/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- stable/10/gnu/usr.bin/binutils/ld/Makefile.mips	Tue Oct 13 18:27:55 2015	(r289240)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile.mips	Tue Oct 13 18:31:23 2015	(r289241)
@@ -22,6 +22,7 @@ EMS+= ${abi}
 #.endif
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+= ${abi}.${ext}
+ldscripts/${abi}.${ext}: e${abi}.c
 .endfor
 SRCS+=	e${abi}.c 
 CLEANFILES+=	e${abi}.c

Modified: stable/10/gnu/usr.bin/binutils/ld/Makefile.powerpc64
==============================================================================
--- stable/10/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Tue Oct 13 18:27:55 2015	(r289240)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Tue Oct 13 18:31:23 2015	(r289241)
@@ -16,6 +16,7 @@ _ppc32_path=	\"${TOOLS_PREFIX}/usr/lib32
 EMS+=		${PPC32_EMULATION}
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	${PPC32_EMULATION}.${ext}
+ldscripts/${PPC32_EMULATION}.${ext}: e${PPC32_EMULATION}.c
 .endfor
 
 SRCS+=		e${PPC32_EMULATION}.c

Modified: stable/10/gnu/usr.bin/binutils/ld/Makefile.sparc64
==============================================================================
--- stable/10/gnu/usr.bin/binutils/ld/Makefile.sparc64	Tue Oct 13 18:27:55 2015	(r289240)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile.sparc64	Tue Oct 13 18:31:23 2015	(r289241)
@@ -17,6 +17,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NAT
 EMS+=		elf${BITS}_sparc
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	elf${BITS}_sparc.${ext}
+ldscripts/elf${BITS}_sparc.${ext}: eelf${BITS}_sparc.c
 .endfor
 
 SRCS+=		eelf${BITS}_sparc.c