configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier.
2006-01-26 Paolo Bonzini <bonzini@gnu.org> * configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier. Set md_exec_prefix. Use ACX_CHECK_INSTALLED_TARGET_TOOL to find the assembler, linker and binutils. * configure: Regenerate. 2006-01-26 Paolo Bonzini <bonzini@gnu.org> * config/acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools. (ACX_PATH_SEP): New. (ACX_TOOL_DIRS): Move here from the gcc directory. (ACX_CHECK_INSTALLED_TARGET_TOOL): New. (GCC_TARGET_TOOL): Do not use a host tool if we found a target tool with a complete path in either $with_build_time_tools or $exec_prefix. 2006-01-26 Paolo Bonzini <bonzini@gnu.org> * configure.ac: Expect target tools paths to be passed from the toplevel and wrap the detection into AS_SET_VAR_IF. Extract side-effects out of AS_SET_VAR_IF. * acinclude.m4 (gcc_AC_TOOL_DIRS, gcc_AC_CHECK_TOOL): Remove. From-SVN: r110266
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
f4e9414ef8
commit
e8b053801c
|
|
@ -1,3 +1,10 @@
|
|||
2006-01-26 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier.
|
||||
Set md_exec_prefix. Use ACX_CHECK_INSTALLED_TARGET_TOOL to find
|
||||
the assembler, linker and binutils.
|
||||
* configure: Regenerate.
|
||||
|
||||
2006-01-22 Dirk Mueller <dmueller@suse.de>
|
||||
|
||||
* MAINTAINERS (Write After Approval): Add myself.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
2006-02-01 Paolo Bonzini <bonzini@gnu.org>
|
||||
2006-01-26 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* config/acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test
|
||||
$with_build_time_tools.
|
||||
(ACX_PATH_SEP): New.
|
||||
(ACX_TOOL_DIRS): Move here from the gcc directory.
|
||||
(ACX_CHECK_INSTALLED_TARGET_TOOL): New.
|
||||
(GCC_TARGET_TOOL): Do not use a host tool if we found a target tool
|
||||
with a complete path in either $with_build_time_tools or $exec_prefix.
|
||||
|
||||
2006-01-02 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR target/25259
|
||||
* stdint.m4: New.
|
||||
|
|
|
|||
169
config/acx.m4
169
config/acx.m4
|
|
@ -104,7 +104,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
|
||||
####
|
||||
# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
|
||||
# Like plain AC_CHECK_TOOLS, but require prefix if build!=target.
|
||||
# Like plain AC_CHECK_TOOLS, but require prefix if build!=host.
|
||||
|
||||
AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
|
||||
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||
|
|
@ -135,17 +135,32 @@ fi
|
|||
|
||||
AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
|
||||
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||
for ncn_progname in $2; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}],
|
||||
[${ncn_target_tool_prefix}${ncn_progname}], , [$4])
|
||||
fi
|
||||
if test -z "$ac_cv_prog_$1" && test $build = $target ; then
|
||||
AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
|
||||
fi
|
||||
test -n "$ac_cv_prog_$1" && break
|
||||
done
|
||||
if test -n "$with_build_time_tools"; then
|
||||
for ncn_progname in $2; do
|
||||
AC_MSG_CHECKING([for ${ncn_progname} in $with_build_time_tools])
|
||||
if test -x $with_build_time_tools/$1; then
|
||||
ac_cv_prog_$1=$with_build_time_tools/$1
|
||||
AC_MSG_RESULT(yes)
|
||||
break
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if test -z "$ac_cv_prog_$1"; then
|
||||
for ncn_progname in $2; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}],
|
||||
[${ncn_target_tool_prefix}${ncn_progname}], , [$4])
|
||||
fi
|
||||
if test -z "$ac_cv_prog_$1" && test $build = $target ; then
|
||||
AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
|
||||
fi
|
||||
test -n "$ac_cv_prog_$1" && break
|
||||
done
|
||||
fi
|
||||
|
||||
if test -z "$ac_cv_prog_$1" ; then
|
||||
ifelse([$3],[], [set dummy $2
|
||||
if test $build = $target ; then
|
||||
|
|
@ -155,6 +170,124 @@ if test -z "$ac_cv_prog_$1" ; then
|
|||
fi], [$1="$3"])
|
||||
fi
|
||||
]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
|
||||
|
||||
|
||||
# Backported from Autoconf 2.5x; can go away when and if
|
||||
# we switch. Put the OS path separator in $PATH_SEPARATOR.
|
||||
AC_DEFUN([ACX_PATH_SEP], [
|
||||
# The user is always right.
|
||||
if test "${PATH_SEPARATOR+set}" != set; then
|
||||
echo "#! /bin/sh" >conf$$.sh
|
||||
echo "exit 0" >>conf$$.sh
|
||||
chmod +x conf$$.sh
|
||||
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||||
PATH_SEPARATOR=';'
|
||||
else
|
||||
PATH_SEPARATOR=:
|
||||
fi
|
||||
rm -f conf$$.sh
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([ACX_TOOL_DIRS], [
|
||||
AC_REQUIRE([ACX_PATH_SEP])
|
||||
if test "x$exec_prefix" = xNONE; then
|
||||
if test "x$prefix" = xNONE; then
|
||||
gcc_cv_tool_prefix=$ac_default_prefix
|
||||
else
|
||||
gcc_cv_tool_prefix=$prefix
|
||||
fi
|
||||
else
|
||||
gcc_cv_tool_prefix=$exec_prefix
|
||||
fi
|
||||
|
||||
# If there is no compiler in the tree, use the PATH only. In any
|
||||
# case, if there is no compiler in the tree nobody should use
|
||||
# AS_FOR_TARGET and LD_FOR_TARGET.
|
||||
if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
|
||||
gcc_version=`cat $srcdir/gcc/BASE-VER`
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
|
||||
else
|
||||
gcc_cv_tool_dirs=
|
||||
fi
|
||||
|
||||
if test x$build = x$target && test -n "$md_exec_prefix"; then
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
|
||||
fi
|
||||
|
||||
]) []dnl # ACX_TOOL_DIRS
|
||||
|
||||
# ACX_HAVE_GCC_FOR_TARGET
|
||||
# Check if the variable GCC_FOR_TARGET really points to a GCC binary.
|
||||
AC_DEFUN([ACX_HAVE_GCC_FOR_TARGET], [
|
||||
cat > conftest.c << \EOF
|
||||
#ifdef __GNUC__
|
||||
gcc_yay;
|
||||
#endif
|
||||
EOF
|
||||
if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
|
||||
have_gcc_for_target=yes
|
||||
else
|
||||
GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
|
||||
have_gcc_for_target=no
|
||||
fi
|
||||
rm conftest.c
|
||||
])
|
||||
|
||||
# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG)
|
||||
# Searching for installed target binutils. We need to take extra care,
|
||||
# else we may find the wrong assembler, linker, etc., and lose.
|
||||
#
|
||||
# First try --with-build-time-tools, if specified.
|
||||
#
|
||||
# For build != host, we ask the installed GCC for the name of the tool it
|
||||
# uses, and accept it if it is an absolute path. This is because the
|
||||
# only good choice for a compiler is the same GCC version that is being
|
||||
# installed (or we couldn't make target libraries), and we assume that
|
||||
# on the host system we'll have not only the same GCC version, but also
|
||||
# the same binutils version.
|
||||
#
|
||||
# For build == host, search the same directories that the installed
|
||||
# compiler will search. We used to do this for the assembler, linker,
|
||||
# and nm only; for simplicity of configuration, however, we extend this
|
||||
# criterion to tools (such as ar and ranlib) that are never invoked by
|
||||
# the compiler, to avoid mismatches.
|
||||
#
|
||||
# Also note we have to check MD_EXEC_PREFIX before checking the user's path
|
||||
# if build == target. This makes the most sense only when bootstrapping,
|
||||
# but we also do so when build != host. In this case, we hope that the
|
||||
# build and host systems will have similar contents of MD_EXEC_PREFIX.
|
||||
#
|
||||
# If we do not find a suitable binary, then try the user's path.
|
||||
|
||||
AC_DEFUN([ACX_CHECK_INSTALLED_TARGET_TOOL], [
|
||||
AC_REQUIRE([ACX_TOOL_DIRS])
|
||||
AC_REQUIRE([ACX_HAVE_GCC_FOR_TARGET])
|
||||
if test -z "$ac_cv_path_$1" ; then
|
||||
if test -n "$with_build_time_tools"; then
|
||||
AC_MSG_CHECKING([for ${ncn_target_tool_prefix}${ncn_progname} in $with_build_time_tools])
|
||||
$1=`cd $with_build_time_tools && pwd`/$1
|
||||
ac_cv_path_$1=[$]$1
|
||||
AC_MSG_RESULT([$ac_cv_path_$1])
|
||||
elif test $build != $host && test $have_gcc_for_target = yes; then
|
||||
$1=`$GCC_FOR_TARGET --print-prog-name=$2`
|
||||
test [$]$1=$2 && $1=
|
||||
ac_cv_path_$1=[$]$1
|
||||
fi
|
||||
fi
|
||||
if test -z "$ac_cv_path_$1" ; then
|
||||
AC_PATH_PROG([$1], [$2], [], [$gcc_cv_tool_dirs])
|
||||
fi
|
||||
if test -z "$ac_cv_path_$1" ; then
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS([$1], [$2])
|
||||
fi
|
||||
]) []dnl # ACX_CHECK_INSTALLED_TARGET_TOOL
|
||||
|
||||
###
|
||||
# AC_PROG_CPP_WERROR
|
||||
|
|
@ -300,8 +433,13 @@ dnl GCC_TARGET_TOOL(PROGRAM, TARGET-VAR, HOST-VAR, IN-TREE-TOOL, LANGUAGE)
|
|||
AC_DEFUN([GCC_TARGET_TOOL],
|
||||
[AC_MSG_CHECKING(where to find the target $1)
|
||||
if test "x${build}" != "x${host}" ; then
|
||||
# Canadian cross, just use what we found
|
||||
AC_MSG_RESULT(pre-installed)
|
||||
if expr "x[$]$2" : "x/" > /dev/null; then
|
||||
# We already found the complete path
|
||||
AC_MSG_RESULT(pre-installed in `dirname [$]$2`)
|
||||
else
|
||||
# Canadian cross, just use what we found
|
||||
AC_MSG_RESULT(pre-installed)
|
||||
fi
|
||||
else
|
||||
ifelse([$4],,,
|
||||
[ok=yes
|
||||
|
|
@ -318,7 +456,10 @@ else
|
|||
# An in-tree tool is available and we can use it
|
||||
$2='$$r/$(HOST_SUBDIR)/$4'
|
||||
AC_MSG_RESULT(just compiled)
|
||||
el])if test "x$target" = "x$host"; then
|
||||
el])if expr "x[$]$2" : "x/" > /dev/null; then
|
||||
# We already found the complete path
|
||||
AC_MSG_RESULT(pre-installed in `dirname [$]$2`)
|
||||
elif test "x$target" = "x$host"; then
|
||||
# We can use an host tool
|
||||
$2='$($3)'
|
||||
AC_MSG_RESULT(host tool)
|
||||
|
|
|
|||
148
configure.in
148
configure.in
|
|
@ -1496,6 +1496,39 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Set with_gnu_as and with_gnu_ld as appropriate.
|
||||
#
|
||||
# This is done by determining whether or not the appropriate directory
|
||||
# is available, and by checking whether or not specific configurations
|
||||
# have requested that this magic not happen.
|
||||
#
|
||||
# The command line options always override the explicit settings in
|
||||
# configure.in, and the settings in configure.in override this magic.
|
||||
#
|
||||
# If the default for a toolchain is to use GNU as and ld, and you don't
|
||||
# want to do that, then you should use the --without-gnu-as and
|
||||
# --without-gnu-ld options for the configure script.
|
||||
|
||||
if test x${use_gnu_as} = x &&
|
||||
echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
|
||||
with_gnu_as=yes
|
||||
extra_host_args="$extra_host_args --with-gnu-as"
|
||||
fi
|
||||
|
||||
if test x${use_gnu_ld} = x &&
|
||||
echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
|
||||
with_gnu_ld=yes
|
||||
extra_host_args="$extra_host_args --with-gnu-ld"
|
||||
fi
|
||||
|
||||
# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
|
||||
# can detect this case.
|
||||
|
||||
if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
|
||||
with_newlib=yes
|
||||
extra_host_args="$extra_host_args --with-newlib"
|
||||
fi
|
||||
|
||||
# Handle ${copy_dirs}
|
||||
set fnord ${copy_dirs}
|
||||
shift
|
||||
|
|
@ -1527,6 +1560,55 @@ while test $# != 0 ; do
|
|||
shift; shift
|
||||
done
|
||||
|
||||
# Determine a target-dependent exec_prefix that the installed
|
||||
# gcc will search in. Keep this list sorted by triplet, with
|
||||
# the *-*-osname triplets last.
|
||||
md_exec_prefix=
|
||||
case "${target}" in
|
||||
alpha*-*-*vms*)
|
||||
md_exec_prefix=/gnu/lib/gcc-lib
|
||||
;;
|
||||
i[34567]86-pc-msdosdjgpp*)
|
||||
md_exec_prefix=/dev/env/DJDIR/bin
|
||||
;;
|
||||
i[34567]86-*-sco3.2v5*)
|
||||
if test $with_gnu_as = yes; then
|
||||
md_exec_prefix=/usr/gnu/bin
|
||||
else
|
||||
md_exec_prefix=/usr/ccs/bin/elf
|
||||
fi
|
||||
;;
|
||||
|
||||
mn10300-*-* | \
|
||||
powerpc-*-chorusos* | \
|
||||
powerpc*-*-eabi* | \
|
||||
powerpc*-*-sysv* | \
|
||||
powerpc*-*-kaos* | \
|
||||
s390x-ibm-tpf*)
|
||||
md_exec_prefix=/usr/ccs/bin
|
||||
;;
|
||||
sparc64-*-elf*)
|
||||
;;
|
||||
v850*-*-*)
|
||||
md_exec_prefix=/usr/ccs/bin
|
||||
;;
|
||||
xtensa-*-elf*)
|
||||
;;
|
||||
|
||||
*-*-beos* | \
|
||||
*-*-elf* | \
|
||||
*-*-hpux* | \
|
||||
*-*-netware* | \
|
||||
*-*-nto-qnx* | \
|
||||
*-*-rtems* | \
|
||||
*-*-solaris2* | \
|
||||
*-*-sysv[45]* | \
|
||||
*-*-vxworks* | \
|
||||
*-wrs-windiss)
|
||||
md_exec_prefix=/usr/ccs/bin
|
||||
;;
|
||||
esac
|
||||
|
||||
extra_arflags_for_target=
|
||||
extra_nmflags_for_target=
|
||||
extra_ranlibflags_for_target=
|
||||
|
|
@ -1584,39 +1666,6 @@ case "${enable_target_optspace}:${target}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Set with_gnu_as and with_gnu_ld as appropriate.
|
||||
#
|
||||
# This is done by determining whether or not the appropriate directory
|
||||
# is available, and by checking whether or not specific configurations
|
||||
# have requested that this magic not happen.
|
||||
#
|
||||
# The command line options always override the explicit settings in
|
||||
# configure.in, and the settings in configure.in override this magic.
|
||||
#
|
||||
# If the default for a toolchain is to use GNU as and ld, and you don't
|
||||
# want to do that, then you should use the --without-gnu-as and
|
||||
# --without-gnu-ld options for the configure script.
|
||||
|
||||
if test x${use_gnu_as} = x &&
|
||||
echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
|
||||
with_gnu_as=yes
|
||||
extra_host_args="$extra_host_args --with-gnu-as"
|
||||
fi
|
||||
|
||||
if test x${use_gnu_ld} = x &&
|
||||
echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
|
||||
with_gnu_ld=yes
|
||||
extra_host_args="$extra_host_args --with-gnu-ld"
|
||||
fi
|
||||
|
||||
# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
|
||||
# can detect this case.
|
||||
|
||||
if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
|
||||
with_newlib=yes
|
||||
extra_host_args="$extra_host_args --with-newlib"
|
||||
fi
|
||||
|
||||
# Default to using --with-stabs for certain targets.
|
||||
if test x${with_stabs} = x ; then
|
||||
case "${target}" in
|
||||
|
|
@ -2201,21 +2250,34 @@ AC_SUBST(CFLAGS_FOR_BUILD)
|
|||
AC_SUBST(CXXFLAGS)
|
||||
|
||||
# Target tools.
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(AR_FOR_TARGET, ar)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(AS_FOR_TARGET, as)
|
||||
AC_ARG_WITH([build-time-tools],
|
||||
[ --with-build-time-tools=path
|
||||
use given path to find target tools during the build],
|
||||
[case x"$withval" in
|
||||
x/*) ;;
|
||||
*)
|
||||
with_build_time_tools=
|
||||
AC_MSG_WARN([argument to --with-build-time-tools must be an absolute path])
|
||||
;;
|
||||
esac],
|
||||
[with_build_time_tools=])
|
||||
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(DLLTOOL_FOR_TARGET, dlltool)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(OBJDUMP_FOR_TARGET, objdump)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(RANLIB_FOR_TARGET, ranlib, :)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(STRIP_FOR_TARGET, strip)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres)
|
||||
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
|
||||
ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
|
||||
|
||||
RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2006-01-26 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.ac: Expect target tools paths to be passed from the toplevel
|
||||
and wrap the detection into AS_SET_VAR_IF. Extract side-effects out of
|
||||
AS_SET_VAR_IF.
|
||||
* acinclude.m4 (gcc_AC_TOOL_DIRS, gcc_AC_CHECK_TOOL): Remove.
|
||||
|
||||
2006-01-26 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
PR c/25892
|
||||
|
|
|
|||
|
|
@ -506,94 +506,7 @@ m4_ifdef([GCC_TARGET_TEMPLATE($1)],[],[#ifndef USED_FOR_TARGET
|
|||
#endif
|
||||
]))])
|
||||
|
||||
AC_DEFUN([gcc_AC_TOOL_DIRS], [
|
||||
# When searching for the assembler or linker, search the same directories
|
||||
# that the installed compiler will search. Else we may find the wrong
|
||||
# assembler or linker and lose. If we do not find a suitable binary,
|
||||
# then try the user's path.
|
||||
#
|
||||
# Also note we have to check MD_EXEC_PREFIX before checking the user's path.
|
||||
if test "x$exec_prefix" = xNONE; then
|
||||
if test "x$prefix" = xNONE; then
|
||||
gcc_cv_tool_prefix=/usr/local
|
||||
else
|
||||
gcc_cv_tool_prefix=$prefix
|
||||
fi
|
||||
else
|
||||
gcc_cv_tool_prefix=$exec_prefix
|
||||
fi
|
||||
|
||||
if test x$host = x$build; then
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR/usr/lib/gcc/$target_noncanonical/$gcc_version"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR/usr/lib/gcc/$target_noncanonical"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version"
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$gcc_cv_tool_prefix/$target_noncanonical/bin"
|
||||
else
|
||||
gcc_cv_tool_dirs=
|
||||
fi
|
||||
|
||||
if test x$build = x$target; then
|
||||
# Rummage through tm_files looking for MD_EXEC_PREFIX
|
||||
md_dirs=
|
||||
for f in ${tm_file_list}; do
|
||||
if test -f $f; then
|
||||
if grep '^#[ ]*undef[ ]*MD_EXEC_PREFIX' $f > /dev/null; then
|
||||
md_dirs=
|
||||
fi
|
||||
md_dirs="$md_dirs "`sed -n -e 's@^#[ ]*define[ ]*MD_EXEC_PREFIX[ ]*"\(.*\)/"@\1@p' < $f`
|
||||
fi
|
||||
done
|
||||
for f in ${md_dirs}; do
|
||||
gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$f"
|
||||
done
|
||||
fi])
|
||||
|
||||
dnl Make sure that build_exeext is looked for
|
||||
AC_DEFUN([gcc_AC_BUILD_EXEEXT], [
|
||||
ac_executable_extensions="$build_exeext"])
|
||||
|
||||
AC_DEFUN([gcc_AC_CHECK_TOOL], [
|
||||
AC_REQUIRE([gcc_AC_TOOL_DIRS])
|
||||
AC_REQUIRE([gcc_AC_BUILD_EXEEXT])
|
||||
|
||||
dnl shut up useless "checking for..." messages
|
||||
dnl we can still read them in config.log
|
||||
exec AS_MESSAGE_FD([])>/dev/null
|
||||
|
||||
# First try the environment variables. Handle full paths or basenames.
|
||||
if test "x[$]$1" = x && test -n "[$]$4"; then
|
||||
AC_PATH_PROG($1, [$]$4)
|
||||
fi
|
||||
if test "x[$]$1" = x && test -n "[$]$5" && test x$host = x$target; then
|
||||
AC_PATH_PROG($1, [$]$5)
|
||||
fi
|
||||
|
||||
if test "x[$]$1" = x; then
|
||||
# The AC_PATH_PROGS macro doesn't work properly when its 4th argument
|
||||
# is empty.
|
||||
if test "x$gcc_cv_tool_dirs" = x; then
|
||||
$1=
|
||||
else
|
||||
AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs)
|
||||
fi
|
||||
fi
|
||||
if test "x[$]$1" = x; then
|
||||
# If the loop above did not find a tool, then use whatever
|
||||
# one we can find in the users's path. We are looking for a
|
||||
# ${build} -> ${target} tool.
|
||||
if test "x$program_prefix" != xNONE; then
|
||||
default_tool_name=${program_prefix}$2
|
||||
elif test x$build != x$host && test x$build != x$target; then
|
||||
default_tool_name=${target_noncanonical}-$2
|
||||
else
|
||||
default_tool_name=`echo $2 | sed "${program_transform_name}"`
|
||||
fi
|
||||
AC_PATH_PROGS($1, $default_tool_name,
|
||||
$gcc_cv_tool_prefix/bin/$default_tool_name$build_exeext)
|
||||
fi
|
||||
test "$silent" != yes && exec AS_MESSAGE_FD([])>&1
|
||||
|
||||
$3="[$]$1"
|
||||
AC_SUBST($3)])
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
131
gcc/configure.ac
131
gcc/configure.ac
|
|
@ -1813,22 +1813,38 @@ esac
|
|||
# If build != host, and we aren't building gas in-tree, we identify a
|
||||
# build->target assembler and hope that it will have the same features
|
||||
# as the host->target assembler we'll be using.
|
||||
in_tree_gas=no
|
||||
gcc_cv_as=
|
||||
gcc_cv_gas_major_version=
|
||||
gcc_cv_gas_minor_version=
|
||||
gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
|
||||
|
||||
m4_pattern_allow([AS_FOR_TARGET])dnl
|
||||
AS_VAR_SET_IF(gcc_cv_as,, [
|
||||
if test -x "$DEFAULT_ASSEMBLER"; then
|
||||
gcc_cv_as="$DEFAULT_ASSEMBLER"
|
||||
elif test -f $gcc_cv_as_gas_srcdir/configure.in \
|
||||
&& test -f ../gas/Makefile \
|
||||
&& test x$build = x$host; then
|
||||
gcc_cv_as=../gas/as-new$build_exeext
|
||||
elif test -x as$build_exeext; then
|
||||
# Build using assembler in the current directory.
|
||||
gcc_cv_as=./as$build_exeext
|
||||
elif test -x $AS_FOR_TARGET; then
|
||||
gcc_cv_as="$AS_FOR_TARGET"
|
||||
else
|
||||
AC_PATH_PROG(gcc_cv_as, $AS_FOR_TARGET)
|
||||
fi])
|
||||
|
||||
ORIGINAL_AS_FOR_TARGET=$gcc_cv_as
|
||||
AC_SUBST(ORIGINAL_AS_FOR_TARGET)
|
||||
|
||||
AC_MSG_CHECKING(what assembler to use)
|
||||
if test "$gcc_cv_as" = ../gas/as-new$build_exeext; 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.
|
||||
AC_MSG_RESULT(newly built gas)
|
||||
in_tree_gas=yes
|
||||
_gcc_COMPUTE_GAS_VERSION
|
||||
gcc_cv_as=../gas/as-new$build_exeext
|
||||
in_tree_gas_is_elf=no
|
||||
if grep 'obj_format = elf' ../gas/Makefile > /dev/null \
|
||||
|| (grep 'obj_format = multi' ../gas/Makefile \
|
||||
|
|
@ -1836,23 +1852,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$build_exeext; then
|
||||
# Build using assembler in the current directory.
|
||||
gcc_cv_as=./as$build_exeext
|
||||
else
|
||||
AC_MSG_RESULT($gcc_cv_as)
|
||||
in_tree_gas=no
|
||||
fi
|
||||
|
||||
gcc_AC_CHECK_TOOL(gcc_cv_as, as, ORIGINAL_AS_FOR_TARGET, AS_FOR_TARGET, AS)
|
||||
AC_MSG_CHECKING(what assembler to use)
|
||||
case $in_tree_gas in
|
||||
yes)
|
||||
AC_MSG_RESULT("newly built gas")
|
||||
;;
|
||||
no)
|
||||
AC_MSG_RESULT($gcc_cv_as)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Identify the linker which will work hand-in-glove with the newly
|
||||
# built GCC, so that we can examine its features. This is the linker
|
||||
# which will be driven by the driver program.
|
||||
|
|
@ -1860,20 +1864,36 @@ esac
|
|||
# If build != host, and we aren't building gas in-tree, we identify a
|
||||
# build->target linker and hope that it will have the same features
|
||||
# as the host->target linker we'll be using.
|
||||
in_tree_ld=no
|
||||
gcc_cv_ld=
|
||||
gcc_cv_gld_major_version=
|
||||
gcc_cv_gld_minor_version=
|
||||
gcc_cv_ld_gld_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/ld
|
||||
gcc_cv_ld_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
|
||||
|
||||
AS_VAR_SET_IF(gcc_cv_ld,, [
|
||||
if test -x "$DEFAULT_LINKER"; then
|
||||
gcc_cv_ld="$DEFAULT_LINKER"
|
||||
elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
|
||||
&& test -f ../ld/Makefile \
|
||||
&& test x$build = x$host; then
|
||||
gcc_cv_ld=../ld/ld-new$build_exeext
|
||||
elif test -x collect-ld$build_exeext; then
|
||||
# Build using linker in the current directory.
|
||||
gcc_cv_ld=./collect-ld$build_exeext
|
||||
elif test -x $LD_FOR_TARGET; then
|
||||
gcc_cv_ld="$LD_FOR_TARGET"
|
||||
else
|
||||
AC_PATH_PROG(gcc_cv_ld, $LD_FOR_TARGET)
|
||||
fi])
|
||||
|
||||
ORIGINAL_LD_FOR_TARGET=$gcc_cv_ld
|
||||
AC_SUBST(ORIGINAL_LD_FOR_TARGET)
|
||||
|
||||
AC_MSG_CHECKING(what linker to use)
|
||||
if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext; 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.
|
||||
AC_MSG_RESULT(newly built ld)
|
||||
in_tree_ld=yes
|
||||
in_tree_ld_is_elf=no
|
||||
if (grep 'EMUL = .*elf' ../ld/Makefile \
|
||||
|
|
@ -1885,71 +1905,68 @@ elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
|
|||
do
|
||||
changequote(,)dnl
|
||||
gcc_cv_gld_version=`sed -n -e 's/^[ ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f`
|
||||
changequote([,])dnl
|
||||
if test x$gcc_cv_gld_version != x; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
changequote(,)dnl
|
||||
gcc_cv_gld_major_version=`expr "$gcc_cv_gld_version" : "VERSION=\([0-9]*\)"`
|
||||
gcc_cv_gld_minor_version=`expr "$gcc_cv_gld_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
|
||||
changequote([,])dnl
|
||||
gcc_cv_ld=../ld/ld-new$build_exeext
|
||||
elif test -x collect-ld$build_exeext; then
|
||||
# Build using linker in the current directory.
|
||||
gcc_cv_ld=./collect-ld$build_exeext
|
||||
else
|
||||
AC_MSG_RESULT($gcc_cv_ld)
|
||||
in_tree_ld=no
|
||||
fi
|
||||
|
||||
gcc_AC_CHECK_TOOL(gcc_cv_ld, ld, ORIGINAL_LD_FOR_TARGET, LD_FOR_TARGET, LD)
|
||||
AC_MSG_CHECKING(what linker to use)
|
||||
case $in_tree_ld in
|
||||
yes)
|
||||
AC_MSG_RESULT("newly built ld")
|
||||
;;
|
||||
no)
|
||||
AC_MSG_RESULT($gcc_cv_ld)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Figure out what nm we will be using.
|
||||
gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils
|
||||
in_tree_nm=no
|
||||
gcc_cv_nm=
|
||||
AS_VAR_SET_IF(gcc_cv_nm,, [
|
||||
if test -f $gcc_cv_binutils_srcdir/configure.in \
|
||||
&& test -f ../binutils/Makefile; then
|
||||
# Single tree build which includes binutils.
|
||||
in_tree_nm=yes
|
||||
gcc_cv_nm=../binutils/nm-new$build_exeext
|
||||
elif test -x nm$build_exeext; then
|
||||
gcc_cv_nm=./nm$build_exeext
|
||||
elif test -x $NM_FOR_TARGET; then
|
||||
gcc_cv_nm="$NM_FOR_TARGET"
|
||||
else
|
||||
AC_PATH_PROG(gcc_cv_nm, $NM_FOR_TARGET)
|
||||
fi])
|
||||
|
||||
AC_MSG_CHECKING(what nm to use)
|
||||
if test "$gcc_cv_nm" = ../binutils/nm-new$build_exeext; then
|
||||
# Single tree build which includes binutils.
|
||||
AC_MSG_RESULT(newly built nm)
|
||||
in_tree_nm=yes
|
||||
else
|
||||
AC_MSG_RESULT($gcc_cv_nm)
|
||||
in_tree_nm=no
|
||||
fi
|
||||
|
||||
gcc_AC_CHECK_TOOL(gcc_cv_nm, nm, ORIGINAL_NM_FOR_TARGET, NM_FOR_TARGET, NM)
|
||||
AC_MSG_CHECKING(what nm to use)
|
||||
case $in_tree_nm in
|
||||
yes) AC_MSG_RESULT("newly built nm") ;;
|
||||
no) AC_MSG_RESULT($gcc_cv_nm) ;;
|
||||
esac
|
||||
ORIGINAL_NM_FOR_TARGET=$gcc_cv_nm
|
||||
AC_SUBST(ORIGINAL_NM_FOR_TARGET)
|
||||
|
||||
# Figure out what objdump we will be using.
|
||||
in_tree_objdump=no
|
||||
gcc_cv_objdump=
|
||||
AS_VAR_SET_IF(gcc_cv_objdump,, [
|
||||
if test -f $gcc_cv_binutils_srcdir/configure.in \
|
||||
&& test -f ../binutils/Makefile; then
|
||||
# Single tree build which includes binutils.
|
||||
in_tree_objdump=yes
|
||||
gcc_cv_objdump=../binutils/objdump$build_exeext
|
||||
elif test -x objdump$build_exeext; then
|
||||
gcc_cv_objdump=./objdump$build_exeext
|
||||
fi
|
||||
elif test -x $OBJDUMP_FOR_TARGET; then
|
||||
gcc_cv_objdump="$OBJDUMP_FOR_TARGET"
|
||||
else
|
||||
AC_PATH_PROG(gcc_cv_objdump, $OBJDUMP_FOR_TARGET)
|
||||
fi])
|
||||
|
||||
gcc_AC_CHECK_TOOL(gcc_cv_objdump, objdump, ORIGINAL_OBJDUMP_FOR_TARGET,
|
||||
OBJDUMP_FOR_TARGET, OBJDUMP)
|
||||
AC_MSG_CHECKING(what objdump to use)
|
||||
case $in_tree_objdump in
|
||||
yes) AC_MSG_RESULT("newly built objdump") ;;
|
||||
no) AC_MSG_RESULT($gcc_cv_objdump) ;;
|
||||
esac
|
||||
if test "$gcc_cv_objdump" = ../binutils/objdump$build_exeext; then
|
||||
# Single tree build which includes binutils.
|
||||
AC_MSG_RESULT(newly built objdump)
|
||||
elif test x$gcc_cv_objdump = x; then
|
||||
AC_MSG_RESULT(not found)
|
||||
else
|
||||
AC_MSG_RESULT($gcc_cv_objdump)
|
||||
fi
|
||||
|
||||
# Figure out what assembler alignment features are present.
|
||||
gcc_GAS_CHECK_FEATURE([.balign and .p2align], gcc_cv_as_balign_and_p2align,
|
||||
|
|
|
|||
Loading…
Reference in New Issue