From 431dd488a10d51dbc93c232a8b290ebaf93fd9fa Mon Sep 17 00:00:00 2001 From: Olaf Barthel Date: Wed, 13 Apr 2005 14:35:06 +0000 Subject: [PATCH] - Changed how the startup code is built for the different library flavours, and which files this involves. git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14917 87f5fb63-7c3d-0410-a384-fd976d0f7a62 --- library/GNUmakefile.os4 | 68 +++++++++++------------------------------ 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/library/GNUmakefile.os4 b/library/GNUmakefile.os4 index e39fbd0..c762084 100644 --- a/library/GNUmakefile.os4 +++ b/library/GNUmakefile.os4 @@ -1,5 +1,5 @@ # -# $Id: GNUmakefile.os4,v 1.50 2005-04-03 10:22:47 obarthel Exp $ +# $Id: GNUmakefile.os4,v 1.51 2005-04-13 14:35:06 obarthel Exp $ # # :ts=8 # @@ -101,7 +101,6 @@ CODE_TYPE := -mbaserel -DBASEREL_DATA FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT endif - ############################################################################## WARNINGS = \ @@ -733,7 +732,7 @@ LIBS := \ ############################################################################## # The startup object files to be built -STARTUPS := bcrt0.o bcrtbegin.o bcrtend.o crt0.o crtbegin.o crtend.o mainb.o mainnb.o +STARTUPS := crt0.o crtbegin.o crtend.o ############################################################################## @@ -748,22 +747,18 @@ all: \ large_data \ large_data_softfloat \ baserel \ - lib/bcrt0.o \ - lib/bcrtbegin.o \ - lib/bcrtend.o \ lib/crt0.o \ lib/crtbegin.o \ lib/crtend.o \ - lib/mainb.o \ - lib/mainnb.o \ lib/libm.a \ + lib/small-data/crt0.o \ + lib/small-data/crtbegin.o \ + lib/small-data/crtend.o \ lib/small-data/libm.a \ lib/soft-float/libm.a \ lib/baserel/crt0.o \ lib/baserel/crtbegin.o \ lib/baserel/crtend.o \ - lib/baserel/mainb.o \ - lib/baserel/mainnb.o \ lib/baserel/libm.a ############################################################################## @@ -887,20 +882,14 @@ lib/crtbegin.o : lib crtbegin.o lib/crtend.o : lib crtend.o $(COPY) crtend.o lib -lib/mainnb.o : lib mainnb.o - $(COPY) mainnb.o lib +lib/small-data/crt0.o : lib small-data/crt0.o + $(COPY) small-data/crt0.o lib/small-data -lib/mainb.o : lib mainb.o - $(COPY) mainb.o lib +lib/small-data/crtbegin.o : lib small-data/crtbegin.o + $(COPY) small-data/crtbegin.o lib/small-data -lib/bcrt0.o : lib bcrt0.o - $(COPY) bcrt0.o lib - -lib/bcrtbegin.o : lib bcrtbegin.o - $(COPY) bcrtbegin.o lib - -lib/bcrtend.o : lib bcrtend.o - $(COPY) bcrtend.o lib +lib/small-data/crtend.o : lib small-data/crtend.o + $(COPY) small-data/crtend.o lib/small-data lib/baserel/crt0.o : lib baserel/crt0.o $(COPY) baserel/crt0.o lib/baserel @@ -911,13 +900,6 @@ lib/baserel/crtbegin.o : lib baserel/crtbegin.o lib/baserel/crtend.o : lib baserel/crtend.o $(COPY) baserel/crtend.o lib/baserel -lib/baserel/mainnb.o : lib baserel/mainnb.o - $(COPY) baserel/mainnb.o lib/baserel - -lib/baserel/mainb.o : lib baserel/mainb.o - $(COPY) baserel/mainb.o lib/baserel - - ############################################################################## # Individual dependencies which tell make to build the object files from @@ -1084,36 +1066,20 @@ crt0.o : crt0.S @echo "Assembling $<" @$(CC) -Wa,-mregnames -o crt0.o -c crt0.S -bcrt0.o : crt0.S +small-data/crt0.o : crt0.S @echo "Assembling $<" - @$(CC) -DSMALL_DATA -Wa,-mregnames -o bcrt0.o -c crt0.S + @$(CC) -DSMALL_DATA -Wa,-mregnames -o small-data/crt0.o -c crt0.S -mainnb.o : stdlib_main.c - @echo "Compiling $<" - @$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=data stdlib_main.c +small-data/crtbegin.o : crtbegin.c + $(CC) -o small-data/crtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c -mainb.o : stdlib_main.c - @echo "Compiling $<" - @$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA stdlib_main.c - -bcrtbegin.o : crtbegin.c - $(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c - -bcrtend.o : crtend.c - $(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c +small-data/crtend.o : crtend.c + $(CC) -o small-data/crtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c baserel/crt0.o : crt0.S @echo "Assembling $<" @$(CC) -Wa,-mregnames -o baserel/crt0.o -mbaserel -DBASEREL_DATA -c crt0.S -baserel/mainnb.o : stdlib_main.c - @echo "Compiling $<" - @$(CC) -o baserel/mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c - -baserel/mainb.o : stdlib_main.c - @echo "Compiling $<" - @$(CC) -o baserel/mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c - baserel/crtbegin.o : crtbegin.c $(CC) -o baserel/crtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtbegin.c