From e3cb7e21bd0f66aed67ac57908c20c5fdacff041 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 16 Dec 2004 19:14:29 +0000 Subject: [PATCH] re PR other/18508 ("basename: too few arguments" when building without bootstrap) 2004-12-14 H.J. Lu PR other/18508 * config/alpha/t-osf4 (SHLIB_LINK): Use `.backup' as the suffix to back up the existing shared library. * config/arm/t-netbsd (SHLIB_LINK): Likewise. * config/mips/t-slibgcc-irix (SHLIB_LINK): Likewise. * config/pa/t-hpux-shlib (SHLIB_LINK): Likewise. * config/sh/t-linux (SHLIB_LINK): Likewise. * config/t-libunwind-elf (SHLIBUNWIND_LINK): Likewise. * config/t-slibgcc-darwin (SHLIB_LINK): Likewise. * config/t-slibgcc-elf-ver (SHLIB_LINK): Likewise. * config/t-slibgcc-sld (SHLIB_LINK): Likewise. * config/i386/t-nwld (SHLIB_LINK): Don't use the temporary file. From-SVN: r92276 --- gcc/ChangeLog | 17 +++++++++++++++++ gcc/config/alpha/t-osf4 | 2 +- gcc/config/arm/t-netbsd | 2 +- gcc/config/i386/t-nwld | 6 +----- gcc/config/mips/t-slibgcc-irix | 2 +- gcc/config/pa/t-hpux-shlib | 2 +- gcc/config/sh/t-linux | 2 +- gcc/config/t-libunwind-elf | 3 +-- gcc/config/t-slibgcc-darwin | 2 +- gcc/config/t-slibgcc-elf-ver | 2 +- gcc/config/t-slibgcc-sld | 2 +- 11 files changed, 27 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e97ae9c0c05..b5afd17404e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2004-12-16 H.J. Lu + + PR other/18508 + * config/alpha/t-osf4 (SHLIB_LINK): Use `.backup' as the suffix + to back up the existing shared library. + * config/arm/t-netbsd (SHLIB_LINK): Likewise. + * config/mips/t-slibgcc-irix (SHLIB_LINK): Likewise. + * config/pa/t-hpux-shlib (SHLIB_LINK): Likewise. + * config/sh/t-linux (SHLIB_LINK): Likewise. + * config/t-libunwind-elf (SHLIBUNWIND_LINK): Likewise. + * config/t-slibgcc-darwin (SHLIB_LINK): Likewise. + * config/t-slibgcc-elf-ver (SHLIB_LINK): Likewise. + * config/t-slibgcc-sld (SHLIB_LINK): Likewise. + + * config/i386/t-nwld (SHLIB_LINK): Don't use the temporary + file. + 2004-12-16 Richard Henderson * Makefile.in (MD_DEPS, s-mddeps): New. diff --git a/gcc/config/alpha/t-osf4 b/gcc/config/alpha/t-osf4 index 97f2cdf41ba..58ce6c2d8d6 100644 --- a/gcc/config/alpha/t-osf4 +++ b/gcc/config/alpha/t-osf4 @@ -19,7 +19,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ rm -f $(SHLIB_SONAME) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) diff --git a/gcc/config/arm/t-netbsd b/gcc/config/arm/t-netbsd index c5b4e68383b..533fab947a1 100644 --- a/gcc/config/arm/t-netbsd +++ b/gcc/config/arm/t-netbsd @@ -14,7 +14,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ rm -f $(SHLIB_SONAME) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) diff --git a/gcc/config/i386/t-nwld b/gcc/config/i386/t-nwld index 37c88c0da3d..f56f1f16c1d 100644 --- a/gcc/config/i386/t-nwld +++ b/gcc/config/i386/t-nwld @@ -46,13 +46,9 @@ SHLIB_LINK = set -e; \ then echo "xdcdata @shlib_so_name@.xdc" >>@shlib_so_name@.def; \ else echo "WARNING: $(SHLIB_NAME) built without XDC data will not work well." 1>&2; \ fi; \ - $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -o $(SHLIB_NAME).tmp \ + $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -o $(SHLIB_NAME) \ $(SHLIB_SRC) -static-libgcc -lnetware \ -Wl,--Map,--map-info,full,--strip-all,--def-file,@shlib_so_name@.def; \ - if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ - else true; fi; \ - mv $(SHLIB_NAME).tmp $(SHLIB_NAME); \ rm -f @shlib_so_name@.imp; $(LN_S) $(SHLIB_MAP) @shlib_so_name@.imp; \ echo $$$$(($$$$(libgcc/build diff --git a/gcc/config/mips/t-slibgcc-irix b/gcc/config/mips/t-slibgcc-irix index b28514f0c39..0eac89e6a1c 100644 --- a/gcc/config/mips/t-slibgcc-irix +++ b/gcc/config/mips/t-slibgcc-irix @@ -15,7 +15,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \ rm -f $(SHLIB_SOLINK) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK) diff --git a/gcc/config/pa/t-hpux-shlib b/gcc/config/pa/t-hpux-shlib index 1d63dcafb13..5183b062584 100644 --- a/gcc/config/pa/t-hpux-shlib +++ b/gcc/config/pa/t-hpux-shlib @@ -8,7 +8,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ rm -f $(SHLIB_SONAME) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) diff --git a/gcc/config/sh/t-linux b/gcc/config/sh/t-linux index d716c1be080..71e96f53157 100644 --- a/gcc/config/sh/t-linux +++ b/gcc/config/sh/t-linux @@ -26,7 +26,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \ rm -f $(SHLIB_SOLINK) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ (echo "/* GNU ld script"; \ diff --git a/gcc/config/t-libunwind-elf b/gcc/config/t-libunwind-elf index 7ba247a6afa..428bc43ed2e 100644 --- a/gcc/config/t-libunwind-elf +++ b/gcc/config/t-libunwind-elf @@ -14,8 +14,7 @@ SHLIBUNWIND_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared \ @multilib_flags@ $(SHLIB_OBJS) -lc && \ rm -f $(SHLIB_SOLINK) && \ if [ -f $(SHLIBUNWIND_NAME) ]; then \ - mv -f $(SHLIBUNWIND_NAME) \ - $(SHLIBUNWIND_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIBUNWIND_NAME) $(SHLIBUNWIND_NAME).backup; \ else true; fi && \ mv $(SHLIBUNWIND_NAME).tmp $(SHLIBUNWIND_NAME) && \ $(LN_S) $(SHLIBUNWIND_NAME) $(SHLIB_SOLINK) diff --git a/gcc/config/t-slibgcc-darwin b/gcc/config/t-slibgcc-darwin index 865f16fae77..66d4e777dd5 100644 --- a/gcc/config/t-slibgcc-darwin +++ b/gcc/config/t-slibgcc-darwin @@ -18,7 +18,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \ @multilib_flags@ $(SHLIB_OBJS) -lc && \ rm -f $(SHLIB_SOLINK) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK) diff --git a/gcc/config/t-slibgcc-elf-ver b/gcc/config/t-slibgcc-elf-ver index bf03277e0eb..e70647aa831 100644 --- a/gcc/config/t-slibgcc-elf-ver +++ b/gcc/config/t-slibgcc-elf-ver @@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \ rm -f $(SHLIB_SOLINK) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK) diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld index 66d056bee2e..64c147806c9 100644 --- a/gcc/config/t-slibgcc-sld +++ b/gcc/config/t-slibgcc-sld @@ -14,7 +14,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ @multilib_flags@ $(SHLIB_OBJS) -lc && \ rm -f $(SHLIB_SOLINK) && \ if [ -f $(SHLIB_NAME) ]; then \ - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ else true; fi && \ mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)