* configure.in: Set want64 on a 64-bit host regardless of
	--enable-targets=all.
	* configure: Regenerated.
This commit is contained in:
Roland McGrath 2012-03-27 19:23:59 +00:00
parent 6350a0664a
commit bf9ef60322
3 changed files with 59 additions and 47 deletions

View File

@ -1,3 +1,9 @@
2012-03-27 Roland McGrath <mcgrathr@google.com>
* configure.in: Set want64 on a 64-bit host regardless of
--enable-targets=all.
* configure: Regenerated.
2012-03-26 Tristan Gingold <gingold@adacore.com>
* lexsup.c (parse_args): Add a missing '\n'.

81
ld/configure vendored
View File

@ -16753,6 +16753,48 @@ all_libpath=
rm -f tdirs
# If the host is 64-bit, then we enable 64-bit targets by default.
# This is consistent with what ../bfd/configure.in does.
if test x${want64} = xfalse; then
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
$as_echo_n "checking size of void *... " >&6; }
if test "${ac_cv_sizeof_void_p+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
else
if test "$ac_cv_type_void_p" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ as_fn_set_status 77
as_fn_error "cannot compute sizeof (void *)
See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_void_p=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
$as_echo "$ac_cv_sizeof_void_p" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
_ACEOF
if test "x${ac_cv_sizeof_void_p}" = "x8"; then
want64=true
fi
fi
for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
do
if test "$targ_alias" = "all"; then
@ -16823,45 +16865,6 @@ TDIRS=tdirs
if test x${all_targets} = xtrue; then
if test x${want64} = xfalse; then
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
$as_echo_n "checking size of long... " >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
else
if test "$ac_cv_type_long" = yes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ as_fn_set_status 77
as_fn_error "cannot compute sizeof (long)
See \`config.log' for more details." "$LINENO" 5; }; }
else
ac_cv_sizeof_long=0
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
$as_echo "$ac_cv_sizeof_long" >&6; }
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
if test "x${ac_cv_sizeof_long}" = "x8"; then
want64=true
fi
fi
if test x${want64} = xtrue; then
EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
else

View File

@ -75,7 +75,7 @@ dnl "install_as_default" is set to false if gold is the default linker.
dnl "installed_linker" is the installed BFD linker name.
AC_ARG_ENABLE(gold,
[[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]],
[case "${enableval}" in
[case "${enableval}" in
default)
install_as_default=no
installed_linker=ld.bfd
@ -210,7 +210,7 @@ if test $ld_cv_decl_getopt_unistd_h = yes; then
AC_DEFINE([HAVE_DECL_GETOPT], 1,
[Is the prototype for getopt in <unistd.h> in the expected format?])
fi
BFD_BINARY_FOPEN
AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ])
@ -252,6 +252,15 @@ dnl not permit literal newlines in an AC_SUBST variables. So we use a
dnl file.
rm -f tdirs
# If the host is 64-bit, then we enable 64-bit targets by default.
# This is consistent with what ../bfd/configure.in does.
if test x${want64} = xfalse; then
AC_CHECK_SIZEOF(void *)
if test "x${ac_cv_sizeof_void_p}" = "x8"; then
want64=true
fi
fi
for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
do
if test "$targ_alias" = "all"; then
@ -322,12 +331,6 @@ TDIRS=tdirs
AC_SUBST_FILE(TDIRS)
if test x${all_targets} = xtrue; then
if test x${want64} = xfalse; then
AC_CHECK_SIZEOF(long)
if test "x${ac_cv_sizeof_long}" = "x8"; then
want64=true
fi
fi
if test x${want64} = xtrue; then
EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
else