2004-12-14 H.J. Lu <hongjiu.lu@intel.com>

	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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92276 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e97ae9c..b5afd17 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2004-12-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       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  <rth@redhat.com>
 
        * Makefile.in (MD_DEPS, s-mddeps): New.

diff --git a/gcc/config/alpha/t-osf4 b/gcc/config/alpha/t-osf4
index 97f2cdf..58ce6c2 100644 (file)
--- 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 c5b4e68..533fab9 100644 (file)
--- 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 37c88c0..f56f1f1 100644 (file)
--- 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)+1)) >libgcc/build
 

diff --git a/gcc/config/mips/t-slibgcc-irix b/gcc/config/mips/t-slibgcc-irix
index b28514f..0eac89e 100644 (file)
--- 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 1d63dca..5183b06 100644 (file)
--- 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 d716c1b..71e96f5 100644 (file)
--- 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 7ba247a..428bc43 100644 (file)
--- 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 865f16f..66d4e77 100644 (file)
--- 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 bf03277..e70647a 100644 (file)
--- 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 66d056b..64c1478 100644 (file)
--- 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)