Remove separate pic versions of crt0, crtbegin, crtend. Next

release we are taking a different approach. Idea from kettenis@.

okay kettenis@ weingart@

diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index 9142d06..9355e9a 100644 (file)
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -1,9 +1,8 @@
-#      $OpenBSD: Makefile,v 1.2 2008/06/25 02:47:59 kurt Exp $
+#      $OpenBSD: Makefile,v 1.3 2008/07/28 14:17:00 kurt Exp $
 
 CFLAGS+=       -DLIBC_SCCS -fno-omit-frame-pointer
-OBJS=          crt0.o pcrt0.o gcrt0.o
+OBJS=          crt0.o gcrt0.o
 OBJS+=         crtbegin.o crtend.o
-OBJS+=         crtbeginP.o crtendP.o
 OBJS+=         crtbeginS.o crtendS.o
 SRCS=          crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
 
@@ -21,12 +20,6 @@ crt0.o: crt0.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-pcrt0.o: crt0.c
-       @echo ${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @rm -f ${.TARGET}.o
-
 gcrt0.o: crt0.c
        @echo ${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
        @${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
@@ -39,12 +32,6 @@ crtbegin.o: crtbegin.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtbeginP.o: crtbegin.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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
@@ -57,12 +44,6 @@ crtend.o: crtend.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtendP.o: crtend.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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

diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index fb2c4f7..c4f7a54 100644 (file)
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,10 +1,9 @@
-#      $OpenBSD: Makefile,v 1.10 2008/06/25 02:47:59 kurt Exp $
+#      $OpenBSD: Makefile,v 1.11 2008/07/28 14:17:00 kurt Exp $
 #      from: @(#)Makefile      5.5 (Berkeley) 5/21/91
 
 CFLAGS+=       -DLIBC_SCCS -fno-omit-frame-pointer
-OBJS=          crt0.o pcrt0.o gcrt0.o
+OBJS=          crt0.o gcrt0.o
 OBJS+=         crtbegin.o crtend.o
-OBJS+=         crtbeginP.o crtendP.o
 OBJS+=         crtbeginS.o crtendS.o
 SRCS=          crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
 
@@ -22,12 +21,6 @@ crt0.o: crt0.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-pcrt0.o: crt0.c
-       @echo ${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @rm -f ${.TARGET}.o
-
 gcrt0.o: crt0.c
        @echo ${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
        @${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
@@ -40,12 +33,6 @@ crtbegin.o: crtbegin.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtbeginP.o: crtbegin.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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
@@ -58,12 +45,6 @@ crtend.o: crtend.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtendP.o: crtend.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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

diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index 595d4a7..a1cd94e 100644 (file)
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -2,10 +2,9 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/1/93
 
 CFLAGS+=       -DLIBC_SCCS
-OBJS=          crt0.o pcrt0.o gcrt0.o
+OBJS=          crt0.o gcrt0.o
 OBJS+=         crtbegin.o crtend.o
 OBJS+=         crtbeginS.o crtendS.o
-OBJS+=         crtbeginP.o crtendP.o
 SRCS=          crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
 
 ELFDIR=                ${.CURDIR}/../common_elf
@@ -22,12 +21,6 @@ crt0.o: crt0.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-pcrt0.o: crt0.c
-       @echo ${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @rm -f ${.TARGET}.o
-
 gcrt0.o: crt0.c
        @echo ${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
        @${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
@@ -40,12 +33,6 @@ crtbegin.o: crtbegin.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtbeginP.o: crtbegin.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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
@@ -58,12 +45,6 @@ crtend.o: crtend.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtendP.o: crtend.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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

diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile
index e7d297e..67301c4 100644 (file)
--- a/lib/csu/sparc64/Makefile
+++ b/lib/csu/sparc64/Makefile
@@ -1,10 +1,9 @@
-#      $OpenBSD: Makefile,v 1.4 2008/06/25 02:47:59 kurt Exp $
+#      $OpenBSD: Makefile,v 1.5 2008/07/28 14:17:00 kurt Exp $
 #      $NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
 
 CFLAGS+=       -DLIBC_SCCS -DELFSIZE=64
-OBJS=          crt0.o pcrt0.o gcrt0.o
+OBJS=          crt0.o gcrt0.o
 OBJS+=         crtbegin.o crtend.o
-OBJS+=         crtbeginP.o crtendP.o
 OBJS+=         crtbeginS.o crtendS.o
 SRCS=          crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
 
@@ -22,12 +21,6 @@ crt0.o: crt0.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-pcrt0.o: crt0.c
-       @echo ${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @rm -f ${.TARGET}.o
-
 gcrt0.o: crt0.c
        @echo ${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
        @${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
@@ -40,12 +33,6 @@ crtbegin.o: crtbegin.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtbeginP.o: crtbegin.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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
@@ -58,12 +45,6 @@ crtend.o: crtend.c
        @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
        @rm -f ${.TARGET}.o
 
-crtendP.o: crtend.c
-       @echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}
-       @${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-       @${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-       @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