summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2001-12-14 22:21:45 +0000
committerthorpej <thorpej@NetBSD.org>2001-12-14 22:21:45 +0000
commit7dcc71da1d7bfd311d5630eadf40da35ba0ed2f9 (patch)
tree1cc0025e9bd72a6c4ee216f74ccd11d2028a3f45 /libexec
parent8d1585affa1929455b6cd9bec387d30a2fe5a9f9 (diff)
Don't put compiler options into CPPFLAGS.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/Makefile5
-rw-r--r--libexec/ld.elf_so/arch/alpha/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/arm/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/i386/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/m68k/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/mips/Makefile.inc6
-rw-r--r--libexec/ld.elf_so/arch/powerpc/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/sparc/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/sparc64/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/vax/Makefile.inc7
-rw-r--r--libexec/ld.elf_so/arch/x86_64/Makefile.inc7
11 files changed, 52 insertions, 22 deletions
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index f4cce745770..9931c5fd64c 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/10/31 18:26:23 skrll Exp $
+# $NetBSD: Makefile,v 1.40 2001/12/14 22:21:45 thorpej Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition
@@ -27,7 +27,8 @@ PROG= ld.elf_so
SRCS+= rtld.c reloc.c symbol.c malloc.c xmalloc.c xprintf.c debug.c \
map_object.c load.c search.c headers.c paths.c
-CPPFLAGS+= -Wall -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
+
+CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -DDEBUG -DRTLD_LOADER
CPPFLAGS+= -D_RTLD_SOURCE
diff --git a/libexec/ld.elf_so/arch/alpha/Makefile.inc b/libexec/ld.elf_so/arch/alpha/Makefile.inc
index c69459f2c47..1083675448d 100644
--- a/libexec/ld.elf_so/arch/alpha/Makefile.inc
+++ b/libexec/ld.elf_so/arch/alpha/Makefile.inc
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.6 2001/12/14 00:53:07 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.7 2001/12/14 22:21:46 thorpej Exp $
SRCS+= rtld_start.S alpha_reloc.c
-CPPFLAGS+= -fpic -mno-fp-regs -DELFSIZE=64
+COPTS+= -fpic -mno-fp-regs
+
+CPPFLAGS+= -DELFSIZE=64
#CPPFLAGS+= -DRTLD_DEBUG_ALPHA
+
LDFLAGS+= -Bshareable -Bsymbolic -e _rtld_start
LDFLAGS+= --script ${.CURDIR}/arch/alpha/ld.so.script
diff --git a/libexec/ld.elf_so/arch/arm/Makefile.inc b/libexec/ld.elf_so/arch/arm/Makefile.inc
index d9be3d09080..57e13e96e96 100644
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2001/07/15 03:08:33 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2001/12/14 22:21:46 thorpej Exp $
SRCS+= rtld_start.S
-CPPFLAGS+= -fpic -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
+
LDFLAGS+= -Bshareable -Bsymbolic -e _rtld_start
diff --git a/libexec/ld.elf_so/arch/i386/Makefile.inc b/libexec/ld.elf_so/arch/i386/Makefile.inc
index becc2b09bdc..b47321fe535 100644
--- a/libexec/ld.elf_so/arch/i386/Makefile.inc
+++ b/libexec/ld.elf_so/arch/i386/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 1999/02/24 18:31:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:46 thorpej Exp $
SRCS+= rtld_start.S
-CPPFLAGS+= -fpic -DELFSIZE=32 -DRTLD_RELOCATE_SELF
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF
+
LDFLAGS+= -Bshareable -Bsymbolic -e .rtld_start
diff --git a/libexec/ld.elf_so/arch/m68k/Makefile.inc b/libexec/ld.elf_so/arch/m68k/Makefile.inc
index 025ed3b2c9e..1c7a5bd8f0f 100644
--- a/libexec/ld.elf_so/arch/m68k/Makefile.inc
+++ b/libexec/ld.elf_so/arch/m68k/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/12/21 09:12:54 scw Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:46 thorpej Exp $
SRCS+= rtld_start.S
-CPPFLAGS+= -fpic -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
+
LDFLAGS+= -Bshareable -Bsymbolic -e .rtld_start
diff --git a/libexec/ld.elf_so/arch/mips/Makefile.inc b/libexec/ld.elf_so/arch/mips/Makefile.inc
index b0466d0f6e7..9526343a8ec 100644
--- a/libexec/ld.elf_so/arch/mips/Makefile.inc
+++ b/libexec/ld.elf_so/arch/mips/Makefile.inc
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.7 1999/06/07 18:04:31 castor Exp $
+# $NetBSD: Makefile.inc,v 1.8 2001/12/14 22:21:47 thorpej Exp $
SRCS+= rtld_start.S mips_reloc.c
-CPPFLAGS+= -mabicalls -G0 -fPIC -DELFSIZE=32 -I${.CURDIR}
+COPTS+= -mabicalls -G0 -fPIC
+
+CPPFLAGS+= -DELFSIZE=32 -I${.CURDIR}
CPPFLAGS+= -DRTLD_INHIBIT_COPY_RELOCS
.if (${MACHINE_ARCH} == "mipseb")
diff --git a/libexec/ld.elf_so/arch/powerpc/Makefile.inc b/libexec/ld.elf_so/arch/powerpc/Makefile.inc
index 621e7228b01..e3cb2f0da78 100644
--- a/libexec/ld.elf_so/arch/powerpc/Makefile.inc
+++ b/libexec/ld.elf_so/arch/powerpc/Makefile.inc
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.3 1999/04/18 19:40:07 ws Exp $
+# $NetBSD: Makefile.inc,v 1.4 2001/12/14 22:21:47 thorpej Exp $
SRCS+= rtld_start.S ppc_reloc.c
-CPPFLAGS+= -fpic -msoft-float -DELFSIZE=32 -DVARPSZ -I${.CURDIR}
+COPTS+= -fpic -msoft-float
+
+CPPFLAGS+= -DELFSIZE=32 -DVARPSZ -I${.CURDIR}
+
LDFLAGS+= -Bshareable -Bsymbolic -e .rtld_start
LDFLAGS+= --script ${.CURDIR}/arch/powerpc/ld.so.script
diff --git a/libexec/ld.elf_so/arch/sparc/Makefile.inc b/libexec/ld.elf_so/arch/sparc/Makefile.inc
index 7a1f58ac095..2364af7cd4b 100644
--- a/libexec/ld.elf_so/arch/sparc/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sparc/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 1999/06/22 16:28:23 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:47 thorpej Exp $
SRCS+= rtld_start.S mdreloc.c
-CPPFLAGS+= -fpic -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
+
LDFLAGS+= -Bshareable -Bsymbolic -e _rtld_start
diff --git a/libexec/ld.elf_so/arch/sparc64/Makefile.inc b/libexec/ld.elf_so/arch/sparc64/Makefile.inc
index 73c652a3e27..667cced71ba 100644
--- a/libexec/ld.elf_so/arch/sparc64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sparc64/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2000/07/13 23:14:17 eeh Exp $
+# $NetBSD: Makefile.inc,v 1.2 2001/12/14 22:21:47 thorpej Exp $
SRCS+= rtld_start.S mdreloc.c
-CPPFLAGS+= -fpic -DELFSIZE=64 -DRTLD_RELOCATE_SELF -DVARPSZ
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=64 -DRTLD_RELOCATE_SELF -DVARPSZ
+
LDFLAGS+= -Bshareable -Bsymbolic -e _rtld_start
diff --git a/libexec/ld.elf_so/arch/vax/Makefile.inc b/libexec/ld.elf_so/arch/vax/Makefile.inc
index a6b5ae69e4c..20ce249a2ff 100644
--- a/libexec/ld.elf_so/arch/vax/Makefile.inc
+++ b/libexec/ld.elf_so/arch/vax/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/07/14 22:03:02 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:48 thorpej Exp $
SRCS+= rtld_start.S
-CPPFLAGS+= -fpic -DELFSIZE=32 #-DRTLD_RELOCATE_SELF
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=32 #-DRTLD_RELOCATE_SELF
+
LDFLAGS+= -Bshareable -Bsymbolic -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 7035b85b31a..a7dd668629d 100644
--- a/libexec/ld.elf_so/arch/x86_64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/x86_64/Makefile.inc
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2001/06/19 01:11:44 fvdl Exp $
+# $NetBSD: Makefile.inc,v 1.2 2001/12/14 22:21:48 thorpej Exp $
SRCS+= rtld_start.S mdreloc.c
-CPPFLAGS+= -fpic -DELFSIZE=64 -DRTLD_RELOCATE_SELF
+COPTS+= -fpic
+
+CPPFLAGS+= -DELFSIZE=64 -DRTLD_RELOCATE_SELF
+
LDFLAGS+= -Bshareable -Bsymbolic -e .rtld_start