From 959124dfa31a8ff5f2966a526f1ee34ca1935dee Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 4 Apr 2011 02:30:21 +0200 Subject: [PATCH] csu: Adjust some flags etc. to more closely resemble the vendor Makefile. Also, use ${PICFLAG} instead of -fpic. Submitted-by: John Marino --- gnu/lib/csu/Makefile.csu | 12 +++--------- gnu/lib/gcc41/csu/Makefile | 10 ++++++++++ gnu/lib/gcc44/csu/Makefile | 11 +++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gnu/lib/csu/Makefile.csu b/gnu/lib/csu/Makefile.csu index 71522e5815..0367ad9c2a 100644 --- a/gnu/lib/csu/Makefile.csu +++ b/gnu/lib/csu/Makefile.csu @@ -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 diff --git a/gnu/lib/gcc41/csu/Makefile b/gnu/lib/gcc41/csu/Makefile index df102b812a..80432038ea 100644 --- a/gnu/lib/gcc41/csu/Makefile +++ b/gnu/lib/gcc41/csu/Makefile @@ -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" diff --git a/gnu/lib/gcc44/csu/Makefile b/gnu/lib/gcc44/csu/Makefile index 64106dc44e..c81b4d2ee8 100644 --- a/gnu/lib/gcc44/csu/Makefile +++ b/gnu/lib/gcc44/csu/Makefile @@ -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" -- 2.41.0