]>
Commit | Line | Data |
---|---|---|
59e455fe ER |
1 | diff -rcp ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure |
2 | --- a/bfd/configure 2010-04-08 14:53:48.000000000 +0100 | |
3 | +++ b/bfd/configure 2010-04-08 14:56:50.000000000 +0100 | |
4 | @@ -10762,10 +10762,34 @@ | |
5 | # before this can be enabled. | |
6 | hardcode_into_libs=yes | |
7 | ||
8 | + # find out which ABI we are using | |
9 | + libsuff= | |
10 | + case "$host_cpu" in | |
11 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
12 | + echo 'int i;' > conftest.$ac_ext | |
13 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
14 | + (eval $ac_compile) 2>&5 | |
15 | + ac_status=$? | |
16 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
17 | + (exit $ac_status); }; then | |
18 | + case `/usr/bin/file conftest.$ac_objext` in | |
19 | + *64-bit*) | |
20 | + libsuff=64 | |
21 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
22 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
23 | + fi | |
24 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
25 | + ;; | |
26 | + esac | |
27 | + fi | |
28 | + rm -rf conftest* | |
29 | + ;; | |
30 | + esac | |
31 | + | |
32 | # Append ld.so.conf contents to the search path | |
33 | if test -f /etc/ld.so.conf; then | |
34 | 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' ' '` | |
35 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
36 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
37 | fi | |
38 | ||
39 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
40 | diff -rcp ../binutils-2.20.51.0.7.original/binutils/configure ./binutils/configure | |
41 | --- a/binutils/configure 2010-04-08 14:53:45.000000000 +0100 | |
42 | +++ b/binutils/configure 2010-04-08 14:56:21.000000000 +0100 | |
43 | @@ -10560,10 +10560,34 @@ | |
44 | # before this can be enabled. | |
45 | hardcode_into_libs=yes | |
46 | ||
47 | + # find out which ABI we are using | |
48 | + libsuff= | |
49 | + case "$host_cpu" in | |
50 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
51 | + echo 'int i;' > conftest.$ac_ext | |
52 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
53 | + (eval $ac_compile) 2>&5 | |
54 | + ac_status=$? | |
55 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
56 | + (exit $ac_status); }; then | |
57 | + case `/usr/bin/file conftest.$ac_objext` in | |
58 | + *64-bit*) | |
59 | + libsuff=64 | |
60 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
61 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
62 | + fi | |
63 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
64 | + ;; | |
65 | + esac | |
66 | + fi | |
67 | + rm -rf conftest* | |
68 | + ;; | |
69 | + esac | |
70 | + | |
71 | # Append ld.so.conf contents to the search path | |
72 | if test -f /etc/ld.so.conf; then | |
73 | 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' ' '` | |
74 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
75 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
76 | fi | |
77 | ||
78 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
79 | diff -rcp ../binutils-2.20.51.0.7.original/gas/configure ./gas/configure | |
80 | --- a/gas/configure 2010-04-08 14:53:47.000000000 +0100 | |
81 | +++ b/gas/configure 2010-04-08 14:57:24.000000000 +0100 | |
82 | @@ -10547,10 +10547,34 @@ | |
83 | # before this can be enabled. | |
84 | hardcode_into_libs=yes | |
85 | ||
86 | + # find out which ABI we are using | |
87 | + libsuff= | |
88 | + case "$host_cpu" in | |
89 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
90 | + echo 'int i;' > conftest.$ac_ext | |
91 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
92 | + (eval $ac_compile) 2>&5 | |
93 | + ac_status=$? | |
94 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
95 | + (exit $ac_status); }; then | |
96 | + case `/usr/bin/file conftest.$ac_objext` in | |
97 | + *64-bit*) | |
98 | + libsuff=64 | |
99 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
100 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
101 | + fi | |
102 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
103 | + ;; | |
104 | + esac | |
105 | + fi | |
106 | + rm -rf conftest* | |
107 | + ;; | |
108 | + esac | |
109 | + | |
110 | # Append ld.so.conf contents to the search path | |
111 | if test -f /etc/ld.so.conf; then | |
112 | 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' ' '` | |
113 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
114 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
115 | fi | |
116 | ||
117 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
118 | diff -rcp ../binutils-2.20.51.0.7.original/gprof/configure ./gprof/configure | |
119 | --- a/gprof/configure 2010-04-08 14:53:45.000000000 +0100 | |
120 | +++ b/gprof/configure 2010-04-08 14:57:50.000000000 +0100 | |
121 | @@ -10485,10 +10485,34 @@ | |
122 | # before this can be enabled. | |
123 | hardcode_into_libs=yes | |
124 | ||
125 | + # find out which ABI we are using | |
126 | + libsuff= | |
127 | + case "$host_cpu" in | |
128 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
129 | + echo 'int i;' > conftest.$ac_ext | |
130 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
131 | + (eval $ac_compile) 2>&5 | |
132 | + ac_status=$? | |
133 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
134 | + (exit $ac_status); }; then | |
135 | + case `/usr/bin/file conftest.$ac_objext` in | |
136 | + *64-bit*) | |
137 | + libsuff=64 | |
138 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
139 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
140 | + fi | |
141 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
142 | + ;; | |
143 | + esac | |
144 | + fi | |
145 | + rm -rf conftest* | |
146 | + ;; | |
147 | + esac | |
148 | + | |
149 | # Append ld.so.conf contents to the search path | |
150 | if test -f /etc/ld.so.conf; then | |
151 | 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' ' '` | |
152 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
153 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
154 | fi | |
155 | ||
156 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
157 | diff -rcp ../binutils-2.20.51.0.7.original/ld/configure ./ld/configure | |
158 | --- a/ld/configure 2010-04-08 14:53:44.000000000 +0100 | |
159 | +++ b/ld/configure 2010-04-08 14:58:21.000000000 +0100 | |
160 | @@ -10966,10 +10966,34 @@ | |
161 | # before this can be enabled. | |
162 | hardcode_into_libs=yes | |
163 | ||
164 | + # find out which ABI we are using | |
165 | + libsuff= | |
166 | + case "$host_cpu" in | |
167 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
168 | + echo 'int i;' > conftest.$ac_ext | |
169 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
170 | + (eval $ac_compile) 2>&5 | |
171 | + ac_status=$? | |
172 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
173 | + (exit $ac_status); }; then | |
174 | + case `/usr/bin/file conftest.$ac_objext` in | |
175 | + *64-bit*) | |
176 | + libsuff=64 | |
177 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
178 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
179 | + fi | |
180 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
181 | + ;; | |
182 | + esac | |
183 | + fi | |
184 | + rm -rf conftest* | |
185 | + ;; | |
186 | + esac | |
187 | + | |
188 | # Append ld.so.conf contents to the search path | |
189 | if test -f /etc/ld.so.conf; then | |
190 | 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' ' '` | |
191 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
192 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
193 | fi | |
194 | ||
195 | # We used to test for /lib/ld.so.1 and disable shared libraries on | |
196 | Only in .: .#libtool.m4 | |
197 | Only in .: #libtool.m4# | |
198 | diff -rcp ../binutils-2.20.51.0.7.original/opcodes/configure ./opcodes/configure | |
199 | --- a/opcodes/configure 2010-04-08 14:53:45.000000000 +0100 | |
200 | +++ b/opcodes/configure 2010-04-08 14:59:10.000000000 +0100 | |
201 | @@ -10496,10 +10496,34 @@ | |
202 | # before this can be enabled. | |
203 | hardcode_into_libs=yes | |
204 | ||
205 | + # find out which ABI we are using | |
206 | + libsuff= | |
207 | + case "$host_cpu" in | |
208 | + x86_64*|s390*|powerpc*|ppc*|sparc*) | |
209 | + echo 'int i;' > conftest.$ac_ext | |
210 | + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
211 | + (eval $ac_compile) 2>&5 | |
212 | + ac_status=$? | |
213 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
214 | + (exit $ac_status); }; then | |
215 | + case `/usr/bin/file conftest.$ac_objext` in | |
216 | + *64-bit*) | |
217 | + libsuff=64 | |
218 | + if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then | |
219 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
220 | + fi | |
221 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" | |
222 | + ;; | |
223 | + esac | |
224 | + fi | |
225 | + rm -rf conftest* | |
226 | + ;; | |
227 | + esac | |
228 | + | |
229 | # Append ld.so.conf contents to the search path | |
230 | if test -f /etc/ld.so.conf; then | |
231 | 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' ' '` | |
232 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
233 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
234 | fi | |
235 | ||
236 | # We used to test for /lib/ld.so.1 and disable shared libraries on |