[binutils] Fix errors reported by version 5.0 of texinfo when parsing linker documentation.

Thu Apr 25 16:04:44 UTC 2013

commit 767651388e47a7207018d8728c7f5e942b4a231c
Author: Nick Clifton <nickc at redhat.com>
Date:   Thu Apr 25 17:04:12 2013 +0100

     Fix errors reported by version 5.0 of texinfo when parsing linker documentation.

 binutils-2.23.2-ld-texinfo-fixes.patch |   87 ++++++++++++++++++++++++++++++++
 binutils.spec                          |   12 +++-
 2 files changed, 96 insertions(+), 3 deletions(-)
---

diff --git a/binutils-2.23.2-ld-texinfo-fixes.patch b/binutils-2.23.2-ld-texinfo-fixes.patch
new file mode 100644
index 0000000..3c9e458
--- /dev/null
+++ b/binutils-2.23.2-ld-texinfo-fixes.patch
@@ -0,0 +1,87 @@
+*** ../binutils-2.23.2.orig/ld/ld.texinfo	2013-04-25 16:44:07.538768821 +0100
+--- ld/ld.texinfo	2013-04-25 16:47:27.040774352 +0100
+*************** in the section entitled ``GNU Free Docum
+*** 142,153 ****
+  @ifset ARM
+  * ARM::				ld and the ARM family
+  @end ifset
+- @ifset HPPA
+- * HPPA ELF32::                  ld and HPPA 32-bit ELF
+- @end ifset
+  @ifset M68HC11
+  * M68HC11/68HC12::              ld and the Motorola 68HC11 and 68HC12 families
+  @end ifset
+  @ifset M68K
+  * M68K::                        ld and Motorola 68K family
+  @end ifset
+--- 142,153 ----
+  @ifset ARM
+  * ARM::				ld and the ARM family
+  @end ifset
+  @ifset M68HC11
+  * M68HC11/68HC12::              ld and the Motorola 68HC11 and 68HC12 families
+  @end ifset
++ @ifset HPPA
++ * HPPA ELF32::                  ld and HPPA 32-bit ELF
++ @end ifset
+  @ifset M68K
+  * M68K::                        ld and Motorola 68K family
+  @end ifset
+*************** functionality are not listed.
+*** 5998,6003 ****
+--- 5998,6006 ----
+  @ifset I960
+  * i960::                        @command{ld} and the Intel 960 family
+  @end ifset
++ @ifset M68HC11
++ * M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
++ @end ifset
+  @ifset ARM
+  * ARM::				@command{ld} and the ARM family
+  @end ifset
+*************** functionality are not listed.
+*** 6013,6021 ****
+  @ifset MSP430
+  * MSP430::			@command{ld} and MSP430
+  @end ifset
+- @ifset M68HC11
+- * M68HC11/68HC12::		@code{ld} and the Motorola 68HC11 and 68HC12 families
+- @end ifset
+  @ifset POWERPC
+  * PowerPC ELF32::		@command{ld} and PowerPC 32-bit ELF Support
+  @end ifset
+--- 6016,6021 ----
+*************** If you have more than one @code{SECT} st
+*** 7863,7869 ****
+  @printindex cp
+  
+  @tex
+! % I think something like @colophon should be in texinfo.  In the
+  % meantime:
+  \long\def\colophon{\hbox to0pt{}\vfill
+  \centerline{The body of this manual is set in}
+--- 7863,7869 ----
+  @printindex cp
+  
+  @tex
+! % I think something like @@colophon should be in texinfo.  In the
+  % meantime:
+  \long\def\colophon{\hbox to0pt{}\vfill
+  \centerline{The body of this manual is set in}
+*************** If you have more than one @code{SECT} st
+*** 7874,7880 ****
+  \centerline{{\sl\fontname\tensl\/}}
+  \centerline{are used for emphasis.}\vfill}
+  \page\colophon
+! % Blame: doc at cygnus.com, 28mar91.
+  @end tex
+  
+  @bye
+--- 7874,7880 ----
+  \centerline{{\sl\fontname\tensl\/}}
+  \centerline{are used for emphasis.}\vfill}
+  \page\colophon
+! % Blame: doc@@cygnus.com, 28mar91.
+  @end tex
+  
+  @bye
diff --git a/binutils.spec b/binutils.spec
index 04fa923..d108bd2 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -27,7 +27,7 @@ Name: %{?cross}binutils%{?_with_debug:-debug}
 # official binutils release happens (2.24.0) we will be able to restore
 # Version to an honest value and everything will be good again.
 Version: 2.23.88.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -56,12 +56,14 @@ Patch09: binutils-2.22.52.0.1-export-demangle.h.patch
 Patch10: binutils-2.22.52.0.4-no-config-h-check.patch
 # Fix the creation of the index table in 64-bit thin archives.
 Patch11: binutils-2.23.52.0.1-64-bit-thin-archives.patch
-# Fix errors reported by version 5.0 of texinfo
+# Fix errors reported by version 5.0 of texinfo in gas documentation
 Patch12: binutils-2.23.52.0.1-as-doc-texinfo-fixes.patch
 # Fix addr2line to use the dynamic symbol table if it could not find any ordinary symbols.
 Patch13: binutils-2.23.52.0.1-addr2line-dynsymtab.patch
 # Check regular references without non-GOT references when building shared libraries.
 Patch14: binutils-2.23.52.0.1-check-regular-ifunc-refs.patch
+# Fix errors reported by version 5.0 of texinfo in ld documentation
+Patch15: binutils-2.23.2-ld-texinfo-fixes.patch
 
 Provides: bundled(libiberty)
 
@@ -177,6 +179,7 @@ using libelf instead of BFD.
 %patch12 -p0 -b .gas-texinfo~
 %patch13 -p0 -b .addr2line~
 %patch14 -p0 -b .check-ifunc~
+%patch15 -p0 -b .ld-texinfo~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -476,6 +479,9 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Thu Apr 25 2013 Nick Clifton <nickc at redhat.com> - 2.23.88.0.1-2
+- Fix errors reported by version 5.0 of texinfo when parsing linker documentation.
+
 * Wed Apr 24 2013 Nick Clifton <nickc at redhat.com> - 2.23.88.0.1-1
 - Switch over to basing sources on the official FSF binutils releases.
 - Retire binutils-2.23.52.0.1-revert-pr15149.patch.
@@ -504,7 +510,7 @@ exit 0
 - Enable building of GOLD for the ARM.  (#908966)
 
 * Mon Mar 04 2013 Nick Clifton <nickc at redhat.com> - 2.23.52.0.1-3
-- Fix errors reported by version 5.0 of texinfo.
+- Fix errors reported by version 5.0 of texinfo when parsing assembler documentaion.
 
 * Fri Mar 01 2013 Nick Clifton <nickc at redhat.com> - 2.23.52.0.1-2
 - Fix the creation of index tables in 64-bit thin archives.  (#915411)
