summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2001-12-20 19:20:02 +0000
committerthorpej <thorpej@NetBSD.org>2001-12-20 19:20:02 +0000
commitb3827960df2afd77c28e8c75ef7ff28a07d50d98 (patch)
treea1c3e5c3cd2cd1674f9d651aeda2886a25f25920 /libexec
parentab25dcd90e63e6c160cac158327c569a02abf590 (diff)
Grumble. Put compiler options back into CPPFLAGS for now, since
they're needed to build .S files with the correct PIC options. XXX Really needs cleanup in <bsd.*.mk> to do this properly.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/arch/alpha/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/arm/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/i386/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/m68k/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/mips/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/powerpc/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/sparc/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/sparc64/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/vax/Makefile.inc5
-rw-r--r--libexec/ld.elf_so/arch/x86_64/Makefile.inc5
10 files changed, 30 insertions, 20 deletions
diff --git a/libexec/ld.elf_so/arch/alpha/Makefile.inc b/libexec/ld.elf_so/arch/alpha/Makefile.inc
index 1083675448d..bd9b7eb548b 100644
--- a/libexec/ld.elf_so/arch/alpha/Makefile.inc
+++ b/libexec/ld.elf_so/arch/alpha/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.7 2001/12/14 22:21:46 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.8 2001/12/20 19:20:02 thorpej Exp $
SRCS+= rtld_start.S alpha_reloc.c
-COPTS+= -fpic -mno-fp-regs
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic -mno-fp-regs
CPPFLAGS+= -DELFSIZE=64
#CPPFLAGS+= -DRTLD_DEBUG_ALPHA
diff --git a/libexec/ld.elf_so/arch/arm/Makefile.inc b/libexec/ld.elf_so/arch/arm/Makefile.inc
index 57e13e96e96..3ac901a6582 100644
--- a/libexec/ld.elf_so/arch/arm/Makefile.inc
+++ b/libexec/ld.elf_so/arch/arm/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2001/12/14 22:21:46 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/20 19:20:02 thorpej Exp $
SRCS+= rtld_start.S
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
diff --git a/libexec/ld.elf_so/arch/i386/Makefile.inc b/libexec/ld.elf_so/arch/i386/Makefile.inc
index b47321fe535..458ec097648 100644
--- a/libexec/ld.elf_so/arch/i386/Makefile.inc
+++ b/libexec/ld.elf_so/arch/i386/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:46 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.4 2001/12/20 19:20:02 thorpej Exp $
SRCS+= rtld_start.S
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF
diff --git a/libexec/ld.elf_so/arch/m68k/Makefile.inc b/libexec/ld.elf_so/arch/m68k/Makefile.inc
index 1c7a5bd8f0f..b2ba9a1c39e 100644
--- a/libexec/ld.elf_so/arch/m68k/Makefile.inc
+++ b/libexec/ld.elf_so/arch/m68k/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:46 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.4 2001/12/20 19:20:02 thorpej Exp $
SRCS+= rtld_start.S
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
diff --git a/libexec/ld.elf_so/arch/mips/Makefile.inc b/libexec/ld.elf_so/arch/mips/Makefile.inc
index 9526343a8ec..29f94fc78b7 100644
--- a/libexec/ld.elf_so/arch/mips/Makefile.inc
+++ b/libexec/ld.elf_so/arch/mips/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.8 2001/12/14 22:21:47 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.9 2001/12/20 19:20:03 thorpej Exp $
SRCS+= rtld_start.S mips_reloc.c
-COPTS+= -mabicalls -G0 -fPIC
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -mabicalls -G0 -fPIC
CPPFLAGS+= -DELFSIZE=32 -I${.CURDIR}
CPPFLAGS+= -DRTLD_INHIBIT_COPY_RELOCS
diff --git a/libexec/ld.elf_so/arch/powerpc/Makefile.inc b/libexec/ld.elf_so/arch/powerpc/Makefile.inc
index e3cb2f0da78..d0966e30951 100644
--- a/libexec/ld.elf_so/arch/powerpc/Makefile.inc
+++ b/libexec/ld.elf_so/arch/powerpc/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 2001/12/14 22:21:47 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.5 2001/12/20 19:20:03 thorpej Exp $
SRCS+= rtld_start.S ppc_reloc.c
-COPTS+= -fpic -msoft-float
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic -msoft-float
CPPFLAGS+= -DELFSIZE=32 -DVARPSZ -I${.CURDIR}
diff --git a/libexec/ld.elf_so/arch/sparc/Makefile.inc b/libexec/ld.elf_so/arch/sparc/Makefile.inc
index 2364af7cd4b..8977821284d 100644
--- a/libexec/ld.elf_so/arch/sparc/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sparc/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:47 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.4 2001/12/20 19:20:03 thorpej Exp $
SRCS+= rtld_start.S mdreloc.c
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32 -DRTLD_RELOCATE_SELF -DVARPSZ
diff --git a/libexec/ld.elf_so/arch/sparc64/Makefile.inc b/libexec/ld.elf_so/arch/sparc64/Makefile.inc
index 667cced71ba..3dc38c87567 100644
--- a/libexec/ld.elf_so/arch/sparc64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/sparc64/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2001/12/14 22:21:47 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/20 19:20:03 thorpej Exp $
SRCS+= rtld_start.S mdreloc.c
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=64 -DRTLD_RELOCATE_SELF -DVARPSZ
diff --git a/libexec/ld.elf_so/arch/vax/Makefile.inc b/libexec/ld.elf_so/arch/vax/Makefile.inc
index 20ce249a2ff..aede94fab0d 100644
--- a/libexec/ld.elf_so/arch/vax/Makefile.inc
+++ b/libexec/ld.elf_so/arch/vax/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.3 2001/12/14 22:21:48 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.4 2001/12/20 19:20:03 thorpej Exp $
SRCS+= rtld_start.S
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=32 #-DRTLD_RELOCATE_SELF
diff --git a/libexec/ld.elf_so/arch/x86_64/Makefile.inc b/libexec/ld.elf_so/arch/x86_64/Makefile.inc
index a7dd668629d..cb026172095 100644
--- a/libexec/ld.elf_so/arch/x86_64/Makefile.inc
+++ b/libexec/ld.elf_so/arch/x86_64/Makefile.inc
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2001/12/14 22:21:48 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.3 2001/12/20 19:20:04 thorpej Exp $
SRCS+= rtld_start.S mdreloc.c
-COPTS+= -fpic
+# XXX Should not be in CPPFLAGS!
+CPPFLAGS+= -fpic
CPPFLAGS+= -DELFSIZE=64 -DRTLD_RELOCATE_SELF