Page MenuHomeFreeBSD

D18783.id52670.diff
No OneTemporary

D18783.id52670.diff

Index: gnu/usr.bin/binutils/ld/Makefile
===================================================================
--- gnu/usr.bin/binutils/ld/Makefile
+++ gnu/usr.bin/binutils/ld/Makefile
@@ -70,6 +70,9 @@
HOST= ${TARGET_TUPLE}
LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\"
.for ext in ${ELF_SCR_EXT}
+.if ${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
Index: gnu/usr.bin/binutils/ld/Makefile.mips
===================================================================
--- gnu/usr.bin/binutils/ld/Makefile.mips
+++ gnu/usr.bin/binutils/ld/Makefile.mips
@@ -22,14 +22,14 @@
LIBSEARCHPATH.elf64btsmip_cheri_fbsd=\"=/usr/libcheri\"
.endif
.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 \

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 6:57 PM (16 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31927027
Default Alt Text
D18783.id52670.diff (1 KB)

Event Timeline