From 670387a18a22cf299c750186efe8ca24cebb7e05 Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 22 Feb 2002 04:18:42 +0000 Subject: Import of Binutils from the FSF 2.12 branch (pre-.0 release). These bits are taken from the FSF anoncvs repo on 21-Feburary-2002 20:15 PST. --- contrib/binutils/bfd/doc/ChangeLog | 38 +++++++--- contrib/binutils/bfd/doc/Makefile.am | 4 ++ contrib/binutils/bfd/doc/Makefile.in | 5 ++ contrib/binutils/bfd/doc/chew.c | 131 ++++++++++++++++++++++------------- contrib/binutils/bfd/doc/proto.str | 2 +- 5 files changed, 123 insertions(+), 57 deletions(-) (limited to 'contrib/binutils/bfd/doc') diff --git a/contrib/binutils/bfd/doc/ChangeLog b/contrib/binutils/bfd/doc/ChangeLog index 2f3db6f..3ddeee9 100644 --- a/contrib/binutils/bfd/doc/ChangeLog +++ b/contrib/binutils/bfd/doc/ChangeLog @@ -1,9 +1,26 @@ +2002-02-01 Alan Modra + + * chew.c (WORD): Eliminate. + +2002-01-31 Ivan Guzvinec + + * Makefile.in: Regenerate. + +2002-01-31 Alan Modra + + * chew.c (courierize): Don't modify @command params. + +2002-01-30 Nick Clifton + + * proto.str (ENUMDOC): Place two spaces between the end of + the text and the closing comment marker. + 2001-10-30 Hans-Peter Nilsson - * doc/bfdint.texi (BFD target vector miscellaneous): Add + * bfdint.texi (BFD target vector miscellaneous): Add bfd_target_mmo_flavour. - * doc/bfd.texinfo (BFD back ends): Add entry for mmo. - * doc/Makefile.am (DOCFILES): Add mmo.texi. + * bfd.texinfo (BFD back ends): Add entry for mmo. + * Makefile.am (DOCFILES): Add mmo.texi. (SRCDOC): Add mmo.c. (s-mmo, mmo.texi): New rules. @@ -16,6 +33,11 @@ * bfd.texinfo: Change footer to refer to FSF. Change subtitle to refer to original creation date. +2002-01-26 Hans-Peter Nilsson + + * Makefile.am (install): Depend on install-info. + * Makefile.in: Regenerate. + 2001-10-03 Alan Modra * Makefile.am (BFD_H_DEP): Add ../version.h. @@ -179,7 +201,7 @@ Tue Jul 22 14:44:00 1997 Robert Hoehne @@ -222,7 +244,7 @@ Tue Jan 30 14:10:46 1996 Ian Lance Taylor Fri Nov 3 14:46:48 1995 Fred Fish - * Makefile.in (SRCDOC, SRCPROT, core.texi, bfd.h): Use corefile.c, + * Makefile.in (SRCDOC, SRCPROT, core.texi, bfd.h): Use corefile.c, renamed from core.c. Wed Nov 1 14:28:23 1995 Manfred Hollstein KS/EF4A 60/1F/110 #40283 @@ -342,7 +364,7 @@ Thu Jun 24 13:48:13 1993 David J. Mackenzie (djm@thepub.cygnus.com) Mon Jun 14 12:07:07 1993 david d `zoo' zuhn (zoo at rtl.cygnus.com) - * Makefile.in (install-info): remove parentdir cruft, + * Makefile.in (install-info): remove parentdir cruft, Wed Jun 9 16:00:32 1993 Jim Kingdon (kingdon@cygnus.com) @@ -405,7 +427,7 @@ Thu Nov 5 03:13:55 1992 John Gilmore (gnu@cygnus.com) Cleanup: Replace all uses of EXFUN in the BFD sources, with PARAMS. - * chew.c (exfunstuff): Eliminate. + * chew.c (exfunstuff): Eliminate. (paramstuff): Replace exfunstuff with function to generate PARAMS. * proto.str: Use paramstuff rather than exfunstuff. @@ -420,7 +442,7 @@ Fri Jun 19 18:59:54 1992 John Gilmore (gnu at cygnus.com) Mon May 11 18:55:59 1992 John Gilmore (gnu at cygnus.com) * chew.c: exit() should be declared by config files, not by - portable source code. Its type could be int or void function. + portable source code. Its type could be int or void function. Mon May 4 13:45:57 1992 K. Richard Pixley (rich@rtl.cygnus.com) diff --git a/contrib/binutils/bfd/doc/Makefile.am b/contrib/binutils/bfd/doc/Makefile.am index 075c9f3..cbfd342 100644 --- a/contrib/binutils/bfd/doc/Makefile.am +++ b/contrib/binutils/bfd/doc/Makefile.am @@ -272,3 +272,7 @@ CLEANFILES = s-* *.p *.ip DISTCLEANFILES = bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log MAINTAINERCLEANFILES = $(DOCFILES) + +# We want install to imply install-info as per GNU standards, despite the +# cygnus option. +install: install-info diff --git a/contrib/binutils/bfd/doc/Makefile.in b/contrib/binutils/bfd/doc/Makefile.in index dc85d4b..e0ce81f 100644 --- a/contrib/binutils/bfd/doc/Makefile.in +++ b/contrib/binutils/bfd/doc/Makefile.in @@ -116,6 +116,7 @@ WIN32LIBADD = @WIN32LIBADD@ all_backends = @all_backends@ bfd_backends = @bfd_backends@ bfd_default_target_size = @bfd_default_target_size@ +bfd_libs = @bfd_libs@ bfd_machines = @bfd_machines@ bfd_version = @bfd_version@ bfd_version_date = @bfd_version_date@ @@ -631,6 +632,10 @@ bfd.h: $(BFD_H_DEP) echo "#endif" >> $@ echo "#endif" >> $@ +# We want install to imply install-info as per GNU standards, despite the +# cygnus option. +install: install-info + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/contrib/binutils/bfd/doc/chew.c b/contrib/binutils/bfd/doc/chew.c index 843e441..11554eb 100644 --- a/contrib/binutils/bfd/doc/chew.c +++ b/contrib/binutils/bfd/doc/chew.c @@ -1,5 +1,6 @@ /* chew - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001 + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, + 2002 Free Software Foundation, Inc. Contributed by steve chamberlain @cygnus @@ -289,8 +290,6 @@ struct dict_struct typedef struct dict_struct dict_type; -#define WORD(x) static void x() - static void die (msg) char *msg; @@ -362,7 +361,8 @@ exec (word) (*pc) (); } -WORD (call) +static void +call () { stinst_type *oldpc = pc; dict_type *e; @@ -371,7 +371,8 @@ WORD (call) pc = oldpc + 2; } -WORD (remchar) +static void +remchar () { if (tos->write_idx) tos->write_idx--; @@ -388,7 +389,8 @@ strip_trailing_newlines () pc++; } -WORD (push_number) +static void +push_number () { isp++; icheck_range (); @@ -397,7 +399,8 @@ WORD (push_number) pc++; } -WORD (push_text) +static void +push_text () { tos++; check_range (); @@ -551,7 +554,8 @@ paramstuff (void) /* turn {* and *} into comments */ -WORD (translatecomments) +static void +translatecomments () { unsigned int idx = 0; string_type out; @@ -587,7 +591,8 @@ WORD (translatecomments) /* turn everything not starting with a . into a comment */ -WORD (manglecomments) +static void +manglecomments () { unsigned int idx = 0; string_type out; @@ -665,7 +670,8 @@ outputdots (void) } /* Find lines starting with . and | and put example around them on tos */ -WORD (courierize) +static void +courierize () { string_type out; unsigned int idx = 0; @@ -686,37 +692,47 @@ WORD (courierize) while (at (tos, idx) && at (tos, idx) != '\n') { - if (at (tos, idx) == '{' && at (tos, idx + 1) == '*') + if (command > 1) + { + /* We are inside {} parameters of some command; + Just pass through until matching brace. */ + if (at (tos, idx) == '{') + ++command; + else if (at (tos, idx) == '}') + --command; + } + else if (command != 0) + { + if (at (tos, idx) == '{') + ++command; + else if (!islower ((unsigned char) at (tos, idx))) + --command; + } + else if (at (tos, idx) == '@' + && islower ((unsigned char) at (tos, idx + 1))) + { + ++command; + } + else if (at (tos, idx) == '{' && at (tos, idx + 1) == '*') { cattext (&out, "/*"); idx += 2; + continue; } else if (at (tos, idx) == '*' && at (tos, idx + 1) == '}') { cattext (&out, "*/"); idx += 2; + continue; } - else if (at (tos, idx) == '{' && !command) + else if (at (tos, idx) == '{' + || at (tos, idx) == '}') { - cattext (&out, "@{"); - idx++; - } - else if (at (tos, idx) == '}' && !command) - { - cattext (&out, "@}"); - idx++; - } - else - { - if (at (tos, idx) == '@') - command = 1; - else if (isspace ((unsigned char) at (tos, idx)) - || at (tos, idx) == '}') - command = 0; - catchar (&out, at (tos, idx)); - idx++; + catchar (&out, '@'); } + catchar (&out, at (tos, idx)); + idx++; } catchar (&out, '\n'); } @@ -741,7 +757,8 @@ WORD (courierize) on @itemize @bullet, and @items each of them. Then ends with @end itemize, inplace at TOS*/ -WORD (bulletize) +static void +bulletize () { unsigned int idx = 0; int on = 0; @@ -795,7 +812,8 @@ WORD (bulletize) /* Turn <> into @code{foo} in place at TOS*/ -WORD (do_fancy_stuff) +static void +do_fancy_stuff () { unsigned int idx = 0; string_type out; @@ -891,7 +909,8 @@ copy_past_newline (ptr, idx, dst) } -WORD (icopy_past_newline) +static void +icopy_past_newline () { tos++; check_range (); @@ -903,7 +922,8 @@ WORD (icopy_past_newline) /* indent Take the string at the top of the stack, do some prettying. */ -WORD (kill_bogus_lines) +static void +kill_bogus_lines () { int sl; @@ -989,7 +1009,8 @@ WORD (kill_bogus_lines) } -WORD (indent) +static void +indent () { string_type out; int tab = 0; @@ -1039,7 +1060,8 @@ WORD (indent) } -WORD (get_stuff_in_command) +static void +get_stuff_in_command () { tos++; check_range (); @@ -1054,7 +1076,8 @@ WORD (get_stuff_in_command) pc++; } -WORD (swap) +static void +swap () { string_type t; @@ -1064,7 +1087,8 @@ WORD (swap) pc++; } -WORD (other_dup) +static void +other_dup () { tos++; check_range (); @@ -1073,21 +1097,24 @@ WORD (other_dup) pc++; } -WORD (drop) +static void +drop () { tos--; check_range (); pc++; } -WORD (idrop) +static void +idrop () { isp--; icheck_range (); pc++; } -WORD (icatstr) +static void +icatstr () { tos--; check_range (); @@ -1096,7 +1123,8 @@ WORD (icatstr) pc++; } -WORD (skip_past_newline) +static void +skip_past_newline () { while (at (ptr, idx) && at (ptr, idx) != '\n') @@ -1105,7 +1133,8 @@ WORD (skip_past_newline) pc++; } -WORD (internalmode) +static void +internalmode () { internal_mode = *(isp); isp--; @@ -1113,7 +1142,8 @@ WORD (internalmode) pc++; } -WORD (maybecatstr) +static void +maybecatstr () { if (internal_wanted == internal_mode) { @@ -1390,19 +1420,22 @@ bang (void) pc++; } -WORD (atsign) +static void +atsign () { isp[0] = *(long *) (isp[0]); pc++; } -WORD (hello) +static void +hello () { printf ("hello\n"); pc++; } -WORD (stdout_) +static void +stdout_ () { isp++; icheck_range (); @@ -1410,7 +1443,8 @@ WORD (stdout_) pc++; } -WORD (stderr_) +static void +stderr_ () { isp++; icheck_range (); @@ -1418,7 +1452,8 @@ WORD (stderr_) pc++; } -WORD (print) +static void +print () { if (*isp == 1) write_buffer (tos, stdout); diff --git a/contrib/binutils/bfd/doc/proto.str b/contrib/binutils/bfd/doc/proto.str index 8431c16..702d9f5 100644 --- a/contrib/binutils/bfd/doc/proto.str +++ b/contrib/binutils/bfd/doc/proto.str @@ -114,7 +114,7 @@ skip_past_newline get_stuff_in_command strip_trailing_newlines - "\n{* " swap catstr " *}\n" catstr + "\n{* " swap catstr " *}\n" catstr translatecomments - discard it if we're doing internal mode "" swap 0 internalmode maybecatstr -- cgit v1.1