net147@3033
|
1 |
This patch fixes another configure test issue when bootstrapping.
|
net147@3033
|
2 |
sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
|
net147@3033
|
3 |
test for cpuid.h, and that macro tries to include various other
|
net147@3033
|
4 |
standard headers (which come from the library, unlike cpuid.h which
|
net147@3033
|
5 |
comes from the compiler, so aren't available when bootstrapping) in
|
net147@3033
|
6 |
the test code it compiles. This patch changes the code to use
|
net147@3033
|
7 |
AC_CHECK_HEADER, with the fourth argument used to prevent any default
|
net147@3033
|
8 |
includes being used in the test.
|
net147@3033
|
9 |
|
net147@3033
|
10 |
Tested x86_64 (native).
|
net147@3033
|
11 |
|
net147@3033
|
12 |
2012-03-07 Joseph Myers <joseph@codesourcery.com>
|
net147@3033
|
13 |
|
net147@3033
|
14 |
* sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
|
net147@3033
|
15 |
default includes instead of AC_HEADER_CHECK.
|
net147@3033
|
16 |
* sysdeps/i386/configure: Regenerated.
|
net147@3033
|
17 |
|
net147@3033
|
18 |
Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
|
net147@3033
|
19 |
|
net147@3033
|
20 |
diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
|
net147@3033
|
21 |
--- glibc-2.14.1.orig/sysdeps/i386/configure 2011-10-07 20:48:55.000000000 +1100
|
net147@3033
|
22 |
+++ glibc-2.14.1/sysdeps/i386/configure 2012-07-25 01:23:11.799118927 +1000
|
net147@3033
|
23 |
@@ -16,23 +16,6 @@
|
net147@3033
|
24 |
as_fn_set_status $1
|
net147@3033
|
25 |
exit $1
|
net147@3033
|
26 |
} # as_fn_exit
|
net147@3033
|
27 |
-# as_fn_arith ARG...
|
net147@3033
|
28 |
-# ------------------
|
net147@3033
|
29 |
-# Perform arithmetic evaluation on the ARGs, and store the result in the
|
net147@3033
|
30 |
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
|
net147@3033
|
31 |
-# must be portable across $(()) and expr.
|
net147@3033
|
32 |
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
|
net147@3033
|
33 |
- eval 'as_fn_arith ()
|
net147@3033
|
34 |
- {
|
net147@3033
|
35 |
- as_val=$(( $* ))
|
net147@3033
|
36 |
- }'
|
net147@3033
|
37 |
-else
|
net147@3033
|
38 |
- as_fn_arith ()
|
net147@3033
|
39 |
- {
|
net147@3033
|
40 |
- as_val=`expr "$@" || test $? -eq 1`
|
net147@3033
|
41 |
- }
|
net147@3033
|
42 |
-fi # as_fn_arith
|
net147@3033
|
43 |
-
|
net147@3033
|
44 |
if expr a : '\(a\)' >/dev/null 2>&1 &&
|
net147@3033
|
45 |
test "X`expr 00001 : '.*\(...\)'`" = X001; then
|
net147@3033
|
46 |
as_expr=expr
|
net147@3033
|
47 |
@@ -89,6 +72,10 @@
|
net147@3033
|
48 |
chmod +x "$as_me.lineno" ||
|
net147@3033
|
49 |
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
net147@3033
|
50 |
|
net147@3033
|
51 |
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
|
net147@3033
|
52 |
+ # already done that, so ensure we don't try to do so again and fall
|
net147@3033
|
53 |
+ # in an infinite loop. This has already happened in practice.
|
net147@3033
|
54 |
+ _as_can_reexec=no; export _as_can_reexec
|
net147@3033
|
55 |
# Don't try to exec as it changes $[0], causing all sort of problems
|
net147@3033
|
56 |
# (the dirname of $[0] is not the place where we might find the
|
net147@3033
|
57 |
# original and so on. Autoconf is especially sensitive to this).
|
net147@3033
|
58 |
@@ -97,42 +84,6 @@
|
net147@3033
|
59 |
exit
|
net147@3033
|
60 |
}
|
net147@3033
|
61 |
|
net147@3033
|
62 |
-# Factoring default headers for most tests.
|
net147@3033
|
63 |
-ac_includes_default="\
|
net147@3033
|
64 |
-#include <stdio.h>
|
net147@3033
|
65 |
-#ifdef HAVE_SYS_TYPES_H
|
net147@3033
|
66 |
-# include <sys/types.h>
|
net147@3033
|
67 |
-#endif
|
net147@3033
|
68 |
-#ifdef HAVE_SYS_STAT_H
|
net147@3033
|
69 |
-# include <sys/stat.h>
|
net147@3033
|
70 |
-#endif
|
net147@3033
|
71 |
-#ifdef STDC_HEADERS
|
net147@3033
|
72 |
-# include <stdlib.h>
|
net147@3033
|
73 |
-# include <stddef.h>
|
net147@3033
|
74 |
-#else
|
net147@3033
|
75 |
-# ifdef HAVE_STDLIB_H
|
net147@3033
|
76 |
-# include <stdlib.h>
|
net147@3033
|
77 |
-# endif
|
net147@3033
|
78 |
-#endif
|
net147@3033
|
79 |
-#ifdef HAVE_STRING_H
|
net147@3033
|
80 |
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
|
net147@3033
|
81 |
-# include <memory.h>
|
net147@3033
|
82 |
-# endif
|
net147@3033
|
83 |
-# include <string.h>
|
net147@3033
|
84 |
-#endif
|
net147@3033
|
85 |
-#ifdef HAVE_STRINGS_H
|
net147@3033
|
86 |
-# include <strings.h>
|
net147@3033
|
87 |
-#endif
|
net147@3033
|
88 |
-#ifdef HAVE_INTTYPES_H
|
net147@3033
|
89 |
-# include <inttypes.h>
|
net147@3033
|
90 |
-#endif
|
net147@3033
|
91 |
-#ifdef HAVE_STDINT_H
|
net147@3033
|
92 |
-# include <stdint.h>
|
net147@3033
|
93 |
-#endif
|
net147@3033
|
94 |
-#ifdef HAVE_UNISTD_H
|
net147@3033
|
95 |
-# include <unistd.h>
|
net147@3033
|
96 |
-#endif"
|
net147@3033
|
97 |
-
|
net147@3033
|
98 |
|
net147@3033
|
99 |
# ac_fn_c_try_compile LINENO
|
net147@3033
|
100 |
# --------------------------
|
net147@3033
|
101 |
@@ -167,177 +118,11 @@
|
net147@3033
|
102 |
|
net147@3033
|
103 |
ac_retval=1
|
net147@3033
|
104 |
fi
|
net147@3033
|
105 |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
net147@3033
|
106 |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
net147@3033
|
107 |
as_fn_set_status $ac_retval
|
net147@3033
|
108 |
|
net147@3033
|
109 |
} # ac_fn_c_try_compile
|
net147@3033
|
110 |
|
net147@3033
|
111 |
-# ac_fn_c_try_cpp LINENO
|
net147@3033
|
112 |
-# ----------------------
|
net147@3033
|
113 |
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
|
net147@3033
|
114 |
-ac_fn_c_try_cpp ()
|
net147@3033
|
115 |
-{
|
net147@3033
|
116 |
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
net147@3033
|
117 |
- if { { ac_try="$ac_cpp conftest.$ac_ext"
|
net147@3033
|
118 |
-case "(($ac_try" in
|
net147@3033
|
119 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
net147@3033
|
120 |
- *) ac_try_echo=$ac_try;;
|
net147@3033
|
121 |
-esac
|
net147@3033
|
122 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
net147@3033
|
123 |
-$as_echo "$ac_try_echo"; } >&5
|
net147@3033
|
124 |
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
|
net147@3033
|
125 |
- ac_status=$?
|
net147@3033
|
126 |
- if test -s conftest.err; then
|
net147@3033
|
127 |
- grep -v '^ *+' conftest.err >conftest.er1
|
net147@3033
|
128 |
- cat conftest.er1 >&5
|
net147@3033
|
129 |
- mv -f conftest.er1 conftest.err
|
net147@3033
|
130 |
- fi
|
net147@3033
|
131 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
net147@3033
|
132 |
- test $ac_status = 0; } >/dev/null && {
|
net147@3033
|
133 |
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
net147@3033
|
134 |
- test ! -s conftest.err
|
net147@3033
|
135 |
- }; then :
|
net147@3033
|
136 |
- ac_retval=0
|
net147@3033
|
137 |
-else
|
net147@3033
|
138 |
- $as_echo "$as_me: failed program was:" >&5
|
net147@3033
|
139 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
net147@3033
|
140 |
-
|
net147@3033
|
141 |
- ac_retval=1
|
net147@3033
|
142 |
-fi
|
net147@3033
|
143 |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
net147@3033
|
144 |
- as_fn_set_status $ac_retval
|
net147@3033
|
145 |
-
|
net147@3033
|
146 |
-} # ac_fn_c_try_cpp
|
net147@3033
|
147 |
-
|
net147@3033
|
148 |
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
|
net147@3033
|
149 |
-# -------------------------------------------------------
|
net147@3033
|
150 |
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
|
net147@3033
|
151 |
-# the include files in INCLUDES and setting the cache variable VAR
|
net147@3033
|
152 |
-# accordingly.
|
net147@3033
|
153 |
-ac_fn_c_check_header_mongrel ()
|
net147@3033
|
154 |
-{
|
net147@3033
|
155 |
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
net147@3033
|
156 |
- if eval "test \"\${$3+set}\"" = set; then :
|
net147@3033
|
157 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
net147@3033
|
158 |
-$as_echo_n "checking for $2... " >&6; }
|
net147@3033
|
159 |
-if eval "test \"\${$3+set}\"" = set; then :
|
net147@3033
|
160 |
- $as_echo_n "(cached) " >&6
|
net147@3033
|
161 |
-fi
|
net147@3033
|
162 |
-eval ac_res=\$$3
|
net147@3033
|
163 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
net147@3033
|
164 |
-$as_echo "$ac_res" >&6; }
|
net147@3033
|
165 |
-else
|
net147@3033
|
166 |
- # Is the header compilable?
|
net147@3033
|
167 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
|
net147@3033
|
168 |
-$as_echo_n "checking $2 usability... " >&6; }
|
net147@3033
|
169 |
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
170 |
-/* end confdefs.h. */
|
net147@3033
|
171 |
-$4
|
net147@3033
|
172 |
-#include <$2>
|
net147@3033
|
173 |
-_ACEOF
|
net147@3033
|
174 |
-if ac_fn_c_try_compile "$LINENO"; then :
|
net147@3033
|
175 |
- ac_header_compiler=yes
|
net147@3033
|
176 |
-else
|
net147@3033
|
177 |
- ac_header_compiler=no
|
net147@3033
|
178 |
-fi
|
net147@3033
|
179 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
net147@3033
|
180 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
|
net147@3033
|
181 |
-$as_echo "$ac_header_compiler" >&6; }
|
net147@3033
|
182 |
-
|
net147@3033
|
183 |
-# Is the header present?
|
net147@3033
|
184 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
|
net147@3033
|
185 |
-$as_echo_n "checking $2 presence... " >&6; }
|
net147@3033
|
186 |
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
187 |
-/* end confdefs.h. */
|
net147@3033
|
188 |
-#include <$2>
|
net147@3033
|
189 |
-_ACEOF
|
net147@3033
|
190 |
-if ac_fn_c_try_cpp "$LINENO"; then :
|
net147@3033
|
191 |
- ac_header_preproc=yes
|
net147@3033
|
192 |
-else
|
net147@3033
|
193 |
- ac_header_preproc=no
|
net147@3033
|
194 |
-fi
|
net147@3033
|
195 |
-rm -f conftest.err conftest.$ac_ext
|
net147@3033
|
196 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
|
net147@3033
|
197 |
-$as_echo "$ac_header_preproc" >&6; }
|
net147@3033
|
198 |
-
|
net147@3033
|
199 |
-# So? What about this header?
|
net147@3033
|
200 |
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
|
net147@3033
|
201 |
- yes:no: )
|
net147@3033
|
202 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
|
net147@3033
|
203 |
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
net147@3033
|
204 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
net147@3033
|
205 |
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
net147@3033
|
206 |
- ;;
|
net147@3033
|
207 |
- no:yes:* )
|
net147@3033
|
208 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
|
net147@3033
|
209 |
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
|
net147@3033
|
210 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
|
net147@3033
|
211 |
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
|
net147@3033
|
212 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
|
net147@3033
|
213 |
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
|
net147@3033
|
214 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
|
net147@3033
|
215 |
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
|
net147@3033
|
216 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
net147@3033
|
217 |
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
net147@3033
|
218 |
- ;;
|
net147@3033
|
219 |
-esac
|
net147@3033
|
220 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
net147@3033
|
221 |
-$as_echo_n "checking for $2... " >&6; }
|
net147@3033
|
222 |
-if eval "test \"\${$3+set}\"" = set; then :
|
net147@3033
|
223 |
- $as_echo_n "(cached) " >&6
|
net147@3033
|
224 |
-else
|
net147@3033
|
225 |
- eval "$3=\$ac_header_compiler"
|
net147@3033
|
226 |
-fi
|
net147@3033
|
227 |
-eval ac_res=\$$3
|
net147@3033
|
228 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
net147@3033
|
229 |
-$as_echo "$ac_res" >&6; }
|
net147@3033
|
230 |
-fi
|
net147@3033
|
231 |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
net147@3033
|
232 |
-
|
net147@3033
|
233 |
-} # ac_fn_c_check_header_mongrel
|
net147@3033
|
234 |
-
|
net147@3033
|
235 |
-# ac_fn_c_try_run LINENO
|
net147@3033
|
236 |
-# ----------------------
|
net147@3033
|
237 |
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
|
net147@3033
|
238 |
-# that executables *can* be run.
|
net147@3033
|
239 |
-ac_fn_c_try_run ()
|
net147@3033
|
240 |
-{
|
net147@3033
|
241 |
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
net147@3033
|
242 |
- if { { ac_try="$ac_link"
|
net147@3033
|
243 |
-case "(($ac_try" in
|
net147@3033
|
244 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
net147@3033
|
245 |
- *) ac_try_echo=$ac_try;;
|
net147@3033
|
246 |
-esac
|
net147@3033
|
247 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
net147@3033
|
248 |
-$as_echo "$ac_try_echo"; } >&5
|
net147@3033
|
249 |
- (eval "$ac_link") 2>&5
|
net147@3033
|
250 |
- ac_status=$?
|
net147@3033
|
251 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
net147@3033
|
252 |
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
|
net147@3033
|
253 |
- { { case "(($ac_try" in
|
net147@3033
|
254 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
net147@3033
|
255 |
- *) ac_try_echo=$ac_try;;
|
net147@3033
|
256 |
-esac
|
net147@3033
|
257 |
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
net147@3033
|
258 |
-$as_echo "$ac_try_echo"; } >&5
|
net147@3033
|
259 |
- (eval "$ac_try") 2>&5
|
net147@3033
|
260 |
- ac_status=$?
|
net147@3033
|
261 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
net147@3033
|
262 |
- test $ac_status = 0; }; }; then :
|
net147@3033
|
263 |
- ac_retval=0
|
net147@3033
|
264 |
-else
|
net147@3033
|
265 |
- $as_echo "$as_me: program exited with status $ac_status" >&5
|
net147@3033
|
266 |
- $as_echo "$as_me: failed program was:" >&5
|
net147@3033
|
267 |
-sed 's/^/| /' conftest.$ac_ext >&5
|
net147@3033
|
268 |
-
|
net147@3033
|
269 |
- ac_retval=$ac_status
|
net147@3033
|
270 |
-fi
|
net147@3033
|
271 |
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
|
net147@3033
|
272 |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
net147@3033
|
273 |
- as_fn_set_status $ac_retval
|
net147@3033
|
274 |
-
|
net147@3033
|
275 |
-} # ac_fn_c_try_run
|
net147@3033
|
276 |
-
|
net147@3033
|
277 |
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
net147@3033
|
278 |
# -------------------------------------------------------
|
net147@3033
|
279 |
# Tests whether HEADER exists and can be compiled using the include files in
|
net147@3033
|
280 |
@@ -347,7 +132,7 @@
|
net147@3033
|
281 |
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
net147@3033
|
282 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
net147@3033
|
283 |
$as_echo_n "checking for $2... " >&6; }
|
net147@3033
|
284 |
-if eval "test \"\${$3+set}\"" = set; then :
|
net147@3033
|
285 |
+if eval \${$3+:} false; then :
|
net147@3033
|
286 |
$as_echo_n "(cached) " >&6
|
net147@3033
|
287 |
else
|
net147@3033
|
288 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
289 |
@@ -365,275 +150,16 @@
|
net147@3033
|
290 |
eval ac_res=\$$3
|
net147@3033
|
291 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
net147@3033
|
292 |
$as_echo "$ac_res" >&6; }
|
net147@3033
|
293 |
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
|
net147@3033
|
294 |
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
net147@3033
|
295 |
|
net147@3033
|
296 |
} # ac_fn_c_check_header_compile
|
net147@3033
|
297 |
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
|
net147@3033
|
298 |
# Local configure fragment for sysdeps/i386.
|
net147@3033
|
299 |
|
net147@3033
|
300 |
|
net147@3033
|
301 |
-
|
net147@3033
|
302 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
net147@3033
|
303 |
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
net147@3033
|
304 |
-if test "${ac_cv_path_GREP+set}" = set; then :
|
net147@3033
|
305 |
- $as_echo_n "(cached) " >&6
|
net147@3033
|
306 |
-else
|
net147@3033
|
307 |
- if test -z "$GREP"; then
|
net147@3033
|
308 |
- ac_path_GREP_found=false
|
net147@3033
|
309 |
- # Loop through the user's path and test for each of PROGNAME-LIST
|
net147@3033
|
310 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
net147@3033
|
311 |
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
net147@3033
|
312 |
-do
|
net147@3033
|
313 |
- IFS=$as_save_IFS
|
net147@3033
|
314 |
- test -z "$as_dir" && as_dir=.
|
net147@3033
|
315 |
- for ac_prog in grep ggrep; do
|
net147@3033
|
316 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
net147@3033
|
317 |
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
net147@3033
|
318 |
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
net147@3033
|
319 |
-# Check for GNU ac_path_GREP and select it if it is found.
|
net147@3033
|
320 |
- # Check for GNU $ac_path_GREP
|
net147@3033
|
321 |
-case `"$ac_path_GREP" --version 2>&1` in
|
net147@3033
|
322 |
-*GNU*)
|
net147@3033
|
323 |
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
net147@3033
|
324 |
-*)
|
net147@3033
|
325 |
- ac_count=0
|
net147@3033
|
326 |
- $as_echo_n 0123456789 >"conftest.in"
|
net147@3033
|
327 |
- while :
|
net147@3033
|
328 |
- do
|
net147@3033
|
329 |
- cat "conftest.in" "conftest.in" >"conftest.tmp"
|
net147@3033
|
330 |
- mv "conftest.tmp" "conftest.in"
|
net147@3033
|
331 |
- cp "conftest.in" "conftest.nl"
|
net147@3033
|
332 |
- $as_echo 'GREP' >> "conftest.nl"
|
net147@3033
|
333 |
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
net147@3033
|
334 |
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
net147@3033
|
335 |
- as_fn_arith $ac_count + 1 && ac_count=$as_val
|
net147@3033
|
336 |
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
net147@3033
|
337 |
- # Best one so far, save it but keep looking for a better one
|
net147@3033
|
338 |
- ac_cv_path_GREP="$ac_path_GREP"
|
net147@3033
|
339 |
- ac_path_GREP_max=$ac_count
|
net147@3033
|
340 |
- fi
|
net147@3033
|
341 |
- # 10*(2^10) chars as input seems more than enough
|
net147@3033
|
342 |
- test $ac_count -gt 10 && break
|
net147@3033
|
343 |
- done
|
net147@3033
|
344 |
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
net147@3033
|
345 |
-esac
|
net147@3033
|
346 |
-
|
net147@3033
|
347 |
- $ac_path_GREP_found && break 3
|
net147@3033
|
348 |
- done
|
net147@3033
|
349 |
- done
|
net147@3033
|
350 |
- done
|
net147@3033
|
351 |
-IFS=$as_save_IFS
|
net147@3033
|
352 |
- if test -z "$ac_cv_path_GREP"; then
|
net147@3033
|
353 |
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
net147@3033
|
354 |
- fi
|
net147@3033
|
355 |
-else
|
net147@3033
|
356 |
- ac_cv_path_GREP=$GREP
|
net147@3033
|
357 |
-fi
|
net147@3033
|
358 |
-
|
net147@3033
|
359 |
-fi
|
net147@3033
|
360 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
net147@3033
|
361 |
-$as_echo "$ac_cv_path_GREP" >&6; }
|
net147@3033
|
362 |
- GREP="$ac_cv_path_GREP"
|
net147@3033
|
363 |
-
|
net147@3033
|
364 |
-
|
net147@3033
|
365 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
net147@3033
|
366 |
-$as_echo_n "checking for egrep... " >&6; }
|
net147@3033
|
367 |
-if test "${ac_cv_path_EGREP+set}" = set; then :
|
net147@3033
|
368 |
- $as_echo_n "(cached) " >&6
|
net147@3033
|
369 |
-else
|
net147@3033
|
370 |
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
net147@3033
|
371 |
- then ac_cv_path_EGREP="$GREP -E"
|
net147@3033
|
372 |
- else
|
net147@3033
|
373 |
- if test -z "$EGREP"; then
|
net147@3033
|
374 |
- ac_path_EGREP_found=false
|
net147@3033
|
375 |
- # Loop through the user's path and test for each of PROGNAME-LIST
|
net147@3033
|
376 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
net147@3033
|
377 |
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
net147@3033
|
378 |
-do
|
net147@3033
|
379 |
- IFS=$as_save_IFS
|
net147@3033
|
380 |
- test -z "$as_dir" && as_dir=.
|
net147@3033
|
381 |
- for ac_prog in egrep; do
|
net147@3033
|
382 |
- for ac_exec_ext in '' $ac_executable_extensions; do
|
net147@3033
|
383 |
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
net147@3033
|
384 |
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
net147@3033
|
385 |
-# Check for GNU ac_path_EGREP and select it if it is found.
|
net147@3033
|
386 |
- # Check for GNU $ac_path_EGREP
|
net147@3033
|
387 |
-case `"$ac_path_EGREP" --version 2>&1` in
|
net147@3033
|
388 |
-*GNU*)
|
net147@3033
|
389 |
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
net147@3033
|
390 |
-*)
|
net147@3033
|
391 |
- ac_count=0
|
net147@3033
|
392 |
- $as_echo_n 0123456789 >"conftest.in"
|
net147@3033
|
393 |
- while :
|
net147@3033
|
394 |
- do
|
net147@3033
|
395 |
- cat "conftest.in" "conftest.in" >"conftest.tmp"
|
net147@3033
|
396 |
- mv "conftest.tmp" "conftest.in"
|
net147@3033
|
397 |
- cp "conftest.in" "conftest.nl"
|
net147@3033
|
398 |
- $as_echo 'EGREP' >> "conftest.nl"
|
net147@3033
|
399 |
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
net147@3033
|
400 |
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
net147@3033
|
401 |
- as_fn_arith $ac_count + 1 && ac_count=$as_val
|
net147@3033
|
402 |
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
net147@3033
|
403 |
- # Best one so far, save it but keep looking for a better one
|
net147@3033
|
404 |
- ac_cv_path_EGREP="$ac_path_EGREP"
|
net147@3033
|
405 |
- ac_path_EGREP_max=$ac_count
|
net147@3033
|
406 |
- fi
|
net147@3033
|
407 |
- # 10*(2^10) chars as input seems more than enough
|
net147@3033
|
408 |
- test $ac_count -gt 10 && break
|
net147@3033
|
409 |
- done
|
net147@3033
|
410 |
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
net147@3033
|
411 |
-esac
|
net147@3033
|
412 |
-
|
net147@3033
|
413 |
- $ac_path_EGREP_found && break 3
|
net147@3033
|
414 |
- done
|
net147@3033
|
415 |
- done
|
net147@3033
|
416 |
- done
|
net147@3033
|
417 |
-IFS=$as_save_IFS
|
net147@3033
|
418 |
- if test -z "$ac_cv_path_EGREP"; then
|
net147@3033
|
419 |
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
net147@3033
|
420 |
- fi
|
net147@3033
|
421 |
-else
|
net147@3033
|
422 |
- ac_cv_path_EGREP=$EGREP
|
net147@3033
|
423 |
-fi
|
net147@3033
|
424 |
-
|
net147@3033
|
425 |
- fi
|
net147@3033
|
426 |
-fi
|
net147@3033
|
427 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
net147@3033
|
428 |
-$as_echo "$ac_cv_path_EGREP" >&6; }
|
net147@3033
|
429 |
- EGREP="$ac_cv_path_EGREP"
|
net147@3033
|
430 |
-
|
net147@3033
|
431 |
-
|
net147@3033
|
432 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
|
net147@3033
|
433 |
-$as_echo_n "checking for ANSI C header files... " >&6; }
|
net147@3033
|
434 |
-if test "${ac_cv_header_stdc+set}" = set; then :
|
net147@3033
|
435 |
- $as_echo_n "(cached) " >&6
|
net147@3033
|
436 |
-else
|
net147@3033
|
437 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
438 |
-/* end confdefs.h. */
|
net147@3033
|
439 |
-#include <stdlib.h>
|
net147@3033
|
440 |
-#include <stdarg.h>
|
net147@3033
|
441 |
-#include <string.h>
|
net147@3033
|
442 |
-#include <float.h>
|
net147@3033
|
443 |
-
|
net147@3033
|
444 |
-int
|
net147@3033
|
445 |
-main ()
|
net147@3033
|
446 |
-{
|
net147@3033
|
447 |
-
|
net147@3033
|
448 |
- ;
|
net147@3033
|
449 |
- return 0;
|
net147@3033
|
450 |
-}
|
net147@3033
|
451 |
-_ACEOF
|
net147@3033
|
452 |
-if ac_fn_c_try_compile "$LINENO"; then :
|
net147@3033
|
453 |
- ac_cv_header_stdc=yes
|
net147@3033
|
454 |
-else
|
net147@3033
|
455 |
- ac_cv_header_stdc=no
|
net147@3033
|
456 |
-fi
|
net147@3033
|
457 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
net147@3033
|
458 |
-
|
net147@3033
|
459 |
-if test $ac_cv_header_stdc = yes; then
|
net147@3033
|
460 |
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
net147@3033
|
461 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
462 |
-/* end confdefs.h. */
|
net147@3033
|
463 |
-#include <string.h>
|
net147@3033
|
464 |
-
|
net147@3033
|
465 |
-_ACEOF
|
net147@3033
|
466 |
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
net147@3033
|
467 |
- $EGREP "memchr" >/dev/null 2>&1; then :
|
net147@3033
|
468 |
-
|
net147@3033
|
469 |
-else
|
net147@3033
|
470 |
- ac_cv_header_stdc=no
|
net147@3033
|
471 |
-fi
|
net147@3033
|
472 |
-rm -f conftest*
|
net147@3033
|
473 |
-
|
net147@3033
|
474 |
-fi
|
net147@3033
|
475 |
-
|
net147@3033
|
476 |
-if test $ac_cv_header_stdc = yes; then
|
net147@3033
|
477 |
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
net147@3033
|
478 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
479 |
-/* end confdefs.h. */
|
net147@3033
|
480 |
-#include <stdlib.h>
|
net147@3033
|
481 |
-
|
net147@3033
|
482 |
-_ACEOF
|
net147@3033
|
483 |
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
net147@3033
|
484 |
- $EGREP "free" >/dev/null 2>&1; then :
|
net147@3033
|
485 |
-
|
net147@3033
|
486 |
-else
|
net147@3033
|
487 |
- ac_cv_header_stdc=no
|
net147@3033
|
488 |
-fi
|
net147@3033
|
489 |
-rm -f conftest*
|
net147@3033
|
490 |
-
|
net147@3033
|
491 |
-fi
|
net147@3033
|
492 |
-
|
net147@3033
|
493 |
-if test $ac_cv_header_stdc = yes; then
|
net147@3033
|
494 |
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
|
net147@3033
|
495 |
- if test "$cross_compiling" = yes; then :
|
net147@3033
|
496 |
- :
|
net147@3033
|
497 |
-else
|
net147@3033
|
498 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
net147@3033
|
499 |
-/* end confdefs.h. */
|
net147@3033
|
500 |
-#include <ctype.h>
|
net147@3033
|
501 |
-#include <stdlib.h>
|
net147@3033
|
502 |
-#if ((' ' & 0x0FF) == 0x020)
|
net147@3033
|
503 |
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
net147@3033
|
504 |
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
net147@3033
|
505 |
-#else
|
net147@3033
|
506 |
-# define ISLOWER(c) \
|
net147@3033
|
507 |
- (('a' <= (c) && (c) <= 'i') \
|
net147@3033
|
508 |
- || ('j' <= (c) && (c) <= 'r') \
|
net147@3033
|
509 |
- || ('s' <= (c) && (c) <= 'z'))
|
net147@3033
|
510 |
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
|
net147@3033
|
511 |
-#endif
|
net147@3033
|
512 |
-
|
net147@3033
|
513 |
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
net147@3033
|
514 |
-int
|
net147@3033
|
515 |
-main ()
|
net147@3033
|
516 |
-{
|
net147@3033
|
517 |
- int i;
|
net147@3033
|
518 |
- for (i = 0; i < 256; i++)
|
net147@3033
|
519 |
- if (XOR (islower (i), ISLOWER (i))
|
net147@3033
|
520 |
- || toupper (i) != TOUPPER (i))
|
net147@3033
|
521 |
- return 2;
|
net147@3033
|
522 |
- return 0;
|
net147@3033
|
523 |
-}
|
net147@3033
|
524 |
-_ACEOF
|
net147@3033
|
525 |
-if ac_fn_c_try_run "$LINENO"; then :
|
net147@3033
|
526 |
-
|
net147@3033
|
527 |
-else
|
net147@3033
|
528 |
- ac_cv_header_stdc=no
|
net147@3033
|
529 |
-fi
|
net147@3033
|
530 |
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
net147@3033
|
531 |
- conftest.$ac_objext conftest.beam conftest.$ac_ext
|
net147@3033
|
532 |
-fi
|
net147@3033
|
533 |
-
|
net147@3033
|
534 |
-fi
|
net147@3033
|
535 |
-fi
|
net147@3033
|
536 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
|
net147@3033
|
537 |
-$as_echo "$ac_cv_header_stdc" >&6; }
|
net147@3033
|
538 |
-if test $ac_cv_header_stdc = yes; then
|
net147@3033
|
539 |
-
|
net147@3033
|
540 |
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
net147@3033
|
541 |
-
|
net147@3033
|
542 |
-fi
|
net147@3033
|
543 |
-
|
net147@3033
|
544 |
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
|
net147@3033
|
545 |
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
|
net147@3033
|
546 |
- inttypes.h stdint.h unistd.h
|
net147@3033
|
547 |
-do :
|
net147@3033
|
548 |
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
net147@3033
|
549 |
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
|
net147@3033
|
550 |
+ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes. */
|
net147@3033
|
551 |
"
|
net147@3033
|
552 |
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
|
net147@3033
|
553 |
- cat >>confdefs.h <<_ACEOF
|
net147@3033
|
554 |
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
net147@3033
|
555 |
-_ACEOF
|
net147@3033
|
556 |
-
|
net147@3033
|
557 |
-fi
|
net147@3033
|
558 |
-
|
net147@3033
|
559 |
-done
|
net147@3033
|
560 |
-
|
net147@3033
|
561 |
-
|
net147@3033
|
562 |
-ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
|
net147@3033
|
563 |
-if test "x$ac_cv_header_cpuid_h" = x""yes; then :
|
net147@3033
|
564 |
+if test "x$ac_cv_header_cpuid_h" = xyes; then :
|
net147@3033
|
565 |
|
net147@3033
|
566 |
else
|
net147@3033
|
567 |
as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5
|
net147@3033
|
568 |
@@ -643,7 +169,7 @@
|
net147@3033
|
569 |
|
net147@3033
|
570 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
|
net147@3033
|
571 |
$as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
|
net147@3033
|
572 |
-if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then :
|
net147@3033
|
573 |
+if ${libc_cv_cpp_asm_debuginfo+:} false; then :
|
net147@3033
|
574 |
$as_echo_n "(cached) " >&6
|
net147@3033
|
575 |
else
|
net147@3033
|
576 |
cat > conftest.S <<EOF
|
net147@3033
|
577 |
@@ -693,7 +219,7 @@
|
net147@3033
|
578 |
|
net147@3033
|
579 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
|
net147@3033
|
580 |
$as_echo_n "checking for SSE4 support... " >&6; }
|
net147@3033
|
581 |
-if test "${libc_cv_cc_sse4+set}" = set; then :
|
net147@3033
|
582 |
+if ${libc_cv_cc_sse4+:} false; then :
|
net147@3033
|
583 |
$as_echo_n "(cached) " >&6
|
net147@3033
|
584 |
else
|
net147@3033
|
585 |
if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
|
net147@3033
|
586 |
@@ -716,7 +242,7 @@
|
net147@3033
|
587 |
|
net147@3033
|
588 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5
|
net147@3033
|
589 |
$as_echo_n "checking for assembler -mtune=i686 support... " >&6; }
|
net147@3033
|
590 |
-if test "${libc_cv_as_i686+set}" = set; then :
|
net147@3033
|
591 |
+if ${libc_cv_as_i686+:} false; then :
|
net147@3033
|
592 |
$as_echo_n "(cached) " >&6
|
net147@3033
|
593 |
else
|
net147@3033
|
594 |
if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'
|
net147@3033
|
595 |
@@ -735,7 +261,7 @@
|
net147@3033
|
596 |
|
net147@3033
|
597 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX support" >&5
|
net147@3033
|
598 |
$as_echo_n "checking for AVX support... " >&6; }
|
net147@3033
|
599 |
-if test "${libc_cv_cc_avx+set}" = set; then :
|
net147@3033
|
600 |
+if ${libc_cv_cc_avx+:} false; then :
|
net147@3033
|
601 |
$as_echo_n "(cached) " >&6
|
net147@3033
|
602 |
else
|
net147@3033
|
603 |
if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'
|
net147@3033
|
604 |
@@ -758,7 +284,7 @@
|
net147@3033
|
605 |
|
net147@3033
|
606 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mno-vzeroupper support" >&5
|
net147@3033
|
607 |
$as_echo_n "checking for -mno-vzeroupper support... " >&6; }
|
net147@3033
|
608 |
-if test "${libc_cv_cc_novzeroupper+set}" = set; then :
|
net147@3033
|
609 |
+if ${libc_cv_cc_novzeroupper+:} false; then :
|
net147@3033
|
610 |
$as_echo_n "(cached) " >&6
|
net147@3033
|
611 |
else
|
net147@3033
|
612 |
if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
|
net147@3033
|
613 |
diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
|
net147@3033
|
614 |
--- glibc-2.14.1.orig/sysdeps/i386/configure.in 2011-10-07 20:48:55.000000000 +1100
|
net147@3033
|
615 |
+++ glibc-2.14.1/sysdeps/i386/configure.in 2012-07-25 01:00:49.345025022 +1000
|
net147@3033
|
616 |
@@ -1,8 +1,9 @@
|
net147@3033
|
617 |
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
|
net147@3033
|
618 |
# Local configure fragment for sysdeps/i386.
|
net147@3033
|
619 |
|
net147@3033
|
620 |
-AC_HEADER_CHECK([cpuid.h], ,
|
net147@3033
|
621 |
- [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
|
net147@3033
|
622 |
+AC_CHECK_HEADER([cpuid.h], ,
|
net147@3033
|
623 |
+ [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
|
net147@3033
|
624 |
+ [/* No default includes. */])
|
net147@3033
|
625 |
|
net147@3033
|
626 |
AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
|
net147@3033
|
627 |
libc_cv_cpp_asm_debuginfo, [dnl
|
net147@3033
|
628 |
|