merge from gcc

This commit is contained in:
DJ Delorie 2004-12-08 18:55:40 +00:00
parent 434c4c7751
commit abe84df797
2 changed files with 3 additions and 8 deletions

View File

@ -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

View File

@ -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: