1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/gcc/3.4.3/pr18508-fix.patch Sat Feb 24 11:00:05 2007 +0000
1.3 @@ -0,0 +1,143 @@
1.4 +See http://gcc.gnu.org/PR18508
1.5 +
1.6 +This should fix cygwin errors like:
1.7 +
1.8 +basename: missing operand
1.9 +Try `basename --help' for more information.
1.10 +mv: `libgcc_s_nof.so.1' and `libgcc_s_nof.so.1.' are the same file
1.11 +make[2]: *** [nof/libgcc_s_nof.so] Error 1
1.12 +make[2]: Leaving directory `/home/cvachoucek/crosstool-0.32/build/powerpc-750-linux-gnu/gcc-3.4.3-glibc-2.3.5/build-gcc/gcc'
1.13 +make[1]: *** [stmp-multilib] Error 2
1.14 +make[1]: Leaving directory `/home/cvachoucek/crosstool-0.32/build/powerpc-750-linux-gnu/gcc-3.4.3-glibc-2.3.5/build-gcc/gcc'
1.15 +make: *** [install-gcc] Error 2
1.16 +
1.17 +From gcc-patches-return-133821-listarch-gcc-patches=gcc dot gnu dot org at gcc dot gnu dot org Wed Nov 17 00:15:28 2004
1.18 +Return-Path: <gcc-patches-return-133821-listarch-gcc-patches=gcc dot gnu dot org at gcc dot gnu dot org>
1.19 +Delivered-To: listarch-gcc-patches at gcc dot gnu dot org
1.20 +Received: (qmail 12823 invoked by alias); 17 Nov 2004 00:15:19 -0000
1.21 +Mailing-List: contact gcc-patches-help at gcc dot gnu dot org; run by ezmlm
1.22 +List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
1.23 +List-Post: <mailto:gcc-patches at gcc dot gnu dot org>
1.24 +List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org>
1.25 +Sender: gcc-patches-owner at gcc dot gnu dot org
1.26 +Date: Tue, 16 Nov 2004 16:14:57 -0800
1.27 +From: "H dot J dot Lu" <hjl at lucon dot org>
1.28 +To: gcc-patches at gcc dot gnu dot org
1.29 +Subject: PATCH: PR other/18508: "basename: too few arguments" when building without bootstrap
1.30 +Message-ID: <20041117001457.GA13610@lucon.org>
1.31 +
1.32 +I think it is safe to use `.backup' to backup the existing shared
1.33 +library. No processes should be using the old shared library when
1.34 +we get there.
1.35 +
1.36 +
1.37 +H.J.
1.38 +---
1.39 +2004-11-16 H.J. Lu <hongjiu.lu@intel.com>
1.40 +
1.41 + PR other/18508
1.42 + * config/alpha/t-osf4 (SHLIB_LINK): Use `.backup' as the suffix
1.43 + to back up the existing shared library.
1.44 + * config/arm/t-netbsd (SHLIB_LINK): Likewise.
1.45 + * config/i386/t-nwld (SHLIB_LINK): Likewise. [deleted]
1.46 + * config/mips/t-slibgcc-irix (SHLIB_LINK): Likewise. [deleted]
1.47 + * config/pa/t-hpux-shlib (SHLIB_LINK): Likewise.
1.48 + * config/sh/t-linux (SHLIB_LINK): Likewise.
1.49 + * config/t-libunwind-elf (SHLIBUNWIND_LINK): Likewise.
1.50 + * config/t-slibgcc-darwin (SHLIB_LINK): Likewise.
1.51 + * config/t-slibgcc-elf-ver (SHLIB_LINK): Likewise.
1.52 + * config/t-slibgcc-sld (SHLIB_LINK): Likewise.
1.53 +
1.54 +[ paths adjusted for patch -p1, rediffed agaainst gcc-3.4.3.
1.55 + Looks like the t-iris5-6 hunk in cvs is missing here; this must
1.56 + have been the mainline patch. ]
1.57 +
1.58 +--- gcc-3.4.3/gcc/config/alpha/t-osf4.stage 2004-10-18 09:14:39.000000000 -0700
1.59 ++++ gcc-3.4.3/gcc/config/alpha/t-osf4 2004-11-16 16:06:41.686905479 -0800
1.60 +@@ -19,7 +19,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
1.61 + -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
1.62 + rm -f $(SHLIB_SONAME) && \
1.63 + if [ -f $(SHLIB_NAME) ]; then \
1.64 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.65 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.66 + else true; fi && \
1.67 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.68 + $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
1.69 +--- gcc-3.4.3/gcc/config/arm/t-netbsd.stage 2004-10-18 09:14:40.000000000 -0700
1.70 ++++ gcc-3.4.3/gcc/config/arm/t-netbsd 2004-11-16 16:06:46.016348194 -0800
1.71 +@@ -14,7 +14,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
1.72 + -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
1.73 + rm -f $(SHLIB_SONAME) && \
1.74 + if [ -f $(SHLIB_NAME) ]; then \
1.75 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.76 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.77 + else true; fi && \
1.78 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.79 + $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
1.80 +--- gcc-3.4.3/gcc/config/pa/t-hpux-shlib.stage 2004-10-18 09:14:46.000000000 -0700
1.81 ++++ gcc-3.4.3/gcc/config/pa/t-hpux-shlib 2004-11-16 16:06:57.982807875 -0800
1.82 +@@ -8,7 +8,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
1.83 + -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
1.84 + rm -f $(SHLIB_SONAME) && \
1.85 + if [ -f $(SHLIB_NAME) ]; then \
1.86 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.87 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.88 + else true; fi && \
1.89 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.90 + $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
1.91 +--- gcc-3.4.3/gcc/config/sh/t-linux.stage 2004-10-18 09:14:48.000000000 -0700
1.92 ++++ gcc-3.4.3/gcc/config/sh/t-linux 2004-11-16 16:07:00.787446863 -0800
1.93 +@@ -24,7 +24,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
1.94 + -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \
1.95 + rm -f $(SHLIB_SOLINK) && \
1.96 + if [ -f $(SHLIB_NAME) ]; then \
1.97 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.98 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.99 + else true; fi && \
1.100 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.101 + (echo "/* GNU ld script"; \
1.102 +--- gcc-3.4.3/gcc/config/t-libunwind-elf.stage 2004-10-18 09:14:39.000000000 -0700
1.103 ++++ gcc-3.4.3/gcc/config/t-libunwind-elf 2004-11-16 16:07:08.133501281 -0800
1.104 +@@ -14,8 +14,7 @@ SHLIBUNWIND_LINK = $(GCC_FOR_TARGET) $(L
1.105 + @multilib_flags@ $(SHLIB_OBJS) -lc && \
1.106 + rm -f $(SHLIB_SOLINK) && \
1.107 + if [ -f $(SHLIBUNWIND_NAME) ]; then \
1.108 +- mv -f $(SHLIBUNWIND_NAME) \
1.109 +- $(SHLIBUNWIND_NAME).`basename $(STAGE_PREFIX)`; \
1.110 ++ mv -f $(SHLIBUNWIND_NAME) $(SHLIBUNWIND_NAME).backup; \
1.111 + else true; fi && \
1.112 + mv $(SHLIBUNWIND_NAME).tmp $(SHLIBUNWIND_NAME) && \
1.113 + $(LN_S) $(SHLIBUNWIND_NAME) $(SHLIB_SOLINK)
1.114 +--- gcc-3.4.3/gcc/config/t-slibgcc-darwin.stage 2004-10-18 09:14:39.000000000 -0700
1.115 ++++ gcc-3.4.3/gcc/config/t-slibgcc-darwin 2004-11-16 16:07:13.777774752 -0800
1.116 +@@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
1.117 + @multilib_flags@ $(SHLIB_OBJS) -lc && \
1.118 + rm -f $(SHLIB_SOLINK) && \
1.119 + if [ -f $(SHLIB_NAME) ]; then \
1.120 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.121 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.122 + else true; fi && \
1.123 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.124 + $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
1.125 +--- gcc-3.4.3/gcc/config/t-slibgcc-elf-ver.stage 2004-10-18 09:14:39.000000000 -0700
1.126 ++++ gcc-3.4.3/gcc/config/t-slibgcc-elf-ver 2004-11-16 16:04:40.961445223 -0800
1.127 +@@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
1.128 + -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \
1.129 + rm -f $(SHLIB_SOLINK) && \
1.130 + if [ -f $(SHLIB_NAME) ]; then \
1.131 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.132 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.133 + else true; fi && \
1.134 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.135 + $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
1.136 +--- gcc-3.4.3/gcc/config/t-slibgcc-sld.old 2004-10-18 09:00:47.000000000 -0700
1.137 ++++ gcc-3.4.3/gcc/config/t-slibgcc-sld 2005-05-14 13:44:48.000000000 -0700
1.138 +@@ -14,7 +14,7 @@
1.139 + @multilib_flags@ $(SHLIB_OBJS) -lc && \
1.140 + rm -f $(SHLIB_SOLINK) && \
1.141 + if [ -f $(SHLIB_NAME) ]; then \
1.142 +- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
1.143 ++ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
1.144 + else true; fi && \
1.145 + mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
1.146 + $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)