|
yann@1
|
1 |
See http://gcc.gnu.org/PR18508
|
|
yann@1
|
2 |
|
|
yann@1
|
3 |
This should fix cygwin errors like:
|
|
yann@1
|
4 |
|
|
yann@1
|
5 |
basename: missing operand
|
|
yann@1
|
6 |
Try `basename --help' for more information.
|
|
yann@1
|
7 |
mv: `libgcc_s_nof.so.1' and `libgcc_s_nof.so.1.' are the same file
|
|
yann@1
|
8 |
make[2]: *** [nof/libgcc_s_nof.so] Error 1
|
|
yann@1
|
9 |
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
|
10 |
make[1]: *** [stmp-multilib] Error 2
|
|
yann@1
|
11 |
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
|
12 |
make: *** [install-gcc] Error 2
|
|
yann@1
|
13 |
|
|
yann@1
|
14 |
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
|
15 |
Return-Path: <gcc-patches-return-133821-listarch-gcc-patches=gcc dot gnu dot org at gcc dot gnu dot org>
|
|
yann@1
|
16 |
Delivered-To: listarch-gcc-patches at gcc dot gnu dot org
|
|
yann@1
|
17 |
Received: (qmail 12823 invoked by alias); 17 Nov 2004 00:15:19 -0000
|
|
yann@1
|
18 |
Mailing-List: contact gcc-patches-help at gcc dot gnu dot org; run by ezmlm
|
|
yann@1
|
19 |
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
|
|
yann@1
|
20 |
List-Post: <mailto:gcc-patches at gcc dot gnu dot org>
|
|
yann@1
|
21 |
List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org>
|
|
yann@1
|
22 |
Sender: gcc-patches-owner at gcc dot gnu dot org
|
|
yann@1
|
23 |
Date: Tue, 16 Nov 2004 16:14:57 -0800
|
|
yann@1
|
24 |
From: "H dot J dot Lu" <hjl at lucon dot org>
|
|
yann@1
|
25 |
To: gcc-patches at gcc dot gnu dot org
|
|
yann@1
|
26 |
Subject: PATCH: PR other/18508: "basename: too few arguments" when building without bootstrap
|
|
yann@1
|
27 |
Message-ID: <20041117001457.GA13610@lucon.org>
|
|
yann@1
|
28 |
|
|
yann@1
|
29 |
I think it is safe to use `.backup' to backup the existing shared
|
|
yann@1
|
30 |
library. No processes should be using the old shared library when
|
|
yann@1
|
31 |
we get there.
|
|
yann@1
|
32 |
|
|
yann@1
|
33 |
|
|
yann@1
|
34 |
H.J.
|
|
yann@1
|
35 |
---
|
|
yann@1
|
36 |
2004-11-16 H.J. Lu <hongjiu.lu@intel.com>
|
|
yann@1
|
37 |
|
|
yann@1
|
38 |
PR other/18508
|
|
yann@1
|
39 |
* config/alpha/t-osf4 (SHLIB_LINK): Use `.backup' as the suffix
|
|
yann@1
|
40 |
to back up the existing shared library.
|
|
yann@1
|
41 |
* config/arm/t-netbsd (SHLIB_LINK): Likewise.
|
|
yann@1
|
42 |
* config/i386/t-nwld (SHLIB_LINK): Likewise. [deleted]
|
|
yann@1
|
43 |
* config/mips/t-slibgcc-irix (SHLIB_LINK): Likewise. [deleted]
|
|
yann@1
|
44 |
* config/pa/t-hpux-shlib (SHLIB_LINK): Likewise.
|
|
yann@1
|
45 |
* config/sh/t-linux (SHLIB_LINK): Likewise.
|
|
yann@1
|
46 |
* config/t-libunwind-elf (SHLIBUNWIND_LINK): Likewise.
|
|
yann@1
|
47 |
* config/t-slibgcc-darwin (SHLIB_LINK): Likewise.
|
|
yann@1
|
48 |
* config/t-slibgcc-elf-ver (SHLIB_LINK): Likewise.
|
|
yann@1
|
49 |
* config/t-slibgcc-sld (SHLIB_LINK): Likewise.
|
|
yann@1
|
50 |
|
|
yann@1
|
51 |
[ paths adjusted for patch -p1, rediffed agaainst gcc-3.4.3.
|
|
yann@1
|
52 |
Looks like the t-iris5-6 hunk in cvs is missing here; this must
|
|
yann@1
|
53 |
have been the mainline patch. ]
|
|
yann@1
|
54 |
|
|
yann@1
|
55 |
--- gcc-3.4.3/gcc/config/alpha/t-osf4.stage 2004-10-18 09:14:39.000000000 -0700
|
|
yann@1
|
56 |
+++ gcc-3.4.3/gcc/config/alpha/t-osf4 2004-11-16 16:06:41.686905479 -0800
|
|
yann@1
|
57 |
@@ -19,7 +19,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
|
|
yann@1
|
58 |
-o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
|
|
yann@1
|
59 |
rm -f $(SHLIB_SONAME) && \
|
|
yann@1
|
60 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
61 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
62 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
63 |
else true; fi && \
|
|
yann@1
|
64 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
65 |
$(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
|
|
yann@1
|
66 |
--- gcc-3.4.3/gcc/config/arm/t-netbsd.stage 2004-10-18 09:14:40.000000000 -0700
|
|
yann@1
|
67 |
+++ gcc-3.4.3/gcc/config/arm/t-netbsd 2004-11-16 16:06:46.016348194 -0800
|
|
yann@1
|
68 |
@@ -14,7 +14,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
|
|
yann@1
|
69 |
-o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
|
|
yann@1
|
70 |
rm -f $(SHLIB_SONAME) && \
|
|
yann@1
|
71 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
72 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
73 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
74 |
else true; fi && \
|
|
yann@1
|
75 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
76 |
$(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
|
|
yann@1
|
77 |
--- gcc-3.4.3/gcc/config/pa/t-hpux-shlib.stage 2004-10-18 09:14:46.000000000 -0700
|
|
yann@1
|
78 |
+++ gcc-3.4.3/gcc/config/pa/t-hpux-shlib 2004-11-16 16:06:57.982807875 -0800
|
|
yann@1
|
79 |
@@ -8,7 +8,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
|
|
yann@1
|
80 |
-o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \
|
|
yann@1
|
81 |
rm -f $(SHLIB_SONAME) && \
|
|
yann@1
|
82 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
83 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
84 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
85 |
else true; fi && \
|
|
yann@1
|
86 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
87 |
$(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
|
|
yann@1
|
88 |
--- gcc-3.4.3/gcc/config/sh/t-linux.stage 2004-10-18 09:14:48.000000000 -0700
|
|
yann@1
|
89 |
+++ gcc-3.4.3/gcc/config/sh/t-linux 2004-11-16 16:07:00.787446863 -0800
|
|
yann@1
|
90 |
@@ -24,7 +24,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
|
|
yann@1
|
91 |
-o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \
|
|
yann@1
|
92 |
rm -f $(SHLIB_SOLINK) && \
|
|
yann@1
|
93 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
94 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
95 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
96 |
else true; fi && \
|
|
yann@1
|
97 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
98 |
(echo "/* GNU ld script"; \
|
|
yann@1
|
99 |
--- gcc-3.4.3/gcc/config/t-libunwind-elf.stage 2004-10-18 09:14:39.000000000 -0700
|
|
yann@1
|
100 |
+++ gcc-3.4.3/gcc/config/t-libunwind-elf 2004-11-16 16:07:08.133501281 -0800
|
|
yann@1
|
101 |
@@ -14,8 +14,7 @@ SHLIBUNWIND_LINK = $(GCC_FOR_TARGET) $(L
|
|
yann@1
|
102 |
@multilib_flags@ $(SHLIB_OBJS) -lc && \
|
|
yann@1
|
103 |
rm -f $(SHLIB_SOLINK) && \
|
|
yann@1
|
104 |
if [ -f $(SHLIBUNWIND_NAME) ]; then \
|
|
yann@1
|
105 |
- mv -f $(SHLIBUNWIND_NAME) \
|
|
yann@1
|
106 |
- $(SHLIBUNWIND_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
107 |
+ mv -f $(SHLIBUNWIND_NAME) $(SHLIBUNWIND_NAME).backup; \
|
|
yann@1
|
108 |
else true; fi && \
|
|
yann@1
|
109 |
mv $(SHLIBUNWIND_NAME).tmp $(SHLIBUNWIND_NAME) && \
|
|
yann@1
|
110 |
$(LN_S) $(SHLIBUNWIND_NAME) $(SHLIB_SOLINK)
|
|
yann@1
|
111 |
--- gcc-3.4.3/gcc/config/t-slibgcc-darwin.stage 2004-10-18 09:14:39.000000000 -0700
|
|
yann@1
|
112 |
+++ gcc-3.4.3/gcc/config/t-slibgcc-darwin 2004-11-16 16:07:13.777774752 -0800
|
|
yann@1
|
113 |
@@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
|
|
yann@1
|
114 |
@multilib_flags@ $(SHLIB_OBJS) -lc && \
|
|
yann@1
|
115 |
rm -f $(SHLIB_SOLINK) && \
|
|
yann@1
|
116 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
117 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
118 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
119 |
else true; fi && \
|
|
yann@1
|
120 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
121 |
$(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
|
|
yann@1
|
122 |
--- gcc-3.4.3/gcc/config/t-slibgcc-elf-ver.stage 2004-10-18 09:14:39.000000000 -0700
|
|
yann@1
|
123 |
+++ gcc-3.4.3/gcc/config/t-slibgcc-elf-ver 2004-11-16 16:04:40.961445223 -0800
|
|
yann@1
|
124 |
@@ -17,7 +17,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2
|
|
yann@1
|
125 |
-o $(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \
|
|
yann@1
|
126 |
rm -f $(SHLIB_SOLINK) && \
|
|
yann@1
|
127 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
128 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
129 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
130 |
else true; fi && \
|
|
yann@1
|
131 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
132 |
$(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
|
|
yann@1
|
133 |
--- gcc-3.4.3/gcc/config/t-slibgcc-sld.old 2004-10-18 09:00:47.000000000 -0700
|
|
yann@1
|
134 |
+++ gcc-3.4.3/gcc/config/t-slibgcc-sld 2005-05-14 13:44:48.000000000 -0700
|
|
yann@1
|
135 |
@@ -14,7 +14,7 @@
|
|
yann@1
|
136 |
@multilib_flags@ $(SHLIB_OBJS) -lc && \
|
|
yann@1
|
137 |
rm -f $(SHLIB_SOLINK) && \
|
|
yann@1
|
138 |
if [ -f $(SHLIB_NAME) ]; then \
|
|
yann@1
|
139 |
- mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
|
|
yann@1
|
140 |
+ mv -f $(SHLIB_NAME) $(SHLIB_NAME).backup; \
|
|
yann@1
|
141 |
else true; fi && \
|
|
yann@1
|
142 |
mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
|
|
yann@1
|
143 |
$(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
|