summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2005-06-04 16:17:17 +0000
committerlukem <lukem@NetBSD.org>2005-06-04 16:17:17 +0000
commit3ed9ffcae1bd6b60d4a638355c0e185cd9966e02 (patch)
treed977d9b2ca3b0c15322b3df50490571675822a19 /libexec
parent5cc5caddf2f0d92f0cd12da3f28f811ad6b56fb9 (diff)
Explicitly prefix ld(1) options in LDFLAGS with "-Wl," rather than
using the ${LDFLAGS:@F@-Wl,$F@} make substitution because that breaks if LDFLAGS is already set.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/Makefile8
-rw-r--r--libexec/ld.elf_so/arch/alpha/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/arm/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/hppa/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/i386/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/m68k/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/mips/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/powerpc/Makefile.inc6
-rw-r--r--libexec/ld.elf_so/arch/sh3/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/sh5/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/sparc/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/sparc64/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/vax/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/arch/x86_64/Makefile.inc4
14 files changed, 31 insertions, 31 deletions
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 9c90bdd174d..7d5fcb714ad 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/01/11 07:47:37 martin Exp $
+# $NetBSD: Makefile,v 1.72 2005/06/04 16:17:17 lukem Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition
.include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition
@@ -23,8 +23,8 @@ M= ${.CURDIR}/arch/${ARCHSUBDIR}
PROG= ld.elf_so
-LINKFLAGS+= -shared -symbolic -nostartfiles
-LDFLAGS+= -non_shared
+LDFLAGS+= -shared -symbolic -nostartfiles
+LDFLAGS+= -Wl,-non_shared
# Adds SRCS, CPPFLAGS, LDFLAGS, etc. Must go first so MD startup source
# is first.
@@ -65,7 +65,7 @@ STRIPFLAG=
${PROG}: ${OBJS} ${DPADD}
${_MKMSG_LINK} ${PROG}
- ${CC} ${LINKFLAGS} ${LDFLAGS:@F@-Wl,$F@} -o ${PROG} ${OBJS} ${LDADD}
+ ${CC} ${LDFLAGS} -o ${PROG} ${OBJS} ${LDADD}
.if ${SHLINKINSTALLDIR} != "/usr/libexec"
SYMLINKS+= ${SHLINKINSTALLDIR}/${PROG} /usr/libexec/${PROG}
diff --git a/libexec/ld.elf_so/arch/alpha/Makefile.inc b/libexec/ld.elf_so/arch/alpha/Makefile.inc
index 0eb1fc0fe21..b20689f77f4 100644
--- a/libexec/ld.elf_so/arch/alpha/Makefile.inc
+++ b/libexec/ld.elf_so/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.12 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S alpha_reloc.c
@@ -8,4 +8,4 @@ CPPFLAGS+= -fpic -mno-fp-regs
CPPFLAGS+= -DELFSIZE=64
#CPPFLAGS+= -DRTLD_DEBUG_ALPHA
-LDFLAGS+= -e _rtld_start
+LDFLAGS+= -Wl,-e,_rtld_start
diff --git a/libexec/ld.elf_so/arch/arm/Makefile.inc b/libexec/ld.elf_so/arch/arm/Makefile.inc
index f75942f50aa..280a20d98ef 100644
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.11 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e _rtld_start
+LDFLAGS+= -Wl,-e,_rtld_start
diff --git a/libexec/ld.elf_so/arch/hppa/Makefile.inc b/libexec/ld.elf_so/arch/hppa/Makefile.inc
index 0a35e9e6715..0d3be099c1d 100644
--- a/libexec/ld.elf_so/arch/hppa/Makefile.inc
+++ b/libexec/ld.elf_so/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2004/05/17 13:16:02 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.7 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S hppa_reloc.c
@@ -11,4 +11,4 @@ CPPFLAGS+= -DELFSIZE=32
#CPPFLAGS+= -DRTLD_DEBUG_RELOC
#CPPFLAGS+= -DRTLD_DEBUG_HPPA
-LDFLAGS+= -e '$$$$rtld_start'
+LDFLAGS+= -Wl,-e,'$$$$rtld_start'
diff --git a/libexec/ld.elf_so/arch/i386/Makefile.inc b/libexec/ld.elf_so/arch/i386/Makefile.inc
index be17ed0ed9f..42257cefbe4 100644
--- a/libexec/ld.elf_so/arch/i386/Makefile.inc
+++ b/libexec/ld.elf_so/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.10 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e .rtld_start
+LDFLAGS+= -Wl,-e,.rtld_start
diff --git a/libexec/ld.elf_so/arch/m68k/Makefile.inc b/libexec/ld.elf_so/arch/m68k/Makefile.inc
index be17ed0ed9f..42257cefbe4 100644
--- a/libexec/ld.elf_so/arch/m68k/Makefile.inc
+++ b/libexec/ld.elf_so/arch/m68k/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.10 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e .rtld_start
+LDFLAGS+= -Wl,-e,.rtld_start
diff --git a/libexec/ld.elf_so/arch/mips/Makefile.inc b/libexec/ld.elf_so/arch/mips/Makefile.inc
index 90ba1dec37d..4a3be86fd37 100644
--- a/libexec/ld.elf_so/arch/mips/Makefile.inc
+++ b/libexec/ld.elf_so/arch/mips/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.15 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mips_reloc.c
@@ -8,4 +8,4 @@ CPPFLAGS+= -mabicalls -G0 -fPIC
CPPFLAGS+= -DELFSIZE=32
CPPFLAGS+= -DRTLD_INHIBIT_COPY_RELOCS
-LDFLAGS+= -e .rtld_start
+LDFLAGS+= -Wl,-e,.rtld_start
diff --git a/libexec/ld.elf_so/arch/powerpc/Makefile.inc b/libexec/ld.elf_so/arch/powerpc/Makefile.inc
index 47417cad689..1147a85075e 100644
--- a/libexec/ld.elf_so/arch/powerpc/Makefile.inc
+++ b/libexec/ld.elf_so/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.10 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S ppc_reloc.c
@@ -7,5 +7,5 @@ CPPFLAGS+= -fpic -msoft-float
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e .rtld_start
-LDFLAGS+= --script ${.CURDIR}/arch/powerpc/ld.so.script
+LDFLAGS+= -Wl,-e,.rtld_start
+LDFLAGS+= -Wl,--script,${.CURDIR}/arch/powerpc/ld.so.script
diff --git a/libexec/ld.elf_so/arch/sh3/Makefile.inc b/libexec/ld.elf_so/arch/sh3/Makefile.inc
index 48299997107..2bb9e96b11b 100644
--- a/libexec/ld.elf_so/arch/sh3/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sh3/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2004/02/21 16:02:06 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.7 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e .rtld_start
+LDFLAGS+= -Wl,-e,.rtld_start
diff --git a/libexec/ld.elf_so/arch/sh5/Makefile.inc b/libexec/ld.elf_so/arch/sh5/Makefile.inc
index 29febf8e619..000839a5e5b 100644
--- a/libexec/ld.elf_so/arch/sh5/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sh5/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.4 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e .rtld_start
+LDFLAGS+= -Wl,-e,.rtld_start
diff --git a/libexec/ld.elf_so/arch/sparc/Makefile.inc b/libexec/ld.elf_so/arch/sparc/Makefile.inc
index c286b660938..bcd97858a27 100644
--- a/libexec/ld.elf_so/arch/sparc/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sparc/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.10 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -e _rtld_start
+LDFLAGS+= -Wl,-e,_rtld_start
diff --git a/libexec/ld.elf_so/arch/sparc64/Makefile.inc b/libexec/ld.elf_so/arch/sparc64/Makefile.inc
index 42eadd527ee..a7527c02c91 100644
--- a/libexec/ld.elf_so/arch/sparc64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.8 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=64
-LDFLAGS+= -e _rtld_start
+LDFLAGS+= -Wl,-e,_rtld_start
diff --git a/libexec/ld.elf_so/arch/vax/Makefile.inc b/libexec/ld.elf_so/arch/vax/Makefile.inc
index c24dae9affc..8cacff0f41a 100644
--- a/libexec/ld.elf_so/arch/vax/Makefile.inc
+++ b/libexec/ld.elf_so/arch/vax/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2004/04/28 02:04:56 mhitch Exp $
+# $NetBSD: Makefile.inc,v 1.10 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32
-LDFLAGS+= -Bsymbolic -e .rtld_start
+LDFLAGS+= -Wl,-Bsymbolic -Wl,-e,.rtld_start
diff --git a/libexec/ld.elf_so/arch/x86_64/Makefile.inc b/libexec/ld.elf_so/arch/x86_64/Makefile.inc
index 2c1905ed060..96d3660bbaf 100644
--- a/libexec/ld.elf_so/arch/x86_64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/x86_64/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2004/02/21 15:56:03 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.7 2005/06/04 16:17:17 lukem Exp $
SRCS+= rtld_start.S mdreloc.c
@@ -7,4 +7,4 @@ CPPFLAGS+= -fPIC
CPPFLAGS+= -DELFSIZE=64
-LDFLAGS+= -e .rtld_start
+LDFLAGS+= -Wl,-e,.rtld_start