OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.def (flags_to_pass): Add OBJDUMP_FOR_TARGET. 

./	* Makefile.def (flags_to_pass): Add OBJDUMP_FOR_TARGET.
	* Makefile.tpl (BASE_TARGET_EXPORTS): Add OBJDUMP.
	(OBJDUMP_FOR_TARGET, CONFIGURED_OBJDUMP_FOR_TARGET)
	(USUAL_OBJDUMP_FOR_TARGET): New.
	(EXTRA_TARGET_FLAGS): Add OBJDUMP.
	* configure.in: Check for $OBJDUMP_FOR_TARGET.
	* configure, Makefile: Regenerated.
gcc/
	* acinclude.m4 (gcc_AC_CHECK_TOOL): Handle environment variables
	here.  Use AC_PATH_PROG for environment variables instead of
	test -x.
	* configure.ac: Update calls to gcc_AC_CHECK_TOOL.  Use it for
	objdump also.
	* configure: Regenerated.

From-SVN: r105038
This commit is contained in:
Daniel Jacobowitz 2005-10-06 15:24:09 +00:00 committed by Daniel Jacobowitz
parent 88217f448d
commit d739199abb
10 changed files with 749 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-10-06 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.def (flags_to_pass): Add OBJDUMP_FOR_TARGET.
* Makefile.tpl (BASE_TARGET_EXPORTS): Add OBJDUMP.
(OBJDUMP_FOR_TARGET, CONFIGURED_OBJDUMP_FOR_TARGET)
(USUAL_OBJDUMP_FOR_TARGET): New.
(EXTRA_TARGET_FLAGS): Add OBJDUMP.
* configure.in: Check for $OBJDUMP_FOR_TARGET.
* configure, Makefile: Regenerated.
2005-10-05 Paolo Bonzini <bonzini@gnu.org> 2005-10-05 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (all) [gcc-no-bootstrap]: Make prebootstrap packages * Makefile.tpl (all) [gcc-no-bootstrap]: Make prebootstrap packages

1
Makefile.def
View File

@ -228,6 +228,7 @@ flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
flags_to_pass = { flag= NM_FOR_TARGET ; }; flags_to_pass = { flag= NM_FOR_TARGET ; };
flags_to_pass = { flag= OBJDUMP_FOR_TARGET ; };
flags_to_pass = { flag= RANLIB_FOR_TARGET ; }; flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
flags_to_pass = { flag= STRIP_FOR_TARGET ; }; flags_to_pass = { flag= STRIP_FOR_TARGET ; };
flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; flags_to_pass = { flag= WINDRES_FOR_TARGET ; };

20
Makefile.in
View File

@ -196,6 +196,7 @@ BASE_TARGET_EXPORTS = \
LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
NM="$(NM_FOR_TARGET)"; export NM; \ NM="$(NM_FOR_TARGET)"; export NM; \
OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
@ -510,6 +511,23 @@ USUAL_NM_FOR_TARGET = ` \
fi; \ fi; \
fi` fi`
OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
CONFIGURED_OBJDUMP_FOR_TARGET=@CONFIGURED_OBJDUMP_FOR_TARGET@
USUAL_OBJDUMP_FOR_TARGET = ` \
if [ -f $$r/$(HOST_SUBDIR)/binutils/objdump ] ; then \
echo $$r/$(HOST_SUBDIR)/binutils/objdump ; \
else \
if [ '$(host)' = '$(target)' ] ; then \
if [ x'$(OBJDUMP)' != x ]; then \
echo $(OBJDUMP); \
else \
echo objdump; \
fi; \
else \
echo $(CONFIGURED_OBJDUMP_FOR_TARGET) ; \
fi; \
fi`
RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
USUAL_RANLIB_FOR_TARGET = ` \ USUAL_RANLIB_FOR_TARGET = ` \
@ -675,6 +693,7 @@ BASE_FLAGS_TO_PASS = \
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \ "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
@ -727,6 +746,7 @@ EXTRA_TARGET_FLAGS = \
'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
'NM=$$(NM_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \
'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \
'WINDRES=$$(WINDRES_FOR_TARGET)' 'WINDRES=$$(WINDRES_FOR_TARGET)'

19
Makefile.tpl
View File

@ -199,6 +199,7 @@ BASE_TARGET_EXPORTS = \
LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
NM="$(NM_FOR_TARGET)"; export NM; \ NM="$(NM_FOR_TARGET)"; export NM; \
OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
@ -513,6 +514,23 @@ USUAL_NM_FOR_TARGET = ` \
fi; \ fi; \
fi` fi`
OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
CONFIGURED_OBJDUMP_FOR_TARGET=@CONFIGURED_OBJDUMP_FOR_TARGET@
USUAL_OBJDUMP_FOR_TARGET = ` \
if [ -f $$r/$(HOST_SUBDIR)/binutils/objdump ] ; then \
echo $$r/$(HOST_SUBDIR)/binutils/objdump ; \
else \
if [ '$(host)' = '$(target)' ] ; then \
if [ x'$(OBJDUMP)' != x ]; then \
echo $(OBJDUMP); \
else \
echo objdump; \
fi; \
else \
echo $(CONFIGURED_OBJDUMP_FOR_TARGET) ; \
fi; \
fi`
RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
USUAL_RANLIB_FOR_TARGET = ` \ USUAL_RANLIB_FOR_TARGET = ` \
@ -660,6 +678,7 @@ EXTRA_TARGET_FLAGS = \
'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
'NM=$$(NM_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \
'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \
'WINDRES=$$(WINDRES_FOR_TARGET)' 'WINDRES=$$(WINDRES_FOR_TARGET)'

96
configure vendored
View File

@ -5010,12 +5010,87 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
fi fi
fi fi
for ncn_progname in ranlib; do for ncn_progname in objdump; do
if test -n "$ncn_target_tool_prefix"; then if test -n "$ncn_target_tool_prefix"; then
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5019: checking for $ac_word" >&5 echo "configure:5019: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$OBJDUMP_FOR_TARGET"; then
ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
if test -n "$OBJDUMP_FOR_TARGET"; then
echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
else
echo "$ac_t""no" 1>&6
fi
fi
if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then
# Extract the first word of "${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5050: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$OBJDUMP_FOR_TARGET"; then
ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
if test -n "$OBJDUMP_FOR_TARGET"; then
echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
else
echo "$ac_t""no" 1>&6
fi
fi
test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break
done
if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then
set dummy objdump
if test $build = $target ; then
OBJDUMP_FOR_TARGET="$2"
else
OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi
fi
for ncn_progname in ranlib; do
if test -n "$ncn_target_tool_prefix"; then
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5094: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5046,7 +5121,7 @@ fi
# Extract the first word of "${ncn_progname}", so it can be a program name with args. # Extract the first word of "${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_progname}; ac_word=$2 set dummy ${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5050: checking for $ac_word" >&5 echo "configure:5125: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5085,7 +5160,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5089: checking for $ac_word" >&5 echo "configure:5164: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5116,7 +5191,7 @@ fi
# Extract the first word of "${ncn_progname}", so it can be a program name with args. # Extract the first word of "${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_progname}; ac_word=$2 set dummy ${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5120: checking for $ac_word" >&5 echo "configure:5195: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5160,7 +5235,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5164: checking for $ac_word" >&5 echo "configure:5239: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5191,7 +5266,7 @@ fi
# Extract the first word of "${ncn_progname}", so it can be a program name with args. # Extract the first word of "${ncn_progname}", so it can be a program name with args.
set dummy ${ncn_progname}; ac_word=$2 set dummy ${ncn_progname}; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:5195: checking for $ac_word" >&5 echo "configure:5270: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5242,6 +5317,7 @@ CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET"
CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET" CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET"
CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET"
CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET" CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET"
CONFIGURED_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET"
CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET"
CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET"
CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET"
@ -5268,6 +5344,7 @@ if test "x${build}" = "x${host}" ; then
LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)" LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)"
LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)" LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)"
NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)"
OBJDUMP_FOR_TARGET="\$(USUAL_OBJDUMP_FOR_TARGET)"
RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)"
STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)" STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)"
WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)"
@ -5285,6 +5362,7 @@ else
LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)" LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)"
LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)" LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)"
NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)" NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)"
OBJDUMP_FOR_TARGET="\$(CONFIGURED_OBJDUMP_FOR_TARGET)"
RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)" RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)"
STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)" STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)"
WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)" WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"
@ -5298,7 +5376,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:5302: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo "configure:5380: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode" enableval="$enable_maintainer_mode"
@ -5345,7 +5423,7 @@ esac
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not # gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
# possible, however, we can resort to mv. # possible, however, we can resort to mv.
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6 echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
echo "configure:5349: checking if symbolic links between directories work" >&5 echo "configure:5427: checking if symbolic links between directories work" >&5
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -5622,6 +5700,7 @@ s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g
s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g
s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g
s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g
s%@OBJDUMP_FOR_TARGET@%$OBJDUMP_FOR_TARGET%g
s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g
s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g
@ -5636,6 +5715,7 @@ s%@CONFIGURED_GFORTRAN_FOR_TARGET@%$CONFIGURED_GFORTRAN_FOR_TARGET%g
s%@CONFIGURED_LD_FOR_TARGET@%$CONFIGURED_LD_FOR_TARGET%g s%@CONFIGURED_LD_FOR_TARGET@%$CONFIGURED_LD_FOR_TARGET%g
s%@CONFIGURED_LIPO_FOR_TARGET@%$CONFIGURED_LIPO_FOR_TARGET%g s%@CONFIGURED_LIPO_FOR_TARGET@%$CONFIGURED_LIPO_FOR_TARGET%g
s%@CONFIGURED_NM_FOR_TARGET@%$CONFIGURED_NM_FOR_TARGET%g s%@CONFIGURED_NM_FOR_TARGET@%$CONFIGURED_NM_FOR_TARGET%g
s%@CONFIGURED_OBJDUMP_FOR_TARGET@%$CONFIGURED_OBJDUMP_FOR_TARGET%g
s%@CONFIGURED_RANLIB_FOR_TARGET@%$CONFIGURED_RANLIB_FOR_TARGET%g s%@CONFIGURED_RANLIB_FOR_TARGET@%$CONFIGURED_RANLIB_FOR_TARGET%g
s%@CONFIGURED_STRIP_FOR_TARGET@%$CONFIGURED_STRIP_FOR_TARGET%g s%@CONFIGURED_STRIP_FOR_TARGET@%$CONFIGURED_STRIP_FOR_TARGET%g
s%@CONFIGURED_WINDRES_FOR_TARGET@%$CONFIGURED_WINDRES_FOR_TARGET%g s%@CONFIGURED_WINDRES_FOR_TARGET@%$CONFIGURED_WINDRES_FOR_TARGET%g

5
configure.in
View File

@ -2120,6 +2120,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld) NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld)
NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo) NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo)
NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm) 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(RANLIB_FOR_TARGET, ranlib, :)
NCN_STRICT_CHECK_TARGET_TOOLS(STRIP_FOR_TARGET, strip) NCN_STRICT_CHECK_TARGET_TOOLS(STRIP_FOR_TARGET, strip)
NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres) NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres)
@ -2135,6 +2136,7 @@ CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET"
CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET" CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET"
CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET"
CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET" CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET"
CONFIGURED_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET"
CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET"
CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET"
CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET"
@ -2150,6 +2152,7 @@ AC_SUBST(CONFIGURED_GFORTRAN_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_LD_FOR_TARGET)dnl AC_SUBST(CONFIGURED_LD_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_LIPO_FOR_TARGET)dnl AC_SUBST(CONFIGURED_LIPO_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_NM_FOR_TARGET)dnl AC_SUBST(CONFIGURED_NM_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_OBJDUMP_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_RANLIB_FOR_TARGET)dnl AC_SUBST(CONFIGURED_RANLIB_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_STRIP_FOR_TARGET)dnl AC_SUBST(CONFIGURED_STRIP_FOR_TARGET)dnl
AC_SUBST(CONFIGURED_WINDRES_FOR_TARGET)dnl AC_SUBST(CONFIGURED_WINDRES_FOR_TARGET)dnl
@ -2175,6 +2178,7 @@ if test "x${build}" = "x${host}" ; then
LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)" LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)"
LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)" LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)"
NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)"
OBJDUMP_FOR_TARGET="\$(USUAL_OBJDUMP_FOR_TARGET)"
RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)"
STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)" STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)"
WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)"
@ -2192,6 +2196,7 @@ else
LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)" LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)"
LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)" LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)"
NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)" NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)"
OBJDUMP_FOR_TARGET="\$(CONFIGURED_OBJDUMP_FOR_TARGET)"
RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)" RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)"
STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)" STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)"
WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)" WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2005-10-06 Daniel Jacobowitz <dan@codesourcery.com>
* acinclude.m4 (gcc_AC_CHECK_TOOL): Handle environment variables
here. Use AC_PATH_PROG for environment variables instead of
test -x.
* configure.ac: Update calls to gcc_AC_CHECK_TOOL. Use it for
objdump also.
* configure: Regenerated.
2005-10-06 Richard Earnshaw <richard.earnshaw@arm.com> 2005-10-06 Richard Earnshaw <richard.earnshaw@arm.com>
PR target/23783 PR target/23783

9
gcc/acinclude.m4
View File

@ -561,6 +561,15 @@ AC_REQUIRE([gcc_AC_BUILD_EXEEXT])
dnl shut up useless "checking for..." messages dnl shut up useless "checking for..." messages
dnl we can still read them in config.log dnl we can still read them in config.log
exec AS_MESSAGE_FD([])>/dev/null 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 if test "x[$]$1" = x; then
# The AC_PATH_PROGS macro doesn't work properly when its 4th argument # The AC_PATH_PROGS macro doesn't work properly when its 4th argument
# is empty. # is empty.

807
gcc/configure vendored
View File

File diff suppressed because it is too large Load Diff

33
gcc/configure.ac
View File

@ -1797,13 +1797,9 @@ m4_pattern_allow([AS_FOR_TARGET])dnl
elif test -x as$build_exeext; then elif test -x as$build_exeext; then
# Build using assembler in the current directory. # Build using assembler in the current directory.
gcc_cv_as=./as$build_exeext gcc_cv_as=./as$build_exeext
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 fi
gcc_AC_CHECK_TOOL(gcc_cv_as, as, ORIGINAL_AS_FOR_TARGET) gcc_AC_CHECK_TOOL(gcc_cv_as, as, ORIGINAL_AS_FOR_TARGET, AS_FOR_TARGET, AS)
AC_MSG_CHECKING(what assembler to use) AC_MSG_CHECKING(what assembler to use)
case $in_tree_gas in case $in_tree_gas in
yes) yes)
@ -1859,13 +1855,9 @@ changequote([,])dnl
elif test -x collect-ld$build_exeext; then elif test -x collect-ld$build_exeext; then
# Build using linker in the current directory. # Build using linker in the current directory.
gcc_cv_ld=./collect-ld$build_exeext gcc_cv_ld=./collect-ld$build_exeext
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 fi
gcc_AC_CHECK_TOOL(gcc_cv_ld, ld, ORIGINAL_LD_FOR_TARGET) gcc_AC_CHECK_TOOL(gcc_cv_ld, ld, ORIGINAL_LD_FOR_TARGET, LD_FOR_TARGET, LD)
AC_MSG_CHECKING(what linker to use) AC_MSG_CHECKING(what linker to use)
case $in_tree_ld in case $in_tree_ld in
yes) yes)
@ -1889,7 +1881,7 @@ elif test -x nm$build_exeext; then
gcc_cv_nm=./nm$build_exeext gcc_cv_nm=./nm$build_exeext
fi fi
gcc_AC_CHECK_TOOL(gcc_cv_nm, nm, ORIGINAL_NM_FOR_TARGET) gcc_AC_CHECK_TOOL(gcc_cv_nm, nm, ORIGINAL_NM_FOR_TARGET, NM_FOR_TARGET, NM)
AC_MSG_CHECKING(what nm to use) AC_MSG_CHECKING(what nm to use)
case $in_tree_nm in case $in_tree_nm in
yes) AC_MSG_RESULT("newly built nm") ;; yes) AC_MSG_RESULT("newly built nm") ;;
@ -1897,23 +1889,20 @@ case $in_tree_nm in
esac esac
# Figure out what objdump we will be using. # Figure out what objdump we will be using.
AC_MSG_CHECKING(what objdump to use)
in_tree_objdump=no in_tree_objdump=no
if test -x objdump$build_exeext; then gcc_cv_objdump=
gcc_cv_objdump=./objdump$build_exeext if test -f $gcc_cv_binutils_srcdir/configure.in \
elif test -f $gcc_cv_binutils_srcdir/configure.in \
&& test -f ../binutils/Makefile; then && test -f ../binutils/Makefile; then
# Single tree build which includes binutils. # Single tree build which includes binutils.
in_tree_objdump=yes in_tree_objdump=yes
gcc_cv_objdump=../binutils/objdump$build_exeext gcc_cv_objdump=../binutils/objdump$build_exeext
elif test "x$program_prefix" != xNONE; then elif test -x objdump$build_exeext; then
gcc_cv_objdump=${program_prefix}objdump$build_exeext gcc_cv_objdump=./objdump$build_exeext
elif test x$build != x$host && test x$build != x$target; then
gcc_cv_objdump=${target_noncanonical}-objdump$build_exeext
else
gcc_cv_objdump=`echo objdump | \
sed "${program_transform_name}"`$build_exeext
fi 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 case $in_tree_objdump in
yes) AC_MSG_RESULT("newly built objdump") ;; yes) AC_MSG_RESULT("newly built objdump") ;;
no) AC_MSG_RESULT($gcc_cv_objdump) ;; no) AC_MSG_RESULT($gcc_cv_objdump) ;;