summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2019-01-09 11:13:05 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2019-01-09 11:13:05 +0000
commit985b8e2b12c7b8ddc80effe8fd3bd9932bc2b57f (patch)
tree2a1b85ef4c394341f4c99188a3e122a894d37abf /gnu
parent4cea05a273c875b5d5d4c41bfa6f2f0a60fa4a66 (diff)
downloadsrc-test2-985b8e2b12c7b8ddc80effe8fd3bd9932bc2b57f.tar.gz
src-test2-985b8e2b12c7b8ddc80effe8fd3bd9932bc2b57f.zip
Avoid bsd.files.mk duplicate rule warning for bfd ldscripts
Without this change I get lots of warning: duplicate script for target "_FILESINS_ldscripts/elf64btsmip_fbsd.xw" ignored message for every tree walk. Reviewed By: imp, emaste Differential Revision: https://reviews.freebsd.org/D18783
Notes
Notes: svn path=/head/; revision=342882
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile3
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile.mips6
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 5ac308b3dd2c..09caa3583a41 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -63,6 +63,9 @@ FILESDIR= ${SCRIPTDIR}
HOST= ${TARGET_TUPLE}
LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\"
.for ext in ${ELF_SCR_EXT}
+.if !empty(LDSCRIPTS) && ${LDSCRIPTS:M${NATIVE_EMULATION}.${ext}} != ""
+.error "NATIVE_EMULATION scripts were added to LDSCRIPTS: ${LDSCRIPTS:M${NATIVE_EMULATION}.${ext}}"
+.endif
LDSCRIPTS+= ${NATIVE_EMULATION}.${ext}
ldscripts/${NATIVE_EMULATION}.${ext}: e${NATIVE_EMULATION}.c
.endfor
diff --git a/gnu/usr.bin/binutils/ld/Makefile.mips b/gnu/usr.bin/binutils/ld/Makefile.mips
index 7ed3a56059f2..db9e02d97de0 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.mips
+++ b/gnu/usr.bin/binutils/ld/Makefile.mips
@@ -18,14 +18,14 @@ NATIVE_EMULATION?=elf32${_EMULATION_ENDIAN}tsmip_fbsd
MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \
elf32btsmipn32_fbsd elf32ltsmipn32_fbsd
.for abi in ${MIPS_ABIS}
-#.if (${abi} != ${NATIVE_EMULATION})
EMS+= ${abi}
-#.endif
+.if ${abi} != ${NATIVE_EMULATION}
.for ext in ${ELF_SCR_EXT}
LDSCRIPTS+= ${abi}.${ext}
ldscripts/${abi}.${ext}: e${abi}.c
.endfor
-SRCS+= e${abi}.c
+.endif
+SRCS+= e${abi}.c
CLEANFILES+= e${abi}.c
# nb: elf32 handles both elf32 and elf64 targets
e${abi}.c: ${.CURDIR}/${abi}.sh emultempl/elf32.em \