]>
Commit | Line | Data |
---|---|---|
0c98d65a MT |
1 | diff -rcp ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure |
2 | *** ../binutils-2.20.51.0.7.original/bfd/configure 2010-04-08 14:53:48.000000000 +0100 | |
3 | --- ./bfd/configure 2010-04-08 14:56:50.000000000 +0100 | |
4 | *************** fi | |
5 | *** 10762,10771 **** | |
6 | # before this can be enabled. | |
7 | hardcode_into_libs=yes | |
8 | ||
9 | # Append ld.so.conf contents to the search path | |
10 | if test -f /etc/ld.so.conf; then | |
11 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
12 | ! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
13 | fi | |
14 | ||
15 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
16 | --- 10762,10795 ---- | |
17 | # before this can be enabled. | |
18 | hardcode_into_libs=yes | |
19 | ||
20 | + # find out which ABI we are using | |
21 | + libsuff= | |
22 | + case "$host_cpu" in | |
23 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
24 | + echo 'int i;' > conftest.$ac_ext | |
25 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
26 | + (eval $ac_compile) 2>&5 | |
27 | + ac_status=$? | |
28 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
29 | + (exit $ac_status); }; then | |
30 | + case `/usr/bin/file conftest.$ac_objext` in | |
31 | + *64-bit*) | |
32 | + libsuff=64 | |
33 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
34 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
35 | + fi | |
36 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
37 | + ;; | |
38 | + esac | |
39 | + fi | |
40 | + rm -rf conftest* | |
41 | + ;; | |
42 | + esac | |
43 | + | |
44 | # Append ld.so.conf contents to the search path | |
45 | if test -f /etc/ld.so.conf; then | |
46 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
47 | ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
48 | fi | |
49 | ||
50 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
51 | diff -rcp ../binutils-2.20.51.0.7.original/binutils/configure ./binutils/configure | |
52 | *** ../binutils-2.20.51.0.7.original/binutils/configure 2010-04-08 14:53:45.000000000 +0100 | |
53 | --- ./binutils/configure 2010-04-08 14:56:21.000000000 +0100 | |
54 | *************** fi | |
55 | *** 10560,10569 **** | |
56 | # before this can be enabled. | |
57 | hardcode_into_libs=yes | |
58 | ||
59 | # Append ld.so.conf contents to the search path | |
60 | if test -f /etc/ld.so.conf; then | |
61 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
62 | ! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
63 | fi | |
64 | ||
65 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
66 | --- 10560,10593 ---- | |
67 | # before this can be enabled. | |
68 | hardcode_into_libs=yes | |
69 | ||
70 | + # find out which ABI we are using | |
71 | + libsuff= | |
72 | + case "$host_cpu" in | |
73 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
74 | + echo 'int i;' > conftest.$ac_ext | |
75 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
76 | + (eval $ac_compile) 2>&5 | |
77 | + ac_status=$? | |
78 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
79 | + (exit $ac_status); }; then | |
80 | + case `/usr/bin/file conftest.$ac_objext` in | |
81 | + *64-bit*) | |
82 | + libsuff=64 | |
83 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
84 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
85 | + fi | |
86 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
87 | + ;; | |
88 | + esac | |
89 | + fi | |
90 | + rm -rf conftest* | |
91 | + ;; | |
92 | + esac | |
93 | + | |
94 | # Append ld.so.conf contents to the search path | |
95 | if test -f /etc/ld.so.conf; then | |
96 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
97 | ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
98 | fi | |
99 | ||
100 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
101 | diff -rcp ../binutils-2.20.51.0.7.original/gas/configure ./gas/configure | |
102 | *** ../binutils-2.20.51.0.7.original/gas/configure 2010-04-08 14:53:47.000000000 +0100 | |
103 | --- ./gas/configure 2010-04-08 14:57:24.000000000 +0100 | |
104 | *************** fi | |
105 | *** 10547,10556 **** | |
106 | # before this can be enabled. | |
107 | hardcode_into_libs=yes | |
108 | ||
109 | # Append ld.so.conf contents to the search path | |
110 | if test -f /etc/ld.so.conf; then | |
111 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
112 | ! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
113 | fi | |
114 | ||
115 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
116 | --- 10547,10580 ---- | |
117 | # before this can be enabled. | |
118 | hardcode_into_libs=yes | |
119 | ||
120 | + # find out which ABI we are using | |
121 | + libsuff= | |
122 | + case "$host_cpu" in | |
123 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
124 | + echo 'int i;' > conftest.$ac_ext | |
125 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
126 | + (eval $ac_compile) 2>&5 | |
127 | + ac_status=$? | |
128 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
129 | + (exit $ac_status); }; then | |
130 | + case `/usr/bin/file conftest.$ac_objext` in | |
131 | + *64-bit*) | |
132 | + libsuff=64 | |
133 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
134 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
135 | + fi | |
136 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
137 | + ;; | |
138 | + esac | |
139 | + fi | |
140 | + rm -rf conftest* | |
141 | + ;; | |
142 | + esac | |
143 | + | |
144 | # Append ld.so.conf contents to the search path | |
145 | if test -f /etc/ld.so.conf; then | |
146 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
147 | ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
148 | fi | |
149 | ||
150 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
151 | diff -rcp ../binutils-2.20.51.0.7.original/gprof/configure ./gprof/configure | |
152 | *** ../binutils-2.20.51.0.7.original/gprof/configure 2010-04-08 14:53:45.000000000 +0100 | |
153 | --- ./gprof/configure 2010-04-08 14:57:50.000000000 +0100 | |
154 | *************** fi | |
155 | *** 10485,10494 **** | |
156 | # before this can be enabled. | |
157 | hardcode_into_libs=yes | |
158 | ||
159 | # Append ld.so.conf contents to the search path | |
160 | if test -f /etc/ld.so.conf; then | |
161 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
162 | ! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
163 | fi | |
164 | ||
165 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
166 | --- 10485,10518 ---- | |
167 | # before this can be enabled. | |
168 | hardcode_into_libs=yes | |
169 | ||
170 | + # find out which ABI we are using | |
171 | + libsuff= | |
172 | + case "$host_cpu" in | |
173 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
174 | + echo 'int i;' > conftest.$ac_ext | |
175 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
176 | + (eval $ac_compile) 2>&5 | |
177 | + ac_status=$? | |
178 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
179 | + (exit $ac_status); }; then | |
180 | + case `/usr/bin/file conftest.$ac_objext` in | |
181 | + *64-bit*) | |
182 | + libsuff=64 | |
183 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
184 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
185 | + fi | |
186 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
187 | + ;; | |
188 | + esac | |
189 | + fi | |
190 | + rm -rf conftest* | |
191 | + ;; | |
192 | + esac | |
193 | + | |
194 | # Append ld.so.conf contents to the search path | |
195 | if test -f /etc/ld.so.conf; then | |
196 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
197 | ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
198 | fi | |
199 | ||
200 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
201 | diff -rcp ../binutils-2.20.51.0.7.original/ld/configure ./ld/configure | |
202 | *** ../binutils-2.20.51.0.7.original/ld/configure 2010-04-08 14:53:44.000000000 +0100 | |
203 | --- ./ld/configure 2010-04-08 14:58:21.000000000 +0100 | |
204 | *************** fi | |
205 | *** 10966,10975 **** | |
206 | # before this can be enabled. | |
207 | hardcode_into_libs=yes | |
208 | ||
209 | # Append ld.so.conf contents to the search path | |
210 | if test -f /etc/ld.so.conf; then | |
211 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
212 | ! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
213 | fi | |
214 | ||
215 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
216 | --- 10966,10999 ---- | |
217 | # before this can be enabled. | |
218 | hardcode_into_libs=yes | |
219 | ||
220 | + # find out which ABI we are using | |
221 | + libsuff= | |
222 | + case "$host_cpu" in | |
223 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
224 | + echo 'int i;' > conftest.$ac_ext | |
225 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
226 | + (eval $ac_compile) 2>&5 | |
227 | + ac_status=$? | |
228 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
229 | + (exit $ac_status); }; then | |
230 | + case `/usr/bin/file conftest.$ac_objext` in | |
231 | + *64-bit*) | |
232 | + libsuff=64 | |
233 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
234 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
235 | + fi | |
236 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
237 | + ;; | |
238 | + esac | |
239 | + fi | |
240 | + rm -rf conftest* | |
241 | + ;; | |
242 | + esac | |
243 | + | |
244 | # Append ld.so.conf contents to the search path | |
245 | if test -f /etc/ld.so.conf; then | |
246 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
247 | ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
248 | fi | |
249 | ||
250 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
251 | Only in .: .#libtool.m4 | |
252 | Only in .: #libtool.m4# | |
253 | diff -rcp ../binutils-2.20.51.0.7.original/opcodes/configure ./opcodes/configure | |
254 | *** ../binutils-2.20.51.0.7.original/opcodes/configure 2010-04-08 14:53:45.000000000 +0100 | |
255 | --- ./opcodes/configure 2010-04-08 14:59:10.000000000 +0100 | |
256 | *************** fi | |
257 | *** 10496,10505 **** | |
258 | # before this can be enabled. | |
259 | hardcode_into_libs=yes | |
260 | ||
261 | # Append ld.so.conf contents to the search path | |
262 | if test -f /etc/ld.so.conf; then | |
263 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
264 | ! sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
265 | fi | |
266 | ||
267 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
268 | --- 10496,10529 ---- | |
269 | # before this can be enabled. | |
270 | hardcode_into_libs=yes | |
271 | ||
272 | + # find out which ABI we are using | |
273 | + libsuff= | |
274 | + case "$host_cpu" in | |
275 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
276 | + echo 'int i;' > conftest.$ac_ext | |
277 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
278 | + (eval $ac_compile) 2>&5 | |
279 | + ac_status=$? | |
280 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
281 | + (exit $ac_status); }; then | |
282 | + case `/usr/bin/file conftest.$ac_objext` in | |
283 | + *64-bit*) | |
284 | + libsuff=64 | |
285 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
286 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
287 | + fi | |
288 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
289 | + ;; | |
290 | + esac | |
291 | + fi | |
292 | + rm -rf conftest* | |
293 | + ;; | |
294 | + esac | |
295 | + | |
296 | # Append ld.so.conf contents to the search path | |
297 | if test -f /etc/ld.so.conf; then | |
298 | lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` | |
299 | ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
300 | fi | |
301 | ||
302 | # We used to test for /lib/ld.so.1 and disable shared libraries on |