configure.ac (gcc_cv_ld): Prefer in-tree ld over whatever the top-level detects...

* configure.ac (gcc_cv_ld): Prefer in-tree ld over whatever the
top-level detects, except when in-tree ld is being cross-built.
(gcc_cv_as): Likewise for as.  Use AS_FOR_TARGET otherwise, and
then AS only if target is host.
* configure: Rebuilt.

From-SVN: r82258
This commit is contained in:
Alexandre Oliva 2004-05-25 19:46:49 +00:00 committed by Alexandre Oliva
parent 4fc4dd12a4
commit 08d105faa5
3 changed files with 107 additions and 148 deletions

View file

@ -1,3 +1,11 @@
2004-05-25 Alexandre Oliva <aoliva@redhat.com>
* configure.ac (gcc_cv_ld): Prefer in-tree ld over whatever the
top-level detects, except when in-tree ld is being cross-built.
(gcc_cv_as): Likewise for as. Use AS_FOR_TARGET otherwise, and
then AS only if target is host.
* configure: Rebuilt.
2004-05-25 Vladimir Makarov <vmakarov@redhat.com>
* global.c (global_alloc): Call make_accurate_live_analysis.

218
gcc/configure vendored
View file

@ -3259,68 +3259,6 @@ _ACEOF
fi
echo "$as_me:$LINENO: checking for built-in _Bool" >&5
echo $ECHO_N "checking for built-in _Bool... $ECHO_C" >&6
if test "${gcc_cv_c__bool+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
_Bool foo;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
gcc_cv_c__bool=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
gcc_cv_c__bool=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $gcc_cv_c__bool" >&5
echo "${ECHO_T}$gcc_cv_c__bool" >&6
if test $gcc_cv_c__bool = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE__BOOL 1
_ACEOF
fi
# sizeof(char) is 1 by definition.
echo "$as_me:$LINENO: checking size of void *" >&5
@ -5307,7 +5245,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
else
ac_prog_version=`$MAKEINFO --version 2>&1 |
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
echo "configure:5310: version of makeinfo is $ac_prog_version" >&5
echo "configure:5248: version of makeinfo is $ac_prog_version" >&5
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
4.[2-9]*)
@ -5798,6 +5736,67 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_STDBOOL_H 1
_ACEOF
fi
echo "$as_me:$LINENO: checking for built-in _Bool" >&5
echo $ECHO_N "checking for built-in _Bool... $ECHO_C" >&6
if test "${gcc_cv_c__bool+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
_Bool foo;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
gcc_cv_c__bool=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
gcc_cv_c__bool=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $gcc_cv_c__bool" >&5
echo "${ECHO_T}$gcc_cv_c__bool" >&6
if test $gcc_cv_c__bool = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE__BOOL 1
_ACEOF
fi
echo "$as_me:$LINENO: checking whether string.h and strings.h may both be included" >&5
@ -8933,71 +8932,6 @@ _ACEOF
fi
echo "$as_me:$LINENO: checking for uchar" >&5
echo $ECHO_N "checking for uchar... $ECHO_C" >&6
if test "${gcc_cv_type_uchar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "ansidecl.h"
#include "system.h"
int
main ()
{
if ((uchar *)0) return 0;
if (sizeof(uchar)) return 0;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_uchar=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_uchar=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $gcc_cv_type_uchar" >&5
echo "${ECHO_T}$gcc_cv_type_uchar" >&6
if test $ac_cv_type_uchar = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_UCHAR 1
_ACEOF
fi
# Restore CFLAGS from before the gcc_AC_NEED_DECLARATIONS tests.
CFLAGS="$saved_CFLAGS"
@ -10146,14 +10080,15 @@ gcc_cv_gas_minor_version=
gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
if test -x "$DEFAULT_ASSEMBLER"; then
gcc_cv_as="$DEFAULT_ASSEMBLER"
elif test -x "$AS"; then
gcc_cv_as="$AS"
elif test -x as$host_exeext; then
# Build using assembler in the current directory.
gcc_cv_as=./as$host_exeext
elif test -f $gcc_cv_as_gas_srcdir/configure.in \
&& test -f ../gas/Makefile; then
# Single tree build which includes gas.
&& test -f ../gas/Makefile \
&& test x$build = x$host; then
# Single tree build which includes gas. We want to prefer it
# over whatever linker top-level may have detected, since
# we'll use what we're building after installation anyway.
in_tree_gas=yes
gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
for f in $gcc_cv_as_bfd_srcdir/configure \
@ -10184,6 +10119,10 @@ gcc_cv_gas_vers=`expr \( \( $gcc_cv_gas_major_version \* 1000 \) \
then
in_tree_gas_is_elf=yes
fi
elif test -x "$AS_FOR_TARGET"; then
gcc_cv_as="$AS_FOR_TARGET"
elif test -x "$AS" && test x$host = x$target; then
gcc_cv_as="$AS"
fi
if test "x$gcc_cv_as" = x; then
@ -10273,16 +10212,15 @@ gcc_cv_ld_gld_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/ld
gcc_cv_ld_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
if test -x "$DEFAULT_LINKER"; then
gcc_cv_ld="$DEFAULT_LINKER"
elif test -x "$LD_FOR_TARGET"; then
gcc_cv_ld="$LD_FOR_TARGET"
elif test -x "$LD" && test x$host = x$target; then
gcc_cv_ld="$LD"
elif test -x collect-ld$host_exeext; then
# Build using linker in the current directory.
gcc_cv_ld=./collect-ld$host_exeext
elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
&& test -f ../ld/Makefile; then
# Single tree build which includes ld.
&& test -f ../ld/Makefile \
&& test x$build = x$host; then
# Single tree build which includes ld. We want to prefer it
# over whatever linker top-level may have detected, since
# we'll use what we're building after installation anyway.
in_tree_ld=yes
in_tree_ld_is_elf=no
if (grep 'EMUL = .*elf' ../ld/Makefile \
@ -10301,6 +10239,10 @@ elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
rm -f collect-ld$host_exeext
$symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext \
2>/dev/null
elif test -x "$LD_FOR_TARGET"; then
gcc_cv_ld="$LD_FOR_TARGET"
elif test -x "$LD" && test x$host = x$target; then
gcc_cv_ld="$LD"
fi
if test "x$gcc_cv_ld" = x; then

View file

@ -1689,14 +1689,15 @@ gcc_cv_gas_minor_version=
gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
if test -x "$DEFAULT_ASSEMBLER"; then
gcc_cv_as="$DEFAULT_ASSEMBLER"
elif test -x "$AS"; then
gcc_cv_as="$AS"
elif test -x as$host_exeext; then
# Build using assembler in the current directory.
gcc_cv_as=./as$host_exeext
elif test -f $gcc_cv_as_gas_srcdir/configure.in \
&& test -f ../gas/Makefile; then
# Single tree build which includes gas.
&& test -f ../gas/Makefile \
&& test x$build = x$host; then
# Single tree build which includes gas. We want to prefer it
# over whatever linker top-level may have detected, since
# we'll use what we're building after installation anyway.
in_tree_gas=yes
_gcc_COMPUTE_GAS_VERSION
rm -f as$host_exeext
@ -1708,6 +1709,11 @@ elif test -f $gcc_cv_as_gas_srcdir/configure.in \
then
in_tree_gas_is_elf=yes
fi
m4_pattern_allow([AS_FOR_TARGET])dnl
elif test -x "$AS_FOR_TARGET"; then
gcc_cv_as="$AS_FOR_TARGET"
elif test -x "$AS" && test x$host = x$target; then
gcc_cv_as="$AS"
fi
if test "x$gcc_cv_as" = x; then
@ -1794,16 +1800,15 @@ gcc_cv_ld_gld_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/ld
gcc_cv_ld_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
if test -x "$DEFAULT_LINKER"; then
gcc_cv_ld="$DEFAULT_LINKER"
elif test -x "$LD_FOR_TARGET"; then
gcc_cv_ld="$LD_FOR_TARGET"
elif test -x "$LD" && test x$host = x$target; then
gcc_cv_ld="$LD"
elif test -x collect-ld$host_exeext; then
# Build using linker in the current directory.
gcc_cv_ld=./collect-ld$host_exeext
elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
&& test -f ../ld/Makefile; then
# Single tree build which includes ld.
&& test -f ../ld/Makefile \
&& test x$build = x$host; then
# Single tree build which includes ld. We want to prefer it
# over whatever linker top-level may have detected, since
# we'll use what we're building after installation anyway.
in_tree_ld=yes
in_tree_ld_is_elf=no
if (grep 'EMUL = .*elf' ../ld/Makefile \
@ -1826,6 +1831,10 @@ changequote([,])dnl
rm -f collect-ld$host_exeext
$symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext \
2>/dev/null
elif test -x "$LD_FOR_TARGET"; then
gcc_cv_ld="$LD_FOR_TARGET"
elif test -x "$LD" && test x$host = x$target; then
gcc_cv_ld="$LD"
fi
if test "x$gcc_cv_ld" = x; then