texinfo.patch 9.4 KB

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