yann@1: See http://gcc.gnu.org/PR18508 yann@1: yann@1: This should fix cygwin errors like: yann@1: yann@1: basename: missing operand yann@1: Try `basename --help' for more information. yann@1: mv: `libgcc_s_nof.so.1' and `libgcc_s_nof.so.1.' are the same file yann@1: make[2]: *** [nof/libgcc_s_nof.so] Error 1 yann@1: 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' yann@1: make[1]: *** [stmp-multilib] Error 2 yann@1: 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' yann@1: make: *** [install-gcc] Error 2 yann@1: yann@1: 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 yann@1: Return-Path: yann@1: Delivered-To: listarch-gcc-patches at gcc dot gnu dot org yann@1: Received: (qmail 12823 invoked by alias); 17 Nov 2004 00:15:19 -0000 yann@1: Mailing-List: contact gcc-patches-help at gcc dot gnu dot org; run by ezmlm yann@1: List-Archive: yann@1: List-Post: yann@1: List-Help: yann@1: Sender: gcc-patches-owner at gcc dot gnu dot org yann@1: Date: Tue, 16 Nov 2004 16:14:57 -0800 yann@1: From: "H dot J dot Lu" yann@1: To: gcc-patches at gcc dot gnu dot org yann@1: Subject: PATCH: PR other/18508: "basename: too few arguments" when building without bootstrap yann@1: Message-ID: <20041117001457.GA13610@lucon.org> yann@1: yann@1: I think it is safe to use `.backup' to backup the existing shared yann@1: library. No processes should be using the old shared library when yann@1: we get there. yann@1: yann@1: yann@1: H.J. yann@1: --- yann@1: 2004-11-16 H.J. Lu yann@1: yann@1: PR other/18508 yann@1: * config/alpha/t-osf4 (SHLIB_LINK): Use `.backup' as the suffix yann@1: to back up the existing shared library. yann@1: * config/arm/t-netbsd (SHLIB_LINK): Likewise. yann@1: * config/i386/t-nwld (SHLIB_LINK): Likewise. [deleted] yann@1: * config/mips/t-slibgcc-irix (SHLIB_LINK): Likewise. [deleted] yann@1: * config/pa/t-hpux-shlib (SHLIB_LINK): Likewise. yann@1: * config/sh/t-linux (SHLIB_LINK): Likewise. yann@1: * config/t-libunwind-elf (SHLIBUNWIND_LINK): Likewise. yann@1: * config/t-slibgcc-darwin (SHLIB_LINK): Likewise. yann@1: * config/t-slibgcc-elf-ver (SHLIB_LINK): Likewise. yann@1: * config/t-slibgcc-sld (SHLIB_LINK): Likewise. yann@1: yann@1: [ paths adjusted for patch -p1, rediffed agaainst gcc-3.4.3. yann@1: Looks like the t-iris5-6 hunk in cvs is missing here; this must yann@1: have been the mainline patch. ] yann@1: yann@1: --- gcc-3.4.3/gcc/config/alpha/t-osf4.stage 2004-10-18 09:14:39.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/alpha/t-osf4 2004-11-16 16:06:41.686905479 -0800 yann@1: @@ -19,7 +19,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2 yann@1: -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ yann@1: rm -f $(SHLIB_SONAME) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) yann@1: --- gcc-3.4.3/gcc/config/arm/t-netbsd.stage 2004-10-18 09:14:40.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/arm/t-netbsd 2004-11-16 16:06:46.016348194 -0800 yann@1: @@ -14,7 +14,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2 yann@1: -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ yann@1: rm -f $(SHLIB_SONAME) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) yann@1: --- gcc-3.4.3/gcc/config/pa/t-hpux-shlib.stage 2004-10-18 09:14:46.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/pa/t-hpux-shlib 2004-11-16 16:06:57.982807875 -0800 yann@1: @@ -8,7 +8,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2 yann@1: -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ yann@1: rm -f $(SHLIB_SONAME) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) yann@1: --- gcc-3.4.3/gcc/config/sh/t-linux.stage 2004-10-18 09:14:48.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/sh/t-linux 2004-11-16 16:07:00.787446863 -0800 yann@1: @@ -24,7 +24,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2 yann@1: -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \ yann@1: rm -f $(SHLIB_SOLINK) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: (echo "/* GNU ld script"; \ yann@1: --- gcc-3.4.3/gcc/config/t-libunwind-elf.stage 2004-10-18 09:14:39.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/t-libunwind-elf 2004-11-16 16:07:08.133501281 -0800 yann@1: @@ -14,8 +14,7 @@ SHLIBUNWIND_LINK = $(GCC_FOR_TARGET) $(L yann@1: @multilib_flags@ $(SHLIB_OBJS) -lc && \ yann@1: rm -f $(SHLIB_SOLINK) && \ yann@1: if [ -f $(SHLIBUNWIND_NAME) ]; then \ yann@1: - mv -f $(SHLIBUNWIND_NAME) \ yann@1: - $(SHLIBUNWIND_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIBUNWIND_NAME) $(SHLIBUNWIND_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIBUNWIND_NAME).tmp $(SHLIBUNWIND_NAME) && \ yann@1: $(LN_S) $(SHLIBUNWIND_NAME) $(SHLIB_SOLINK) yann@1: --- gcc-3.4.3/gcc/config/t-slibgcc-darwin.stage 2004-10-18 09:14:39.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/t-slibgcc-darwin 2004-11-16 16:07:13.777774752 -0800 yann@1: @@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2 yann@1: @multilib_flags@ $(SHLIB_OBJS) -lc && \ yann@1: rm -f $(SHLIB_SOLINK) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK) yann@1: --- gcc-3.4.3/gcc/config/t-slibgcc-elf-ver.stage 2004-10-18 09:14:39.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/t-slibgcc-elf-ver 2004-11-16 16:04:40.961445223 -0800 yann@1: @@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2 yann@1: -o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \ yann@1: rm -f $(SHLIB_SOLINK) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK) yann@1: --- gcc-3.4.3/gcc/config/t-slibgcc-sld.old 2004-10-18 09:00:47.000000000 -0700 yann@1: +++ gcc-3.4.3/gcc/config/t-slibgcc-sld 2005-05-14 13:44:48.000000000 -0700 yann@1: @@ -14,7 +14,7 @@ yann@1: @multilib_flags@ $(SHLIB_OBJS) -lc && \ yann@1: rm -f $(SHLIB_SOLINK) && \ yann@1: if [ -f $(SHLIB_NAME) ]; then \ yann@1: - mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \ yann@1: + mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \ yann@1: else true; fi && \ yann@1: mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \ yann@1: $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)