On Wed, Apr 03, 2013 at 12:34:05PM +0300, Alberto Garcia wrote:

> This seems to be the upstream bug report:

It turns out that there are more build problems related to texinfo
than the one that I already mentioned.

All of them have been fixed upstream in different patches (some of
them even reverting changes made by others) so I decided to create
a single patch combining all the necessary changes to make binutils
compile.

I tried this patch both with texinfo 4 and 5 and binutils builds fine
with both versions.

Berto
From: Alberto Garcia <agar...@igalia.com>
Bug-Debian: http://bugs.debian.org/704586
Description: Fix FTBFS with texinfo 5
 This patch combines changes from the following commits from the
 upstream git repository: baf8679, 935f854, f0fa19a and 2cfdb6d, by
 Nick Clifton and Andreas Schwab.

Index: binutils-2.23.2/ld/ld.texinfo
===================================================================
--- binutils-2.23.2.orig/ld/ld.texinfo	2013-04-13 01:43:52.518562215 +0300
+++ binutils-2.23.2/ld/ld.texinfo	2013-04-13 01:43:52.602562470 +0300
@@ -7864,7 +7864,7 @@
 @printindex cp
 
 @tex
-% I think something like @colophon should be in texinfo.  In the
+% 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}
@@ -7875,7 +7875,7 @@
 \centerline{{\sl\fontname\tensl\/}}
 \centerline{are used for emphasis.}\vfill}
 \page\colophon
-% Blame: d...@cygnus.com, 28mar91.
+% Blame: doc@@cygnus.com, 28mar91.
 @end tex
 
 @bye
Index: binutils-2.23.2/gas/doc/c-arc.texi
===================================================================
--- binutils-2.23.2.orig/gas/doc/c-arc.texi	2011-01-18 15:37:39.000000000 +0200
+++ binutils-2.23.2/gas/doc/c-arc.texi	2013-04-13 01:49:07.503520205 +0300
@@ -220,7 +220,7 @@
 encodings for use of these instructions according to the specification
 by the user.  The parameters are:
 
-@table @bullet
+@itemize @bullet
 @item @var{name}
 Name of the extension instruction 
 
@@ -279,7 +279,7 @@
 with SYNTAX_20P.
 
 @end itemize 
-@end table
+@end itemize
 
 For example, defining 64-bit multiplier with immediate operands:
 
Index: binutils-2.23.2/gas/doc/c-arm.texi
===================================================================
--- binutils-2.23.2.orig/gas/doc/c-arm.texi	2013-03-25 10:06:21.000000000 +0200
+++ binutils-2.23.2/gas/doc/c-arm.texi	2013-04-13 01:43:52.602562470 +0300
@@ -390,7 +390,7 @@
 @code{unified} syntax, which can be selected via the @code{.syntax}
 directive, and has the following main features:
 
-@table @bullet
+@itemize @bullet
 @item
 Immediate operands do not require a @code{#} prefix.
 
@@ -415,7 +415,7 @@
 @item
 All instructions set the flags if and only if they have an @code{s}
 affix.
-@end table
+@end itemize
 
 @node ARM-Chars
 @subsection Special Characters
@@ -451,28 +451,6 @@
 @cindex register names, ARM
 *TODO* Explain about ARM register naming, and the predefined names.
 
-@node ARM-Neon-Alignment
-@subsection NEON Alignment Specifiers
-
-@cindex alignment for NEON instructions
-Some NEON load/store instructions allow an optional address
-alignment qualifier.
-The ARM documentation specifies that this is indicated by
-@samp{@@ @var{align}}. However GAS already interprets
-the @samp{@@} character as a "line comment" start,
-so @samp{: @var{align}} is used instead.  For example:
-
-@smallexample
-        vld1.8 @{q0@}, [r0, :128]
-@end smallexample
-
-@node ARM Floating Point
-@section Floating Point
-
-@cindex floating point, ARM (@sc{ieee})
-@cindex ARM floating point (@sc{ieee})
-The ARM family uses @sc{ieee} floating-point numbers.
-
 @node ARM-Relocations
 @subsection ARM relocation generation
 
@@ -519,6 +497,28 @@
         MOVT r0, #:upper16:foo
 @end smallexample
 
+@node ARM-Neon-Alignment
+@subsection NEON Alignment Specifiers
+
+@cindex alignment for NEON instructions
+Some NEON load/store instructions allow an optional address
+alignment qualifier.
+The ARM documentation specifies that this is indicated by
+@samp{@@ @var{align}}. However GAS already interprets
+the @samp{@@} character as a "line comment" start,
+so @samp{: @var{align}} is used instead.  For example:
+
+@smallexample
+        vld1.8 @{q0@}, [r0, :128]
+@end smallexample
+
+@node ARM Floating Point
+@section Floating Point
+
+@cindex floating point, ARM (@sc{ieee})
+@cindex ARM floating point (@sc{ieee})
+The ARM family uses @sc{ieee} floating-point numbers.
+
 @node ARM Directives
 @section ARM Machine Directives
 
Index: binutils-2.23.2/gas/doc/c-mips.texi
===================================================================
--- binutils-2.23.2.orig/gas/doc/c-mips.texi	2012-09-04 17:16:07.000000000 +0300
+++ binutils-2.23.2/gas/doc/c-mips.texi	2013-04-13 01:43:52.602562470 +0300
@@ -234,7 +234,7 @@
 instructions around accesses to the @samp{HI} and @samp{LO} registers.
 @samp{-no-m4650} turns off this option.
 
-@itemx -m3900
+@item -m3900
 @itemx -no-m3900
 @itemx -m4100
 @itemx -no-m4100
Index: binutils-2.23.2/gas/doc/c-score.texi
===================================================================
--- binutils-2.23.2.orig/gas/doc/c-score.texi	2011-01-18 15:37:39.000000000 +0200
+++ binutils-2.23.2/gas/doc/c-score.texi	2013-04-13 01:43:52.602562470 +0300
@@ -37,7 +37,7 @@
 @item -EB
 Assemble code for a big-endian cpu
 
-@itemx -EL
+@item -EL
 Assemble code for a little-endian cpu
 
 @item -FIXDD 
@@ -49,13 +49,13 @@
 @item -SCORE5
 Assemble code for target is SCORE5
 
-@itemx -SCORE5U
+@item -SCORE5U
 Assemble code for target is SCORE5U
 
-@itemx -SCORE7
+@item -SCORE7
 Assemble code for target is SCORE7, this is default setting
 
-@itemx -SCORE3
+@item -SCORE3
 Assemble code for target is SCORE3
 
 @item -march=score7
Index: binutils-2.23.2/gas/doc/c-tic54x.texi
===================================================================
--- binutils-2.23.2.orig/gas/doc/c-tic54x.texi	2011-01-18 15:37:39.000000000 +0200
+++ binutils-2.23.2/gas/doc/c-tic54x.texi	2013-04-13 01:43:52.602562470 +0300
@@ -109,7 +109,7 @@
 is replaced with x.  At this point, x has already been encountered
 and the substitution stops.
 
-@smallexample @code
+@smallexample
  .asg   "x",SYM1 
  .asg   "SYM1",SYM2
  .asg   "SYM2",x
@@ -126,14 +126,14 @@
 ambiguous by placing colons on either side of the subsym.  The following
 code: 
 
-@smallexample @code
+@smallexample
  .eval  "10",x
 LAB:X:  add     #x, a
 @end smallexample
 
 When assembled becomes:
 
-@smallexample @code
+@smallexample
 LAB10  add     #10, a
 @end smallexample
 
@@ -309,7 +309,7 @@
 of a label or address.  For example, if an address @code{_label} resides
 in extended program memory, the value of @code{_label} may be loaded as
 follows:
-@smallexample @code
+@smallexample
  ldx     #_label,16,a    ; loads extended bits of _label
  or      #_label,a       ; loads lower 16 bits of _label
  bacc    a               ; full address is in accumulator A
@@ -345,7 +345,7 @@
 performed on @var{string} before assignment.
 
 @cindex @code{eval} directive, TIC54X
-@itemx .eval @var{string}, @var{name}
+@item .eval @var{string}, @var{name}
 Evaluate the contents of string @var{string} and assign the result as a
 string to the subsym @var{name}.  String replacement is performed on
 @var{string} before assignment. 

Reply via email to