diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/Makefile.in | 22 |
2 files changed, 16 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3734528..a4b8c8d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2000-02-05 Michael Hayes <m.hayes@elec.canterbury.ac.nz> + + * Makefile.in (libgcc.a): Add $(LIBGCC1) to libgcc.a after $(LIBGCC2). + 2000-02-04 Neil Booth <NeilB@earthling.net> * cccp.c (main): Check 'dir' for a NULL pointer before passing diff --git a/gcc/Makefile.in b/gcc/Makefile.in index beafcd5..9293823 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1149,19 +1149,21 @@ libgcc2.a: libgcc2.c libgcc2.ready $(CONFIG_H) $(FPBIT) $(DPBIT) $(LIB2ADD) \ # else true; fi # Combine the various libraries into a single library, libgcc.a. +# $(LIBGCC1) is added after $(LIBGCC2) so that routines written in +# assembler will be used in preference to the C versions. libgcc.a: $(LIBGCC1) $(LIBGCC2) -rm -rf tmplibgcc.a libgcc.a tmpcopy mkdir tmpcopy - -if [ x$(LIBGCC1) != x ]; \ - then (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC1)); \ - else true; \ - fi + (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC2)) # Some versions of ar (specifically the one in RISC/os 5.x), create an # unwritable table of contents file, and then print an error message when # the second ar command tries to overwrite this file. To avoid the error # message from ar, we make sure all files are writable. -(cd tmpcopy; chmod +w * > /dev/null 2>&1) - (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC2)) + -if [ x$(LIBGCC1) != x ]; \ + then (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC1)); \ + else true; \ + fi (cd tmpcopy; $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) ../tmplibgcc.a *$(objext)) rm -rf tmpcopy -if $(RANLIB_TEST_FOR_TARGET) ; then \ @@ -1240,16 +1242,16 @@ stmp-multilib-sub: fi rm -rf tmplibgcc.a tmpcopy mkdir tmpcopy - if [ x$(LIBGCC1) != x ]; \ - then (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC1)); \ - else true; \ - fi + (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC2)) # Some versions of ar (specifically the one in RISC/os 5.x), create an # unwritable table of contents file, and then print an error message when # the second ar command tries to overwrite this file. To avoid the error # message from ar, we make sure all files are writable. -(cd tmpcopy; chmod +w * > /dev/null 2>&1) - (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC2)) + if [ x$(LIBGCC1) != x ]; \ + then (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC1)); \ + else true; \ + fi (cd tmpcopy; $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) ../tmplibgcc.a *$(objext)) rm -rf libgcc2.a tmpcopy if $(RANLIB_TEST_FOR_TARGET) ; then \ |