diff --git a/ChangeLog b/ChangeLog index e6290c520..4f3cc589c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-10-06 Daniel Jacobowitz + + * 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 * Makefile.tpl (all) [gcc-no-bootstrap]: Make prebootstrap packages diff --git a/Makefile.def b/Makefile.def index 2937e8b4a..9731bd66f 100644 --- a/Makefile.def +++ b/Makefile.def @@ -228,6 +228,7 @@ flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= LIBCXXFLAGS_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= STRIP_FOR_TARGET ; }; flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; diff --git a/Makefile.in b/Makefile.in index a99eff47c..0de1a3c7a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -196,6 +196,7 @@ BASE_TARGET_EXPORTS = \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ NM="$(NM_FOR_TARGET)"; export NM; \ + OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ @@ -510,6 +511,23 @@ USUAL_NM_FOR_TARGET = ` \ 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@ CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ USUAL_RANLIB_FOR_TARGET = ` \ @@ -675,6 +693,7 @@ BASE_FLAGS_TO_PASS = \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ + "OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \ "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ @@ -727,6 +746,7 @@ EXTRA_TARGET_FLAGS = \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ + 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' diff --git a/Makefile.tpl b/Makefile.tpl index 8c19bbfaa..47fa0c809 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -199,6 +199,7 @@ BASE_TARGET_EXPORTS = \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ NM="$(NM_FOR_TARGET)"; export NM; \ + OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ @@ -513,6 +514,23 @@ USUAL_NM_FOR_TARGET = ` \ 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@ CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ USUAL_RANLIB_FOR_TARGET = ` \ @@ -660,6 +678,7 @@ EXTRA_TARGET_FLAGS = \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ + 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' diff --git a/configure b/configure index 6b6666849..4267dba22 100755 --- a/configure +++ b/configure @@ -5010,12 +5010,87 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then fi fi - for ncn_progname in ranlib; do + for ncn_progname in objdump; 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: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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5046,7 +5121,7 @@ fi # 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 +echo "configure:5125: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 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. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5116,7 +5191,7 @@ fi # 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: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 echo $ac_n "(cached) $ac_c" 1>&6 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. set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5191,7 +5266,7 @@ fi # 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: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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5242,6 +5317,7 @@ CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET" CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET" +CONFIGURED_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" CONFIGURED_STRIP_FOR_TARGET="$STRIP_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)" LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)" NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" + OBJDUMP_FOR_TARGET="\$(USUAL_OBJDUMP_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" @@ -5285,6 +5362,7 @@ else LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)" LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)" NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)" + OBJDUMP_FOR_TARGET="\$(CONFIGURED_OBJDUMP_FOR_TARGET)" RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)" STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_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} 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. if test "${enable_maintainer_mode+set}" = set; then 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 # possible, however, we can resort to mv. 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5622,6 +5700,7 @@ s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g s%@LIPO_FOR_TARGET@%$LIPO_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%@STRIP_FOR_TARGET@%$STRIP_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_LIPO_FOR_TARGET@%$CONFIGURED_LIPO_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_STRIP_FOR_TARGET@%$CONFIGURED_STRIP_FOR_TARGET%g s%@CONFIGURED_WINDRES_FOR_TARGET@%$CONFIGURED_WINDRES_FOR_TARGET%g diff --git a/configure.in b/configure.in index 4633c2c59..33bc67ad7 100644 --- a/configure.in +++ b/configure.in @@ -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(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) @@ -2135,6 +2136,7 @@ CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET" CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET" +CONFIGURED_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" CONFIGURED_STRIP_FOR_TARGET="$STRIP_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_LIPO_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_STRIP_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)" LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)" NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" + OBJDUMP_FOR_TARGET="\$(USUAL_OBJDUMP_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" @@ -2192,6 +2196,7 @@ else LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)" LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)" NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)" + OBJDUMP_FOR_TARGET="\$(CONFIGURED_OBJDUMP_FOR_TARGET)" RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)" STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)" WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"