summaryrefslogtreecommitdiff
path: root/lib/csu
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-07-07 23:31:28 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-07-07 23:31:28 +0000
commitc90a1d73ec85eef7e48303c506759bd4343244ce (patch)
treef2beec3937a4c14812b4fe03d03ef6a4e3c17579 /lib/csu
parentd1095a22b57ab194213209969e5288518327dbd2 (diff)
The -DPIC flag must be passed when building crtbeginS.o/crtendS.o however
using PICFLAGS is not the proper way to do that. Put it directly in the build script. Fixes a problem with upcoming PICFLAG. ok deraadt@
Diffstat (limited to 'lib/csu')
-rw-r--r--lib/csu/arm/Makefile10
-rw-r--r--lib/csu/hppa/Makefile12
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
index c98fd5adfa6..28be3aba57c 100644
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@@ -9,7 +9,7 @@ ELFDIR= ${.CURDIR}/../common_elf
.PATH: ${ELFDIR}
CFLAGS+= -I${ELFDIR} -I${.CURDIR}
-PICFLAG?=-fpic -DPIC
+PICFLAG?=-fpic
all: ${OBJS}
@@ -32,8 +32,8 @@ crtbegin.o: crtbegin.c
@rm -f ${.TARGET}.o
crtbeginS.o: crtbeginS.c
- @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
- @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
+ @echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
+ @${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
@rm -f ${.TARGET}.o
@@ -44,8 +44,8 @@ crtend.o: crtend.c
@rm -f ${.TARGET}.o
crtendS.o: crtendS.c
- @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
- @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
+ @echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
+ @${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
@rm -f ${.TARGET}.o
diff --git a/lib/csu/hppa/Makefile b/lib/csu/hppa/Makefile
index 10626bf1de7..abbdf0bcffc 100644
--- a/lib/csu/hppa/Makefile
+++ b/lib/csu/hppa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2004/01/08 14:59:15 drahn Exp $
+# $OpenBSD: Makefile,v 1.5 2004/07/07 23:31:27 drahn Exp $
# from: @(#)Makefile 5.5 (Berkeley) 5/21/91
CFLAGS+= -DLIBC_SCCS
@@ -9,7 +9,7 @@ ELFDIR= ${.CURDIR}/../common_elf
.PATH: ${ELFDIR}
CFLAGS+= -I${ELFDIR} -I${.CURDIR}
-PICFLAG?=-fPIC -DPIC
+PICFLAG?=-fPIC
all: ${OBJS}
@@ -32,8 +32,8 @@ crtbegin.o: crtbegin.c
@rm -f ${.TARGET}.o
crtbeginS.o: crtbeginS.c
- @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
- @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
+ @echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
+ @${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
@rm -f ${.TARGET}.o
@@ -44,8 +44,8 @@ crtend.o: crtend.c
@rm -f ${.TARGET}.o
crtendS.o: crtendS.c
- @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
- @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
+ @echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
+ @${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
@rm -f ${.TARGET}.o