csu: Adjust some flags etc. to more closely resemble the vendor Makefile.
authorSascha Wildner <saw@online.de>
Mon, 4 Apr 2011 00:30:21 +0000 (02:30 +0200)
committerSascha Wildner <saw@online.de>
Mon, 4 Apr 2011 00:57:16 +0000 (02:57 +0200)
Also, use ${PICFLAG} instead of -fpic.

Submitted-by: John Marino <draco@marino.st>
gnu/lib/csu/Makefile.csu
gnu/lib/gcc41/csu/Makefile
gnu/lib/gcc44/csu/Makefile

index 71522e5..0367ad9 100644 (file)
@@ -11,13 +11,7 @@ INSTALLOBJS+=        ${NOBJS} ${SOBJS}
 
 OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
 
-CFLAGS+=       -finhibit-size-directive -fno-inline-functions \
-               -fno-exceptions -fno-zero-initialized-in-bss \
-               -fno-omit-frame-pointer -fno-unit-at-a-time \
-               -fno-asynchronous-unwind-tables
-CFLAGS+=       -I.
-
-CRTS_CFLAGS=   -DCRTSTUFFS_O -DSHARED ${PICFLAG}
+CRTS_CFLAGS=   ${PICFLAG}
 MKDEP=         -DCRT_BEGIN
 
 BEGINSRC?=     crtstuff.c
@@ -30,7 +24,7 @@ crtbegin.o:   ${BEGINSRC}
                -c -o ${.TARGET} ${.ALLSRC:N*.h}
 
 crtbeginS.o:   ${BEGINSRC}
-       ${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
+       ${CC} ${CFLAGS} ${CRTS_CFLAGS} -g0 -DCRT_BEGIN -DCRTSTUFFS_O \
                -c -o ${.TARGET} ${.ALLSRC:N*.h}
 
 crtend.o:      ${ENDSRC}
@@ -38,7 +32,7 @@ crtend.o:     ${ENDSRC}
                -c -o ${.TARGET} ${.ALLSRC:N*.h}
 
 crtendS.o:     ${ENDSRC}
-       ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
+       ${CC} ${CFLAGS} ${CRTS_CFLAGS} -g0 -DCRT_END -DCRTSTUFFS_O \
                -c -o ${.TARGET} ${.ALLSRC:N*.h}
 
 CLEANFILES+=   tm.h options.h auto-host.h
index df102b8..8043203 100644 (file)
@@ -4,4 +4,14 @@ GCCDIR=        ${.CURDIR}/../../../../contrib/gcc-4.1
 CCDIR= ${.CURDIR}/../../../usr.bin/cc41
 
 .include "../Makefile.inc"
+
+CFLAGS+=       -finhibit-size-directive
+CFLAGS+=       -fno-inline-functions
+CFLAGS+=       -fno-exceptions
+CFLAGS+=       -fno-zero-initialized-in-bss
+CFLAGS+=       -fno-unit-at-a-time
+CFLAGS+=       -fno-omit-frame-pointer
+CFLAGS+=       -fno-asynchronous-unwind-tables
+CFLAGS+=       -I.
+
 .include "../../csu/Makefile.csu"
index 64106dc..c81b4d2 100644 (file)
@@ -1,4 +1,15 @@
 CCDIR= ${STOPDIR}
 
 .include "../Makefile.inc"
+
+CFLAGS+=       -finhibit-size-directive
+CFLAGS+=       -fno-inline-functions
+CFLAGS+=       -fno-exceptions
+CFLAGS+=       -fno-zero-initialized-in-bss
+CFLAGS+=       -fno-toplevel-reorder
+CFLAGS+=       -fno-tree-vectorize
+CFLAGS+=       -fno-omit-frame-pointer
+CFLAGS+=       -fno-asynchronous-unwind-tables
+CFLAGS+=       -I.
+
 .include "../../csu/Makefile.csu"