merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 67c6ccb36a95dbed02024fee141537191cec5f44..378ee0af0d3a25b723d578cac29b7601fdc36bf0 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,7 +1,3 @@
-2004-12-08  Ben Elliston  <bje@au.ibm.com>
-
-       * Makefile.in (.NOEXPORT): Move above the autogenerated line.
-
 2004-12-07  DJ Delorie  <dj@redhat.com>
 
        * splay-tree.c (splay_tree_delete_helper): Redesign the logic so

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index e09aaa110fa37c58d05acb0b6c4ed2d4c718030a..ffa4ba51d67c9148737e99d405fbbae38e957d30 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -413,10 +413,6 @@ maintainer-clean-subdir: config.h
 $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS): stamp-picdir
 $(CONFIGURED_OFILES): stamp-picdir
 
-# Don't export variables to the environment, in order to not confuse
-# configure.
-.NOEXPORT:
-
 # The dependencies in the remainder of this file are automatically
 # generated by "make maint-deps".  Manual edits will be lost.
 
@@ -1061,3 +1057,6 @@ $(CONFIGURED_OFILES): stamp-picdir
        else true; fi
        $(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
 
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT: