This commit was manufactured by cvs2svn to create tagcarlton_dictionary-20030430-merge

'carlton_dictionary-20030430-merge'.

Sprout from binutils-2_14-branch 2003-04-24 12:36:09 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'binutils-'
Cherrypick from master 2003-04-29 01:53:45 UTC H.J. Lu <hjl.tools@gmail.com> 'bfd/':
    ChangeLog
    Makefile.in
    Makefile.tpl
    djunpack.bat
    include/ChangeLog
    include/bfdlink.h

6 files changed, 66 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3008cc64e..a918b0816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
+
+	* Makefile.tpl: Clean $(BUILD_SUBDIR).
+	* Makefile.in: Regenerated.
+
 2003-04-18  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
 	* Makefile.tpl (MAKEINFOFLAGS): Default to --split-size=5000000.
diff --git a/Makefile.in b/Makefile.in
index 1b993f59e..754329ea2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1112,6 +1112,7 @@ local-distclean:
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
+	-rm -rf $(BUILD_SUBDIR)
 	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
 	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
 	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
diff --git a/Makefile.tpl b/Makefile.tpl
index 314c44977..018f18f5d 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -672,6 +672,7 @@ local-distclean:
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
+	-rm -rf $(BUILD_SUBDIR)
 	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
 	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
 	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
diff --git a/djunpack.bat b/djunpack.bat
new file mode 100755
index 000000000..f09f5ed32
--- /dev/null
+++ b/djunpack.bat
@@ -0,0 +1,52 @@
+@echo off

+Rem

+Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line

+Rem format, or else stock DOS/Windows shells will refuse to run it.

+Rem

+Rem This batch file unpacks the GDB distribution while simultaneously

+Rem renaming some of the files whose names are invalid on DOS or conflict

+Rem with other file names after truncation to DOS 8+3 namespace.

+Rem

+Rem Invoke like this:

+Rem

+Rem     djunpack gdb-XYZ.tar

+Rem

+Rem where XYZ is the version number.  If the argument includes leading

+Rem directories, it MUST use backslashes, not forward slashes.

+Rem

+Rem The following 2 lines need to be changed with each new GDB release, to

+Rem be identical to the name of the top-level directory where the GDB

+Rem distribution unpacks itself.

+set GDBVER=gdb-5.0

+if "%GDBVER%"=="gdb-5.0" GoTo EnvOk

+Rem If their environment space is too small, re-exec with a larger one

+command.com /e:4096 /c %0 %1

+GoTo End

+:EnvOk

+if not exist %1 GoTo NoArchive

+djtar -x -p -o %GDBVER%/gdb/config/djgpp/fnchange.lst %1 > fnchange.tmp

+Rem The following uses a feature of COPY whereby it does not copy

+Rem empty files.  We need that because the previous line will create

+Rem an empty fnchange.tmp even if the command failed for some reason.

+copy fnchange.tmp junk.tmp > nul

+if not exist junk.tmp GoTo NoDjTar

+del junk.tmp

+sed -e 's,@V@,%GDBVER%,g' < fnchange.tmp > fnchange.lst

+Rem See the comment above about the reason for using COPY.

+copy fnchange.lst junk.tmp > nul

+if not exist junk.tmp GoTo NoSed

+del junk.tmp

+djtar -x -n fnchange.lst %1

+GoTo End

+:NoSed

+echo FAIL: Sed is not available.

+GoTo End

+:NoDjTar

+echo FAIL: DJTAR is not available or no fnchange.lst file in %1.

+GoTo End

+:NoArchive

+echo FAIL: the file %1 does not seem to exist.

+echo Remember that %1 cannot use forward slashes, only backslashes.

+GoTo End

+:End

+set GDBVER=

diff --git a/include/ChangeLog b/include/ChangeLog
index 3d7ec5caa..6d18714ee 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-28  H.J. Lu <hjl@gnu.org>
+
+	* bfdlink.h (bfd_link_info): Add relax_finalizing.
+
 2003-04-23  H.J. Lu <hjl@gnu.org>
 
 	* bfdlink.h (bfd_link_callbacks): Add error_handler.
diff --git a/include/bfdlink.h b/include/bfdlink.h
index acb7449e5..380923a97 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -288,6 +288,9 @@ struct bfd_link_info
   /* TRUE if global symbols in discarded sections should be stripped.  */
   unsigned int strip_discarded: 1;
 
+  /* TRUE if relaxation is being finalized.  */
+  unsigned int relax_finalizing: 1;
+
   /* Which symbols to strip.  */
   enum bfd_link_strip strip;