diff options
| author | Andreas Schwab <schwab@suse.de> | 2000-09-06 14:45:28 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2000-09-06 14:45:28 +0000 |
| commit | f472a17cb413f5fedaa2647f885b681de8690dba (patch) | |
| tree | f4cad65ecc15d38812cd280cf4b8a4e0766848e8 | |
| parent | 6d93bca4fe46bda40f97b51344b0b25580a98c8f (diff) | |
| download | gcc-f472a17cb413f5fedaa2647f885b681de8690dba.zip gcc-f472a17cb413f5fedaa2647f885b681de8690dba.tar.gz gcc-f472a17cb413f5fedaa2647f885b681de8690dba.tar.bz2 | |
mklibgcc.in: Emit rule for libgcc-stage-start.
* mklibgcc.in: Emit rule for libgcc-stage-start.
* Makefile.in (stage1-start, stage2-start, stage3-start,
stage4-start): Don't handle libgcc here, use libgcc.mk instead.
From-SVN: r36200
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 16 | ||||
| -rw-r--r-- | gcc/mklibgcc.in | 16 |
3 files changed, 30 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cad5284..22221c4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-09-06 Andreas Schwab <schwab@suse.de> + + * mklibgcc.in: Emit rule for libgcc-stage-start. + * Makefile.in (stage1-start, stage2-start, stage3-start, + stage4-start): Don't handle libgcc here, use libgcc.mk instead. + 2000-09-06 Bernd Schmidt <bernds@redhat.co.uk> * local-alloc.c (local_alloc): Ignore CLASS_LIKELY_SPILLED. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 2543ec4..b6a5902 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2914,13 +2914,13 @@ gnucompare gnucompare3 gnucompare4 gnucompare-lean gnucompare3-lean gnucompare4- # Copy the object files from a particular stage into a subdirectory. stage1-start: -if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi - -for dir in intl libgcc $(SUBDIRS) ; \ + $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage1 + -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage1/$$dir ] ; then true ; else mkdir stage1/$$dir ; fi ; \ done -mv $(STAGESTUFF) stage1 -mv intl/*$(objext) stage1/intl - -mv libgcc/*$(objext) stage1/libgcc # Copy as/ld if they exist to stage dir, so that running xgcc from the stage # dir will work properly. -if [ -f as$(exeext) ] ; then $(LN_S) ../as$(exeext) stage1 ; else true ; fi @@ -2939,13 +2939,13 @@ stage1: force stage1-start lang.stage1 stage2-start: -if [ -d stage2 ] ; then true ; else mkdir stage2 ; fi - -for dir in intl libgcc $(SUBDIRS) ; \ + $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage2 + -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage2/$$dir ] ; then true ; else mkdir stage2/$$dir ; fi ; \ done -mv $(STAGESTUFF) stage2 -mv intl/*$(objext) stage2/intl - -mv libgcc/*$(objext) stage2/libgcc # Copy as/ld if they exist to stage dir, so that running xgcc from the stage # dir will work properly. -if [ -f as$(exeext) ] ; then $(LN_S) ../as$(exeext) stage2 ; else true ; fi @@ -2964,13 +2964,13 @@ stage2: force stage2-start lang.stage2 stage3-start: -if [ -d stage3 ] ; then true ; else mkdir stage3 ; fi - -for dir in intl libgcc $(SUBDIRS) ; \ + $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage3 + -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage3/$$dir ] ; then true ; else mkdir stage3/$$dir ; fi ; \ done -mv $(STAGESTUFF) stage3 -mv intl/*$(objext) stage3/intl - -mv libgcc/*$(objext) stage3/libgcc # Copy as/ld if they exist to stage dir, so that running xgcc from the stage # dir will work properly. -if [ -f as$(exeext) ] ; then $(LN_S) ../as$(exeext) stage3 ; else true ; fi @@ -2989,13 +2989,13 @@ stage3: force stage3-start lang.stage3 stage4-start: -if [ -d stage4 ] ; then true ; else mkdir stage4 ; fi - -for dir in intl libgcc $(SUBDIRS) ; \ + $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage4 + -for dir in intl $(SUBDIRS) ; \ do \ if [ -d stage4/$$dir ] ; then true ; else mkdir stage4/$$dir ; fi ; \ done -mv $(STAGESTUFF) stage4 -mv intl/*$(objext) stage4/intl - -mv libgcc/*$(objext) stage4/libgcc # Copy as/ld if they exist to stage dir, so that running xgcc from the stage # dir will work properly. -if [ -f as$(exeext) ] ; then $(LN_S) ../as$(exeext) stage4 ; else true ; fi diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 5973006..8d93141 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -280,6 +280,22 @@ for ml in $MULTILIBS; do echo ' else true; fi;' done +dirs=libgcc +for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + if [ $dir != . ]; then + dirs="$dirs libgcc/${dir}" + fi +done +echo '' +echo 'libgcc-stage-start:' +echo ' for dir in '"${dirs}"'; do \' +echo ' if [ -d $(stage)/$$dir ]; then true; else mkdir $(stage)/$$dir; fi; \' +echo ' done' +echo ' -for dir in '"${dirs}"'; do \' +echo ' mv $$dir/*'"${objext}"' $(stage)/$$dir; \' +echo ' done' + echo "" all=stmp-dirs dirs=libgcc |