Merge ^vendor/binutils/dist@214082 into contrib/binutils.

2 files changed, 108 insertions, 34 deletions

diff --git a/contrib/binutils/etc/ChangeLog b/contrib/binutils/etc/ChangeLog
index 6865f2d..a5959c7 100644
--- a/contrib/binutils/etc/ChangeLog
+++ b/contrib/binutils/etc/ChangeLog
@@ -1,3 +1,39 @@
+2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* texi2pod.pl: Correct handling of absolute @include.
+
+2006-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* texi2pod.pl: Handle -I.
+
+2006-04-06  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.in: Add install-html target. Add htmldir,
+	docdir and datarootdir.
+	* configure.texi: Document install-html target.
+	* configure.in: AC_SUBST datarootdir, docdir, htmldir.
+	* configure: Regenerate.
+
+2006-02-27  Carlos O'Donell  <carlos@codesourcery.com>
+
+	* Makefile.in: TEXI2HTML uses makeinfo. Define 
+	HTMLFILES. Add html targets.
+	* configure.texi: Use ifnottex. Add alternative 
+	image format specifier as jpg.
+	* standards.texi: Use ifnottex.
+
+2005-10-21  Mark Mitchell  <mark@codesourcery.com>
+
+	* texi2pod.pl: Substitue for @value even when part of @include. 
+
+2005-10-21  Bob Wilson  <bob.wilson@acm.org>
+
+	* texi2pod.pl: Import latest version from GCC.
+
+2005-05-19  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.in: Have 'all' depend on 'info'.
+
 2003-05-16  Kelley Cook  <kelleycook@wideopenwest.com>
 
 	* configure.texi: Use "i[3-7]86" in example.
@@ -63,7 +99,7 @@
 1998-12-03  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/fr30.texi: New document.
-	
+
 1998-10-01  Angela Marie Thomas (angela@cygnus.com)
 
 	* comp-tools-fix, cross-tools-fix: Replace /usr/include
@@ -128,7 +164,7 @@ Mon May 18 14:27:37 1998  Angela Marie Thomas (angela@cygnus.com)
 Thu May 14 14:43:10 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/arm-interwork.texi: Document dlltool support of
-	interworking. 
+	interworking.
 
 Thu May  7 16:49:38 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
@@ -137,7 +173,7 @@ Thu May  7 16:49:38 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
 Wed Apr  1 17:11:44 1998  Nick Clifton  <nickc@cygnus.com>
 
-	* targetdoc/arm-interwork.texi: Document ARM/thumb interworking. 
+	* targetdoc/arm-interwork.texi: Document ARM/thumb interworking.
 
 Tue Mar 31 15:28:20 1998  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -147,7 +183,7 @@ Tue Mar 31 15:28:20 1998  Ian Lance Taylor  <ian@cygnus.com>
 Tue Mar 24 16:13:26 1998  Stu Grossman  <grossman@bhuna.cygnus.co.uk>
 
 	* configure:  Regenerate with autoconf 2.12.1 to fix shell issues
-	for NT native builds. 
+	for NT native builds.
 
 Mon Mar  9 16:41:04 1998  Doug Evans  <devans@canuck.cygnus.com>
 
@@ -183,7 +219,7 @@ Tue Jun 17 15:50:23 1997  Angela Marie Thomas (angela@cygnus.com)
 
 Thu Jun 12 13:47:00 1997  Angela Marie Thomas (angela@cygnus.com)
 
-        * Install.in (show_exec_prefix_msg): fix quoting
+	* Install.in (show_exec_prefix_msg): fix quoting
 
 Wed Jun  4 15:31:43 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
@@ -231,8 +267,8 @@ Thu Apr 10 23:23:33 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
 Mon Apr  7 18:15:00 1997  Brendan Kehoe <brendan@cygnus.com>
 
-        * Fix the version string for OSF1 4.0 to recognize either
-        V4.* or X4.*
+	* Fix the version string for OSF1 4.0 to recognize either
+	V4.* or X4.*
 
 Mon Apr  7 15:34:47 1997  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -303,8 +339,8 @@ Mon Aug 28 17:25:49 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 Tue Aug 15 21:51:58 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
-	* Install.in (guess_system): Match OSF/1 v3.x as the same as 
-        v2.x--v2.x binaries are upward compatible.
+	* Install.in (guess_system): Match OSF/1 v3.x as the same as
+	v2.x--v2.x binaries are upward compatible.
 
 Tue Aug 15 21:46:54 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
@@ -319,8 +355,8 @@ Tue Aug  8 13:11:56 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 Thu Jun  8 00:42:56 1995  Angela Marie Thomas  <angela@cirdan.cygnus.com>
 
-        * subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just
-        in case they are symlinks.
+	* subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just
+	in case they are symlinks.
 
 Tue Apr 18 14:23:10 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
@@ -335,7 +371,7 @@ Tue Apr 18 14:23:10 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 	* Install.in (do_mkdir): New function.
 
 	* Install.in: Added support for --with and --without options.
-	  Changed so that tape commands are not run when extracting 
+	  Changed so that tape commands are not run when extracting
 	  from a file.
 	  (do_mt): Changed to take only one argument.
 
@@ -343,7 +379,7 @@ Wed Mar 29 11:16:38 1995  Jason Molenda (crash@phydeaux.cygnus.com)
 
 	* Install.in: catch UNAME==alpha-dec-osf2.x and correct entry for
 	alpha-dec-osf1.x
-	
+
 Fri Jan 27 12:04:29 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
 	* subst-strings (mips-sgi-irix5): New entry in table.
@@ -388,8 +424,8 @@ Thu Apr 28 14:42:22 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
 
 Tue Apr 26 17:18:03 1994  Jason Molenda (crash@sendai.cygnus.com)
 
-        * Install.in:  fixincludes output is actually put in fixincludes.log,
-        but echo'ed messages claim it is fixinc.log.  This is the same
+	* Install.in:  fixincludes output is actually put in fixincludes.log,
+	but echo'ed messages claim it is fixinc.log.  This is the same
 	messages as I logged in March 4 1994, but for some reason we found
 	the change hadn't been done.  I'll have to dig through the logs
 	and find out what I really did do that day. :)
@@ -449,21 +485,21 @@ Wed Mar 23 23:38:24 1994  Jason Molenda  (crash@sendai.cygnus.com)
 
 Wed Mar 23 13:42:48 1994  Jason Molenda  (crash@sendai.cygnus.com)
 
-        * Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick
-        up native tools even if the user doesn't have them in his
-        path.
+	* Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick
+	up native tools even if the user doesn't have them in his
+	path.
 
-        * Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''.
+	* Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''.
 
 Tue Mar 15 22:09:20 1994  Jason Molenda  (crash@sendai.cygnus.com)
-        
-        * Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware,
-        added switch statement to detect if system is Unixunaware.
+
+	* Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware,
+	added switch statement to detect if system is Unixunaware.
 
 Fri Mar  4 12:10:30 1994  Jason Molenda (crash@sendai.cygnus.com)
 
-        * Install.in:  fixincludes output is actually put in fixincludes.log,
-        but echo'ed messages claim it is fixinc.log.
+	* Install.in:  fixincludes output is actually put in fixincludes.log,
+	but echo'ed messages claim it is fixinc.log.
 
 Wed Nov  3 02:58:02 1993  Jeffrey Osier  (jeffrey@thepub.cygnus.com)
 
@@ -494,9 +530,9 @@ Thu Jun 10 16:01:25 1993  Jeffrey Osier  (jeffrey@cygnus.com)
 
 Wed Jun  9 19:23:59 1993  Jeffrey Osier  (jeffrey@rtl.cygnus.com)
 
-        * install-texi.in:        added conditionals (nearly complete)
-                                  cleaned up
-                                  added support for other releases (not done)
+	* install-texi.in:	added conditionals (nearly complete)
+				  cleaned up
+				  added support for other releases (not done)
 
 Wed Jun  9 15:53:58 1993  Jim Kingdon  (kingdon@cygnus.com)
 
@@ -511,7 +547,7 @@ Fri Jun  4 17:09:56 1993  Jeffrey Osier  (jeffrey@cygnus.com)
 
 Thu Jun  3 00:37:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
-	* Install.in: pull COPYING and COPYING.LIB off of the tape 
+	* Install.in: pull COPYING and COPYING.LIB off of the tape
 
 Tue Jun  1 16:52:08 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
diff --git a/contrib/binutils/etc/Makefile.in b/contrib/binutils/etc/Makefile.in
index 63f7738..7d0607d 100644
--- a/contrib/binutils/etc/Makefile.in
+++ b/contrib/binutils/etc/Makefile.in
@@ -25,7 +25,10 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
+datarootdir = @datarootdir@
+docdir = @docdir@
 infodir = @infodir@
+htmldir = @htmldir@
 
 SHELL = /bin/sh
 
@@ -39,7 +42,10 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
 TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \
 	then echo ../texinfo/util/texi2dvi; \
 	else echo texi2dvi; fi`
-TEXI2HTML = texi2html
+TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
+	then echo "../texinfo/makeinfo/makeinfo --html"; \
+	else echo "makeinfo --html"; fi`
+
 DVIPS = dvips
 
 # Where to find texinfo.tex to format documentation with TeX.
@@ -50,10 +56,9 @@ TEXIDIR = $(srcdir)/../texinfo
 
 INFOFILES = standards.info configure.info
 DVIFILES = standards.dvi configure.dvi
+HTMLFILES = standards.html configure.html
 
-all:
-
-# We want install to imply install-info as per GNU standards.
+all: info
 install: install-info
 
 uninstall:
@@ -84,6 +89,32 @@ install-info: info
 	  done; \
 	fi
 
+html:
+	for f in $(HTMLFILES); do \
+	  if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \
+	    if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \
+	      true; \
+	    else \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	done
+
+install-html: html
+	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(htmldir)
+	if test ! -f standards.html; then cd $(srcdir); fi; \
+	if test -f standards.html; then \
+	  for i in standards.html*; do \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
+	  done; \
+	fi
+	if test ! -f configure.html; then cd $(srcdir); fi; \
+	if test -f configure.html; then \
+	  for i in configure.html*; do \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i; \
+	  done; \
+	fi
+
 dvi:
 	for f in $(DVIFILES); do \
 	  if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \
@@ -98,6 +129,9 @@ dvi:
 standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
 	$(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi
 
+standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
+	$(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi
+
 standards.dvi: $(srcdir)/standards.texi
 	TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi
 
@@ -133,12 +167,15 @@ configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein
 	rm -f configdev.eps configbuild.eps
 
 configure.html: $(srcdir)/configure.texi
-	$(TEXI2HTML) -split_chapter $(srcdir)/configure.texi
+	cp $(srcdir)/configdev.jin configdev.jpg
+	cp $(srcdir)/configbuild.jin configbuild.jpg
+	$(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi
 
 clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
-	rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps
+	rm -f configdev.txt configbuild.txt 
+	rm -f configdev.eps configbuild.eps
 	rm -f configdev.jpg configbuild.jpg
 
 mostlyclean: clean
@@ -147,6 +184,7 @@ distclean:   clean
 	rm -f Makefile config.status config.cache
 
 maintainer-clean realclean:   distclean
+	rm -f *.html*
 	rm -f *.info*
 
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)