aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2004-12-08 18:55:40 +0000
committerDJ Delorie <dj@redhat.com>2004-12-08 18:55:40 +0000
commitabe84df79712306f5edbbea4b5e35dc63920fb42 (patch)
tree66791b539c2d5d6cee1ddb6bac5dd37635962d57
parent434c4c77514a50f07e210d26c337698b037bb773 (diff)
downloadgdb-abe84df79712306f5edbbea4b5e35dc63920fb42.zip
gdb-abe84df79712306f5edbbea4b5e35dc63920fb42.tar.gz
gdb-abe84df79712306f5edbbea4b5e35dc63920fb42.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/Makefile.in7
2 files changed, 3 insertions, 8 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 67c6ccb..378ee0a 100644
--- 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 e09aaa1..ffa4ba5 100644
--- 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: