diff mbox

Remove libelf remains

Message ID 1291865679-12167-2-git-send-email-lacombar@gmail.com
State New
Headers show

Commit Message

Arnaud Lacombe Dec. 9, 2010, 3:34 a.m. UTC 
Hi,

While browsing the tree, I encountered some LTO remain in Makefile.*, which I
thought has been killed in r166233. Maybe they should be removed ?

Bootstrapped on i386-unknown-netbsdelf5.99.25 withe LTO enabled.

Regression tests pending.

1010-12-09 - Arnaud Lacombe <lacombar@gmail.com>

	* Makefile.def: Remove libelf remains.
	Makefile.tpl: Likewise.
	configure.ac: Likewise.
	Makefile.in: Likewise.

CC: Ian Lance Taylor <iant@google.com>
CC: Dave Korn  <dave.korn.cygwin@gmail.com>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>

---
 Makefile.def |    4 -
 Makefile.in  |  988 +---------------------------------------------------------
 Makefile.tpl |    4 -
 configure    |    2 +-
 configure.ac |    2 +-
 5 files changed, 4 insertions(+), 996 deletions(-)

Comments

Arnaud Lacombe Dec. 9, 2010, 3:47 a.m. UTC | #1 
Hi,

On Wed, Dec 8, 2010 at 10:34 PM, Arnaud Lacombe <lacombar@gmail.com> wrote:
> Hi,
>
> While browsing the tree, I encountered some LTO remain in Makefile.*,
This should of course read "some libelf remains", not LTO :-/

 - Arnaud
Ian Lance Taylor Dec. 9, 2010, 5:24 a.m. UTC | #2 
Arnaud Lacombe <lacombar@gmail.com> writes:

> 1010-12-09 - Arnaud Lacombe <lacombar@gmail.com>
>
> 	* Makefile.def: Remove libelf remains.
> 	Makefile.tpl: Likewise.
> 	configure.ac: Likewise.
> 	Makefile.in: Likewise.

There should be a * in front of each file name:

	* Makefile.def: Remove libelf remains.
        * Makefile.tpl: Likewise.
        * configure.ac: Likewise.
        * configure, Makefile.in: Regenerate.

This is OK.

Thanks.

Ian
Ralf Wildenhues Dec. 9, 2010, 6:51 a.m. UTC | #3 
Hello,

* Arnaud Lacombe wrote on Thu, Dec 09, 2010 at 04:34:39AM CET:
> 1010-12-09 - Arnaud Lacombe <lacombar@gmail.com>
> 
> 	* Makefile.def: Remove libelf remains.
> 	Makefile.tpl: Likewise.
> 	configure.ac: Likewise.
> 	Makefile.in: Likewise.

This needs to be synced to the src repository, and Cc:ed to binutils and
gdb-patches lists.

Cheers,
Ralf
diff mbox

Patch

diff --git a/Makefile.def b/Makefile.def
index 8eb5b03a..dd983c0 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -83,9 +83,6 @@  host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
 		extra_exports='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS; ';
 		extra_make_flags='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"';
 		no_install= true; };
-host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
-		extra_configure_flags='--disable-shared';
-		no_install= true; };
 host_modules= { module= gnuserv; };
 host_modules= { module= gold; bootstrap=true; };
 host_modules= { module= gprof; };
@@ -325,7 +322,6 @@  dependencies = { module=configure-gcc; on=all-binutils; };
 dependencies = { module=configure-gcc; on=all-gas; };
 dependencies = { module=configure-gcc; on=all-ld; };
 dependencies = { module=configure-gcc; on=all-gold; };
-dependencies = { module=configure-gcc; on=all-libelf; };
 dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
 dependencies = { module=all-gcc; on=all-gmp; };
 dependencies = { module=all-gcc; on=all-intl; };
diff --git a/Makefile.in b/Makefile.in
index 945fc5d..d66e943 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,8 +223,6 @@  HOST_EXPORTS = \
 	PPLINC="$(HOST_PPLINC)"; export PPLINC; \
 	CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
 	CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
-	LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
-	LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
 @if gcc-bootstrap
 	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 @endif gcc-bootstrap
@@ -314,10 +312,6 @@  HOST_PPLINC = @pplinc@
 HOST_CLOOGLIBS = @clooglibs@
 HOST_CLOOGINC = @clooginc@
 
-# Where to find libelf
-HOST_LIBELFLIBS = @libelflibs@
-HOST_LIBELFINC = @libelfinc@
-
 # ----------------------------------------------
 # Programs producing files for the BUILD machine
 # ----------------------------------------------
@@ -591,7 +585,7 @@  TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
-HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_ppl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf)
+HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_ppl)$(HOST_LIB_PATH_cloog)
 
 # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
 @if gcc
@@ -634,11 +628,6 @@  HOST_LIB_PATH_cloog = \
   $$r/$(HOST_SUBDIR)/cloog/.libs:$$r/$(HOST_SUBDIR)/prev-cloog/.libs:
 @endif cloog
 
-@if libelf
-HOST_LIB_PATH_libelf = \
-  $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs:
-@endif libelf
-
 
 CXX_FOR_TARGET_FLAG_TO_PASS = \
 	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"
@@ -904,7 +893,6 @@  configure-host:  \
     maybe-configure-mpc \
     maybe-configure-ppl \
     maybe-configure-cloog \
-    maybe-configure-libelf \
     maybe-configure-gnuserv \
     maybe-configure-gold \
     maybe-configure-gprof \
@@ -1065,9 +1053,6 @@  all-host: maybe-all-ppl
 @if cloog-no-bootstrap
 all-host: maybe-all-cloog
 @endif cloog-no-bootstrap
-@if libelf-no-bootstrap
-all-host: maybe-all-libelf
-@endif libelf-no-bootstrap
 all-host: maybe-all-gnuserv
 @if gold-no-bootstrap
 all-host: maybe-all-gold
@@ -1210,7 +1195,6 @@  info-host: maybe-info-mpfr
 info-host: maybe-info-mpc
 info-host: maybe-info-ppl
 info-host: maybe-info-cloog
-info-host: maybe-info-libelf
 info-host: maybe-info-gnuserv
 info-host: maybe-info-gold
 info-host: maybe-info-gprof
@@ -1326,7 +1310,6 @@  dvi-host: maybe-dvi-mpfr
 dvi-host: maybe-dvi-mpc
 dvi-host: maybe-dvi-ppl
 dvi-host: maybe-dvi-cloog
-dvi-host: maybe-dvi-libelf
 dvi-host: maybe-dvi-gnuserv
 dvi-host: maybe-dvi-gold
 dvi-host: maybe-dvi-gprof
@@ -1442,7 +1425,6 @@  pdf-host: maybe-pdf-mpfr
 pdf-host: maybe-pdf-mpc
 pdf-host: maybe-pdf-ppl
 pdf-host: maybe-pdf-cloog
-pdf-host: maybe-pdf-libelf
 pdf-host: maybe-pdf-gnuserv
 pdf-host: maybe-pdf-gold
 pdf-host: maybe-pdf-gprof
@@ -1558,7 +1540,6 @@  html-host: maybe-html-mpfr
 html-host: maybe-html-mpc
 html-host: maybe-html-ppl
 html-host: maybe-html-cloog
-html-host: maybe-html-libelf
 html-host: maybe-html-gnuserv
 html-host: maybe-html-gold
 html-host: maybe-html-gprof
@@ -1674,7 +1655,6 @@  TAGS-host: maybe-TAGS-mpfr
 TAGS-host: maybe-TAGS-mpc
 TAGS-host: maybe-TAGS-ppl
 TAGS-host: maybe-TAGS-cloog
-TAGS-host: maybe-TAGS-libelf
 TAGS-host: maybe-TAGS-gnuserv
 TAGS-host: maybe-TAGS-gold
 TAGS-host: maybe-TAGS-gprof
@@ -1790,7 +1770,6 @@  install-info-host: maybe-install-info-mpfr
 install-info-host: maybe-install-info-mpc
 install-info-host: maybe-install-info-ppl
 install-info-host: maybe-install-info-cloog
-install-info-host: maybe-install-info-libelf
 install-info-host: maybe-install-info-gnuserv
 install-info-host: maybe-install-info-gold
 install-info-host: maybe-install-info-gprof
@@ -1906,7 +1885,6 @@  install-pdf-host: maybe-install-pdf-mpfr
 install-pdf-host: maybe-install-pdf-mpc
 install-pdf-host: maybe-install-pdf-ppl
 install-pdf-host: maybe-install-pdf-cloog
-install-pdf-host: maybe-install-pdf-libelf
 install-pdf-host: maybe-install-pdf-gnuserv
 install-pdf-host: maybe-install-pdf-gold
 install-pdf-host: maybe-install-pdf-gprof
@@ -2022,7 +2000,6 @@  install-html-host: maybe-install-html-mpfr
 install-html-host: maybe-install-html-mpc
 install-html-host: maybe-install-html-ppl
 install-html-host: maybe-install-html-cloog
-install-html-host: maybe-install-html-libelf
 install-html-host: maybe-install-html-gnuserv
 install-html-host: maybe-install-html-gold
 install-html-host: maybe-install-html-gprof
@@ -2138,7 +2115,6 @@  installcheck-host: maybe-installcheck-mpfr
 installcheck-host: maybe-installcheck-mpc
 installcheck-host: maybe-installcheck-ppl
 installcheck-host: maybe-installcheck-cloog
-installcheck-host: maybe-installcheck-libelf
 installcheck-host: maybe-installcheck-gnuserv
 installcheck-host: maybe-installcheck-gold
 installcheck-host: maybe-installcheck-gprof
@@ -2254,7 +2230,6 @@  mostlyclean-host: maybe-mostlyclean-mpfr
 mostlyclean-host: maybe-mostlyclean-mpc
 mostlyclean-host: maybe-mostlyclean-ppl
 mostlyclean-host: maybe-mostlyclean-cloog
-mostlyclean-host: maybe-mostlyclean-libelf
 mostlyclean-host: maybe-mostlyclean-gnuserv
 mostlyclean-host: maybe-mostlyclean-gold
 mostlyclean-host: maybe-mostlyclean-gprof
@@ -2370,7 +2345,6 @@  clean-host: maybe-clean-mpfr
 clean-host: maybe-clean-mpc
 clean-host: maybe-clean-ppl
 clean-host: maybe-clean-cloog
-clean-host: maybe-clean-libelf
 clean-host: maybe-clean-gnuserv
 clean-host: maybe-clean-gold
 clean-host: maybe-clean-gprof
@@ -2486,7 +2460,6 @@  distclean-host: maybe-distclean-mpfr
 distclean-host: maybe-distclean-mpc
 distclean-host: maybe-distclean-ppl
 distclean-host: maybe-distclean-cloog
-distclean-host: maybe-distclean-libelf
 distclean-host: maybe-distclean-gnuserv
 distclean-host: maybe-distclean-gold
 distclean-host: maybe-distclean-gprof
@@ -2602,7 +2575,6 @@  maintainer-clean-host: maybe-maintainer-clean-mpfr
 maintainer-clean-host: maybe-maintainer-clean-mpc
 maintainer-clean-host: maybe-maintainer-clean-ppl
 maintainer-clean-host: maybe-maintainer-clean-cloog
-maintainer-clean-host: maybe-maintainer-clean-libelf
 maintainer-clean-host: maybe-maintainer-clean-gnuserv
 maintainer-clean-host: maybe-maintainer-clean-gold
 maintainer-clean-host: maybe-maintainer-clean-gprof
@@ -2773,7 +2745,6 @@  check-host:  \
     maybe-check-mpc \
     maybe-check-ppl \
     maybe-check-cloog \
-    maybe-check-libelf \
     maybe-check-gnuserv \
     maybe-check-gold \
     maybe-check-gprof \
@@ -2915,7 +2886,6 @@  install-host-nogcc:  \
     maybe-install-mpc \
     maybe-install-ppl \
     maybe-install-cloog \
-    maybe-install-libelf \
     maybe-install-gnuserv \
     maybe-install-gold \
     maybe-install-gprof \
@@ -2996,7 +2966,6 @@  install-host:  \
     maybe-install-mpc \
     maybe-install-ppl \
     maybe-install-cloog \
-    maybe-install-libelf \
     maybe-install-gnuserv \
     maybe-install-gold \
     maybe-install-gprof \
@@ -3131,7 +3100,6 @@  install-strip-host:  \
     maybe-install-strip-mpc \
     maybe-install-strip-ppl \
     maybe-install-strip-cloog \
-    maybe-install-strip-libelf \
     maybe-install-strip-gnuserv \
     maybe-install-strip-gold \
     maybe-install-strip-gprof \
@@ -21217,881 +21185,6 @@  maintainer-clean-cloog:
 
 
 
-.PHONY: configure-libelf maybe-configure-libelf
-maybe-configure-libelf:
-@if gcc-bootstrap
-configure-libelf: stage_current
-@endif gcc-bootstrap
-@if libelf
-maybe-configure-libelf: configure-libelf
-configure-libelf: 
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	$(HOST_EXPORTS)  \
-	echo Configuring in $(HOST_SUBDIR)/libelf; \
-	cd "$(HOST_SUBDIR)/libelf" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} --disable-shared \
-	  || exit 1
-@endif libelf
-
-
-
-.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
-maybe-configure-stage1-libelf:
-@if libelf-bootstrap
-maybe-configure-stage1-libelf: configure-stage1-libelf
-configure-stage1-libelf:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE1_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libelf ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  $(STAGE1_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
-maybe-configure-stage2-libelf:
-@if libelf-bootstrap
-maybe-configure-stage2-libelf: configure-stage2-libelf
-configure-stage2-libelf:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE2_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libelf ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE2_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
-maybe-configure-stage3-libelf:
-@if libelf-bootstrap
-maybe-configure-stage3-libelf: configure-stage3-libelf
-configure-stage3-libelf:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE3_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libelf ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE3_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
-maybe-configure-stage4-libelf:
-@if libelf-bootstrap
-maybe-configure-stage4-libelf: configure-stage4-libelf
-configure-stage4-libelf:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE4_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libelf ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE4_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
-maybe-configure-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
-configure-stageprofile-libelf:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libelf ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEprofile_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
-maybe-configure-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
-configure-stagefeedback-libelf:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libelf ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libelf"; \
-	libsrcdir="$$s/libelf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEfeedback_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-
-
-
-
-.PHONY: all-libelf maybe-all-libelf
-maybe-all-libelf:
-@if gcc-bootstrap
-all-libelf: stage_current
-@endif gcc-bootstrap
-@if libelf
-TARGET-libelf=all
-maybe-all-libelf: all-libelf
-all-libelf: configure-libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS)  \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-		$(TARGET-libelf))
-@endif libelf
-
-
-
-.PHONY: all-stage1-libelf maybe-all-stage1-libelf
-.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
-maybe-all-stage1-libelf:
-maybe-clean-stage1-libelf:
-@if libelf-bootstrap
-maybe-all-stage1-libelf: all-stage1-libelf
-all-stage1: all-stage1-libelf
-TARGET-stage1-libelf = $(TARGET-libelf)
-all-stage1-libelf: configure-stage1-libelf
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE1_TFLAGS)"; \
-	$(HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE1_CFLAGS)" \
-		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-		LIBCFLAGS="$(LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS)   \
-		TFLAGS="$(STAGE1_TFLAGS)" \
-		$(TARGET-stage1-libelf)
-
-maybe-clean-stage1-libelf: clean-stage1-libelf
-clean-stage1: clean-stage1-libelf
-clean-stage1-libelf:
-	@if [ $(current_stage) = stage1 ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stage1-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		 clean
-@endif libelf-bootstrap
-
-
-.PHONY: all-stage2-libelf maybe-all-stage2-libelf
-.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
-maybe-all-stage2-libelf:
-maybe-clean-stage2-libelf:
-@if libelf-bootstrap
-maybe-all-stage2-libelf: all-stage2-libelf
-all-stage2: all-stage2-libelf
-TARGET-stage2-libelf = $(TARGET-libelf)
-all-stage2-libelf: configure-stage2-libelf
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE2_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS)" \
-		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE2_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE2_TFLAGS)" \
-		$(TARGET-stage2-libelf)
-
-maybe-clean-stage2-libelf: clean-stage2-libelf
-clean-stage2: clean-stage2-libelf
-clean-stage2-libelf:
-	@if [ $(current_stage) = stage2 ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stage2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libelf-bootstrap
-
-
-.PHONY: all-stage3-libelf maybe-all-stage3-libelf
-.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
-maybe-all-stage3-libelf:
-maybe-clean-stage3-libelf:
-@if libelf-bootstrap
-maybe-all-stage3-libelf: all-stage3-libelf
-all-stage3: all-stage3-libelf
-TARGET-stage3-libelf = $(TARGET-libelf)
-all-stage3-libelf: configure-stage3-libelf
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE3_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE3_CFLAGS)" \
-		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE3_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE3_TFLAGS)" \
-		$(TARGET-stage3-libelf)
-
-maybe-clean-stage3-libelf: clean-stage3-libelf
-clean-stage3: clean-stage3-libelf
-clean-stage3-libelf:
-	@if [ $(current_stage) = stage3 ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stage3-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libelf-bootstrap
-
-
-.PHONY: all-stage4-libelf maybe-all-stage4-libelf
-.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
-maybe-all-stage4-libelf:
-maybe-clean-stage4-libelf:
-@if libelf-bootstrap
-maybe-all-stage4-libelf: all-stage4-libelf
-all-stage4: all-stage4-libelf
-TARGET-stage4-libelf = $(TARGET-libelf)
-all-stage4-libelf: configure-stage4-libelf
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE4_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" \
-		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE4_TFLAGS)" \
-		$(TARGET-stage4-libelf)
-
-maybe-clean-stage4-libelf: clean-stage4-libelf
-clean-stage4: clean-stage4-libelf
-clean-stage4-libelf:
-	@if [ $(current_stage) = stage4 ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stage4-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libelf-bootstrap
-
-
-.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
-.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
-maybe-all-stageprofile-libelf:
-maybe-clean-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-all-stageprofile-libelf: all-stageprofile-libelf
-all-stageprofile: all-stageprofile-libelf
-TARGET-stageprofile-libelf = $(TARGET-libelf)
-all-stageprofile-libelf: configure-stageprofile-libelf
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEprofile_TFLAGS)" \
-		$(TARGET-stageprofile-libelf)
-
-maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
-clean-stageprofile: clean-stageprofile-libelf
-clean-stageprofile-libelf:
-	@if [ $(current_stage) = stageprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stageprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libelf-bootstrap
-
-
-.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
-.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
-maybe-all-stagefeedback-libelf:
-maybe-clean-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
-all-stagefeedback: all-stagefeedback-libelf
-TARGET-stagefeedback-libelf = $(TARGET-libelf)
-all-stagefeedback-libelf: configure-stagefeedback-libelf
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEfeedback_TFLAGS)" \
-		$(TARGET-stagefeedback-libelf)
-
-maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
-clean-stagefeedback: clean-stagefeedback-libelf
-clean-stagefeedback-libelf:
-	@if [ $(current_stage) = stagefeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stagefeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 clean
-@endif libelf-bootstrap
-
-
-
-
-
-.PHONY: check-libelf maybe-check-libelf
-maybe-check-libelf:
-@if libelf
-maybe-check-libelf: check-libelf
-
-check-libelf:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libelf
-
-.PHONY: install-libelf maybe-install-libelf
-maybe-install-libelf:
-@if libelf
-maybe-install-libelf: install-libelf
-
-install-libelf:
-
-@endif libelf
-
-.PHONY: install-strip-libelf maybe-install-strip-libelf
-maybe-install-strip-libelf:
-@if libelf
-maybe-install-strip-libelf: install-strip-libelf
-
-install-strip-libelf:
-
-@endif libelf
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-libelf info-libelf
-maybe-info-libelf:
-@if libelf
-maybe-info-libelf: info-libelf
-
-info-libelf: \
-    configure-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          info) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-dvi-libelf dvi-libelf
-maybe-dvi-libelf:
-@if libelf
-maybe-dvi-libelf: dvi-libelf
-
-dvi-libelf: \
-    configure-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          dvi) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-pdf-libelf pdf-libelf
-maybe-pdf-libelf:
-@if libelf
-maybe-pdf-libelf: pdf-libelf
-
-pdf-libelf: \
-    configure-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing pdf in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          pdf) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-html-libelf html-libelf
-maybe-html-libelf:
-@if libelf
-maybe-html-libelf: html-libelf
-
-html-libelf: \
-    configure-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          html) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-TAGS-libelf TAGS-libelf
-maybe-TAGS-libelf:
-@if libelf
-maybe-TAGS-libelf: TAGS-libelf
-
-TAGS-libelf: \
-    configure-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-install-info-libelf install-info-libelf
-maybe-install-info-libelf:
-@if libelf
-maybe-install-info-libelf: install-info-libelf
-
-install-info-libelf: \
-    configure-libelf \
-    info-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-info) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-install-pdf-libelf install-pdf-libelf
-maybe-install-pdf-libelf:
-@if libelf
-maybe-install-pdf-libelf: install-pdf-libelf
-
-install-pdf-libelf: \
-    configure-libelf \
-    pdf-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-pdf in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-pdf) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-install-html-libelf install-html-libelf
-maybe-install-html-libelf:
-@if libelf
-maybe-install-html-libelf: install-html-libelf
-
-install-html-libelf: \
-    configure-libelf \
-    html-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-html in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-html) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-installcheck-libelf installcheck-libelf
-maybe-installcheck-libelf:
-@if libelf
-maybe-installcheck-libelf: installcheck-libelf
-
-installcheck-libelf: \
-    configure-libelf 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
-maybe-mostlyclean-libelf:
-@if libelf
-maybe-mostlyclean-libelf: mostlyclean-libelf
-
-mostlyclean-libelf: 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-clean-libelf clean-libelf
-maybe-clean-libelf:
-@if libelf
-maybe-clean-libelf: clean-libelf
-
-clean-libelf: 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          clean) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-distclean-libelf distclean-libelf
-maybe-distclean-libelf:
-@if libelf
-maybe-distclean-libelf: distclean-libelf
-
-distclean-libelf: 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          distclean) \
-	  || exit 1
-
-@endif libelf
-
-.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
-maybe-maintainer-clean-libelf:
-@if libelf
-maybe-maintainer-clean-libelf: maintainer-clean-libelf
-
-maintainer-clean-libelf: 
-	@[ -f ./libelf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libelf" ; \
-	(cd $(HOST_SUBDIR)/libelf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libelf
-
-
-
 .PHONY: configure-gnuserv maybe-configure-gnuserv
 maybe-configure-gnuserv:
 @if gcc-bootstrap
@@ -58324,11 +57417,6 @@  stage1-start::
 	  mkdir stage1-cloog; \
 	mv stage1-cloog cloog 
 @endif cloog
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stage1-libelf ] || \
-	  mkdir stage1-libelf; \
-	mv stage1-libelf libelf 
-@endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage1-gold ] || \
 	  mkdir stage1-gold; \
@@ -58424,11 +57512,6 @@  stage1-end::
 	  cd $(HOST_SUBDIR); mv cloog stage1-cloog  ; \
 	fi
 @endif cloog
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf ; then \
-	  cd $(HOST_SUBDIR); mv libelf stage1-libelf  ; \
-	fi
-@endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold ; then \
 	  cd $(HOST_SUBDIR); mv gold stage1-gold  ; \
@@ -58577,12 +57660,6 @@  stage2-start::
 	mv stage2-cloog cloog  ; \
 	mv stage1-cloog prev-cloog || test -f stage1-lean 
 @endif cloog
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
-	  mkdir stage2-libelf; \
-	mv stage2-libelf libelf  ; \
-	mv stage1-libelf prev-libelf || test -f stage1-lean 
-@endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
 	  mkdir stage2-gold; \
@@ -58697,12 +57774,6 @@  stage2-end::
 	  mv prev-cloog stage1-cloog ; :  ; \
 	fi
 @endif cloog
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf ; then \
-	  cd $(HOST_SUBDIR); mv libelf stage2-libelf ; \
-	  mv prev-libelf stage1-libelf ; :  ; \
-	fi
-@endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold ; then \
 	  cd $(HOST_SUBDIR); mv gold stage2-gold ; \
@@ -58883,12 +57954,6 @@  stage3-start::
 	mv stage3-cloog cloog  ; \
 	mv stage2-cloog prev-cloog || test -f stage2-lean 
 @endif cloog
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
-	  mkdir stage3-libelf; \
-	mv stage3-libelf libelf  ; \
-	mv stage2-libelf prev-libelf || test -f stage2-lean 
-@endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage3-gold ] || \
 	  mkdir stage3-gold; \
@@ -59003,12 +58068,6 @@  stage3-end::
 	  mv prev-cloog stage2-cloog ; :  ; \
 	fi
 @endif cloog
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf ; then \
-	  cd $(HOST_SUBDIR); mv libelf stage3-libelf ; \
-	  mv prev-libelf stage2-libelf ; :  ; \
-	fi
-@endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold ; then \
 	  cd $(HOST_SUBDIR); mv gold stage3-gold ; \
@@ -59245,12 +58304,6 @@  stage4-start::
 	mv stage4-cloog cloog  ; \
 	mv stage3-cloog prev-cloog || test -f stage3-lean 
 @endif cloog
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \
-	  mkdir stage4-libelf; \
-	mv stage4-libelf libelf  ; \
-	mv stage3-libelf prev-libelf || test -f stage3-lean 
-@endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage4-gold ] || \
 	  mkdir stage4-gold; \
@@ -59365,12 +58418,6 @@  stage4-end::
 	  mv prev-cloog stage3-cloog ; :  ; \
 	fi
 @endif cloog
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf ; then \
-	  cd $(HOST_SUBDIR); mv libelf stage4-libelf ; \
-	  mv prev-libelf stage3-libelf ; :  ; \
-	fi
-@endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold ; then \
 	  cd $(HOST_SUBDIR); mv gold stage4-gold ; \
@@ -59595,12 +58642,6 @@  stageprofile-start::
 	mv stageprofile-cloog cloog  ; \
 	mv stage1-cloog prev-cloog || test -f stage1-lean 
 @endif cloog
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
-	  mkdir stageprofile-libelf; \
-	mv stageprofile-libelf libelf  ; \
-	mv stage1-libelf prev-libelf || test -f stage1-lean 
-@endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
 	  mkdir stageprofile-gold; \
@@ -59715,12 +58756,6 @@  stageprofile-end::
 	  mv prev-cloog stage1-cloog ; :  ; \
 	fi
 @endif cloog
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf ; then \
-	  cd $(HOST_SUBDIR); mv libelf stageprofile-libelf ; \
-	  mv prev-libelf stage1-libelf ; :  ; \
-	fi
-@endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold ; then \
 	  cd $(HOST_SUBDIR); mv gold stageprofile-gold ; \
@@ -59878,12 +58913,6 @@  stagefeedback-start::
 	mv stagefeedback-cloog cloog  ; \
 	mv stageprofile-cloog prev-cloog || test -f stageprofile-lean 
 @endif cloog
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
-	  mkdir stagefeedback-libelf; \
-	mv stagefeedback-libelf libelf  ; \
-	mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
-@endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \
 	  mkdir stagefeedback-gold; \
@@ -59998,12 +59027,6 @@  stagefeedback-end::
 	  mv prev-cloog stageprofile-cloog ; :  ; \
 	fi
 @endif cloog
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf ; then \
-	  cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf ; \
-	  mv prev-libelf stageprofile-libelf ; :  ; \
-	fi
-@endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold ; then \
 	  cd $(HOST_SUBDIR); mv gold stagefeedback-gold ; \
@@ -60292,14 +59315,7 @@  configure-stage3-gcc: maybe-all-stage3-gold
 configure-stage4-gcc: maybe-all-stage4-gold
 configure-stageprofile-gcc: maybe-all-stageprofile-gold
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gold
-configure-gcc: maybe-all-libelf
-
-configure-stage1-gcc: maybe-all-stage1-libelf
-configure-stage2-gcc: maybe-all-stage2-libelf
-configure-stage3-gcc: maybe-all-stage3-libelf
-configure-stage4-gcc: maybe-all-stage4-libelf
-configure-stageprofile-gcc: maybe-all-stageprofile-libelf
-configure-stagefeedback-gcc: maybe-all-stagefeedback-libelf
+
 all-gcc: all-libiberty
 
 all-stage1-gcc: all-stage1-libiberty
diff --git a/Makefile.tpl b/Makefile.tpl
index f9a2936..9d460b0 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -317,10 +317,6 @@  HOST_PPLINC = @pplinc@
 HOST_CLOOGLIBS = @clooglibs@
 HOST_CLOOGINC = @clooginc@
 
-# Where to find libelf
-HOST_LIBELFLIBS = @libelflibs@
-HOST_LIBELFINC = @libelfinc@
-
 # ----------------------------------------------
 # Programs producing files for the BUILD machine
 # ----------------------------------------------
diff --git a/configure b/configure
index 6dde71a..6c8268e 100755
--- a/configure
+++ b/configure
@@ -2675,7 +2675,7 @@  build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libiconv"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
diff --git a/configure.ac b/configure.ac
index fcf5ba2..e2938d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@  build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libiconv"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to