summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2013-07-09 07:29:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 22:19:43 (GMT)
commit70ca9ff6422a03c26cfa78e76f6334bcf3fe47ec (patch)
treeaaeafac219a5b66168bc599d938c560f087f589a
parentab265960877d35193afadc42b2524ae66b786788 (diff)
downloadpoky-danny.tar.gz
binutils: fix build with recent texinfo (5.1)danny
(From OE-Core rev: d6c69df33e5b447eb01ee7fca921b94c3a853203) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.22.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils/texinfo.patch294
2 files changed, 295 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.22.inc b/meta/recipes-devtools/binutils/binutils-2.22.inc
index 9697242..d0415d4 100644
--- a/meta/recipes-devtools/binutils/binutils-2.22.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.22.inc
@@ -45,6 +45,7 @@ SRC_URI = "\
45 file://0144-timer.cc-include-unistd.h.patch \ 45 file://0144-timer.cc-include-unistd.h.patch \
46 file://0166-2012-04-27-Doug-Kwan-dougkwan-google.com.patch \ 46 file://0166-2012-04-27-Doug-Kwan-dougkwan-google.com.patch \
47 file://0182-PR-ld-13991.patch \ 47 file://0182-PR-ld-13991.patch \
48 file://texinfo.patch \
48 " 49 "
49 50
50SRC_URI[md5sum] = "ee0f10756c84979622b992a4a61ea3f5" 51SRC_URI[md5sum] = "ee0f10756c84979622b992a4a61ea3f5"
diff --git a/meta/recipes-devtools/binutils/binutils/texinfo.patch b/meta/recipes-devtools/binutils/binutils/texinfo.patch
new file mode 100644
index 0000000..4613fdd
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/texinfo.patch
@@ -0,0 +1,294 @@
1From: Alberto Garcia <agarcia@igalia.com>
2Bug-Debian: http://bugs.debian.org/704586
3Description: Fix FTBFS with texinfo 5
4 This patch combines changes from the following commits from the
5 upstream git repository: baf8679, 935f854, f0fa19a and 2cfdb6d, by
6 Nick Clifton and Andreas Schwab.
7
8Upstream-Status: Backport
9
10Index: binutils-2.22/ld/ld.texinfo
11===================================================================
12--- binutils-2.22.orig/ld/ld.texinfo
13+++ binutils-2.22/ld/ld.texinfo
14@@ -7778,7 +7778,7 @@ If you have more than one @code{SECT} st
15 @printindex cp
16
17 @tex
18-% I think something like @colophon should be in texinfo. In the
19+% I think something like @@colophon should be in texinfo. In the
20 % meantime:
21 \long\def\colophon{\hbox to0pt{}\vfill
22 \centerline{The body of this manual is set in}
23@@ -7789,7 +7789,7 @@ If you have more than one @code{SECT} st
24 \centerline{{\sl\fontname\tensl\/}}
25 \centerline{are used for emphasis.}\vfill}
26 \page\colophon
27-% Blame: doc@cygnus.com, 28mar91.
28+% Blame: doc@@cygnus.com, 28mar91.
29 @end tex
30
31 @bye
32Index: binutils-2.22/gas/doc/c-arc.texi
33===================================================================
34--- binutils-2.22.orig/gas/doc/c-arc.texi
35+++ binutils-2.22/gas/doc/c-arc.texi
36@@ -220,7 +220,7 @@ The extension instructions are not macro
37 encodings for use of these instructions according to the specification
38 by the user. The parameters are:
39
40-@table @bullet
41+@itemize @bullet
42 @item @var{name}
43 Name of the extension instruction
44
45@@ -279,7 +279,7 @@ code were: inst 0,r1,r2. You use OP1_IM
46 with SYNTAX_20P.
47
48 @end itemize
49-@end table
50+@end itemize
51
52 For example, defining 64-bit multiplier with immediate operands:
53
54Index: binutils-2.22/gas/doc/c-arm.texi
55===================================================================
56--- binutils-2.22.orig/gas/doc/c-arm.texi
57+++ binutils-2.22/gas/doc/c-arm.texi
58@@ -380,7 +380,7 @@ ARM and THUMB instructions had their own
59 @code{unified} syntax, which can be selected via the @code{.syntax}
60 directive, and has the following main features:
61
62-@table @bullet
63+@itemize @bullet
64 @item
65 Immediate operands do not require a @code{#} prefix.
66
67@@ -405,7 +405,7 @@ The @code{.N} and @code{.W} suffixes are
68 @item
69 All instructions set the flags if and only if they have an @code{s}
70 affix.
71-@end table
72+@end itemize
73
74 @node ARM-Chars
75 @subsection Special Characters
76@@ -441,28 +441,6 @@ Either @samp{#} or @samp{$} can be used
77 @cindex register names, ARM
78 *TODO* Explain about ARM register naming, and the predefined names.
79
80-@node ARM-Neon-Alignment
81-@subsection NEON Alignment Specifiers
82-
83-@cindex alignment for NEON instructions
84-Some NEON load/store instructions allow an optional address
85-alignment qualifier.
86-The ARM documentation specifies that this is indicated by
87-@samp{@@ @var{align}}. However GAS already interprets
88-the @samp{@@} character as a "line comment" start,
89-so @samp{: @var{align}} is used instead. For example:
90-
91-@smallexample
92- vld1.8 @{q0@}, [r0, :128]
93-@end smallexample
94-
95-@node ARM Floating Point
96-@section Floating Point
97-
98-@cindex floating point, ARM (@sc{ieee})
99-@cindex ARM floating point (@sc{ieee})
100-The ARM family uses @sc{ieee} floating-point numbers.
101-
102 @node ARM-Relocations
103 @subsection ARM relocation generation
104
105@@ -507,6 +485,28 @@ respectively. For example to load the 3
106 MOVT r0, #:upper16:foo
107 @end smallexample
108
109+@node ARM-Neon-Alignment
110+@subsection NEON Alignment Specifiers
111+
112+@cindex alignment for NEON instructions
113+Some NEON load/store instructions allow an optional address
114+alignment qualifier.
115+The ARM documentation specifies that this is indicated by
116+@samp{@@ @var{align}}. However GAS already interprets
117+the @samp{@@} character as a "line comment" start,
118+so @samp{: @var{align}} is used instead. For example:
119+
120+@smallexample
121+ vld1.8 @{q0@}, [r0, :128]
122+@end smallexample
123+
124+@node ARM Floating Point
125+@section Floating Point
126+
127+@cindex floating point, ARM (@sc{ieee})
128+@cindex ARM floating point (@sc{ieee})
129+The ARM family uses @sc{ieee} floating-point numbers.
130+
131 @node ARM Directives
132 @section ARM Machine Directives
133
134Index: binutils-2.22/gas/doc/c-mips.texi
135===================================================================
136--- binutils-2.22.orig/gas/doc/c-mips.texi
137+++ binutils-2.22/gas/doc/c-mips.texi
138@@ -234,7 +234,7 @@ the @samp{mad} and @samp{madu} instructi
139 instructions around accesses to the @samp{HI} and @samp{LO} registers.
140 @samp{-no-m4650} turns off this option.
141
142-@itemx -m3900
143+@item -m3900
144 @itemx -no-m3900
145 @itemx -m4100
146 @itemx -no-m4100
147Index: binutils-2.22/gas/doc/c-score.texi
148===================================================================
149--- binutils-2.22.orig/gas/doc/c-score.texi
150+++ binutils-2.22/gas/doc/c-score.texi
151@@ -37,7 +37,7 @@ implicitly with the @code{gp} register.
152 @item -EB
153 Assemble code for a big-endian cpu
154
155-@itemx -EL
156+@item -EL
157 Assemble code for a little-endian cpu
158
159 @item -FIXDD
160@@ -49,13 +49,13 @@ Assemble code for no warning message for
161 @item -SCORE5
162 Assemble code for target is SCORE5
163
164-@itemx -SCORE5U
165+@item -SCORE5U
166 Assemble code for target is SCORE5U
167
168-@itemx -SCORE7
169+@item -SCORE7
170 Assemble code for target is SCORE7, this is default setting
171
172-@itemx -SCORE3
173+@item -SCORE3
174 Assemble code for target is SCORE3
175
176 @item -march=score7
177Index: binutils-2.22/gas/doc/c-tic54x.texi
178===================================================================
179--- binutils-2.22.orig/gas/doc/c-tic54x.texi
180+++ binutils-2.22/gas/doc/c-tic54x.texi
181@@ -109,7 +109,7 @@ In this example, x is replaced with SYM2
182 is replaced with x. At this point, x has already been encountered
183 and the substitution stops.
184
185-@smallexample @code
186+@smallexample
187 .asg "x",SYM1
188 .asg "SYM1",SYM2
189 .asg "SYM2",x
190@@ -126,14 +126,14 @@ Substitution may be forced in situations
191 ambiguous by placing colons on either side of the subsym. The following
192 code:
193
194-@smallexample @code
195+@smallexample
196 .eval "10",x
197 LAB:X: add #x, a
198 @end smallexample
199
200 When assembled becomes:
201
202-@smallexample @code
203+@smallexample
204 LAB10 add #10, a
205 @end smallexample
206
207@@ -309,7 +309,7 @@ The @code{LDX} pseudo-op is provided for
208 of a label or address. For example, if an address @code{_label} resides
209 in extended program memory, the value of @code{_label} may be loaded as
210 follows:
211-@smallexample @code
212+@smallexample
213 ldx #_label,16,a ; loads extended bits of _label
214 or #_label,a ; loads lower 16 bits of _label
215 bacc a ; full address is in accumulator A
216@@ -345,7 +345,7 @@ Assign @var{name} the string @var{string
217 performed on @var{string} before assignment.
218
219 @cindex @code{eval} directive, TIC54X
220-@itemx .eval @var{string}, @var{name}
221+@item .eval @var{string}, @var{name}
222 Evaluate the contents of string @var{string} and assign the result as a
223 string to the subsym @var{name}. String replacement is performed on
224 @var{string} before assignment.
225Index: binutils-2.22/bfd/doc/bfd.texinfo
226===================================================================
227--- binutils-2.22.orig/bfd/doc/bfd.texinfo
228+++ binutils-2.22/bfd/doc/bfd.texinfo
229@@ -322,7 +322,7 @@ All of BFD lives in one directory.
230 @printindex cp
231
232 @tex
233-% I think something like @colophon should be in texinfo. In the
234+% I think something like @@colophon should be in texinfo. In the
235 % meantime:
236 \long\def\colophon{\hbox to0pt{}\vfill
237 \centerline{The body of this manual is set in}
238@@ -333,7 +333,7 @@ All of BFD lives in one directory.
239 \centerline{{\sl\fontname\tensl\/}}
240 \centerline{are used for emphasis.}\vfill}
241 \page\colophon
242-% Blame: doc@cygnus.com, 28mar91.
243+% Blame: doc@@cygnus.com, 28mar91.
244 @end tex
245
246 @bye
247Index: binutils-2.22/binutils/doc/binutils.texi
248===================================================================
249--- binutils-2.22.orig/binutils/doc/binutils.texi
250+++ binutils-2.22/binutils/doc/binutils.texi
251@@ -4269,7 +4269,7 @@ equivalent. At least one of the @option{
252
253 @table @env
254
255-@itemx --input-mach=@var{machine}
256+@item --input-mach=@var{machine}
257 Set the matching input ELF machine type to @var{machine}. If
258 @option{--input-mach} isn't specified, it will match any ELF
259 machine types.
260@@ -4277,21 +4277,21 @@ machine types.
261 The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
262 @var{x86-64}.
263
264-@itemx --output-mach=@var{machine}
265+@item --output-mach=@var{machine}
266 Change the ELF machine type in the ELF header to @var{machine}. The
267 supported ELF machine types are the same as @option{--input-mach}.
268
269-@itemx --input-type=@var{type}
270+@item --input-type=@var{type}
271 Set the matching input ELF file type to @var{type}. If
272 @option{--input-type} isn't specified, it will match any ELF file types.
273
274 The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
275
276-@itemx --output-type=@var{type}
277+@item --output-type=@var{type}
278 Change the ELF file type in the ELF header to @var{type}. The
279 supported ELF types are the same as @option{--input-type}.
280
281-@itemx --input-osabi=@var{osabi}
282+@item --input-osabi=@var{osabi}
283 Set the matching input ELF file OSABI to @var{osabi}. If
284 @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
285
286@@ -4301,7 +4301,7 @@ The supported ELF OSABIs are, @var{none}
287 @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
288 @var{NSK}, @var{AROS} and @var{FenixOS}.
289
290-@itemx --output-osabi=@var{osabi}
291+@item --output-osabi=@var{osabi}
292 Change the ELF OSABI in the ELF header to @var{osabi}. The
293 supported ELF OSABI are the same as @option{--input-osabi}.
294