Merge with latest FSF versions.

3 files changed, 116 insertions, 89 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
new file mode 100644
index 0000000..7cc52dc
--- /dev/null
+++ b/include/ChangeLog
@@ -0,0 +1,26 @@
+Tue Sep  3 06:29:20 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	Merge with latest FSF versions of these files.
+
+	* stab.gnu.h:  Add LAST_UNUSED_STAB_CODE.
+	* stab.def:  Update to GPL2.  Move N_WARNING out, since not a
+	debug symbol.  Change comments, and reorder table to numeric
+	order.  Update final table comment.
+	(N_DSLINE, N_BSLINE):  Renumber from 0x66 and 0x68, to 0x46 and 0x48.
+
+Fri Aug 23 01:54:23 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* a.out.gnu.h, a.out.sun4.h:  Make SEGMENT_SIZE able to depend
+	on the particular a.out being examined.
+	* a.out.sun4.h:  Define segment sizes for Sun-3's and Sun-4's.
+	* FIXME:  a.out.gnu.h is almost obsolete.
+	* FIXME:  a.out.sun4.h should be renamed a.out.sun.h now.
+
+Wed Aug 21 20:32:13 1991  John Gilmore  (gnu at cygint.cygnus.com)
+
+	* Start a ChangeLog for the includes directory.
+
+	* a.out.gnu.h (N_FN):  Fix value -- was 15, should be 0x1E.
+	* stab.def:  Update allocation table in comments at end,
+	to reflect reality as I know it.
+
diff --git a/include/stab.def b/include/stab.def
index 44f55a1..4bd4c88 100755
--- a/include/stab.def
+++ b/include/stab.def
@@ -1,29 +1,20 @@
 /* Table of DBX symbol codes for the GNU system.
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1991 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
-   any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-
-/* Warning symbol. The text gives a warning message, the next symbol
-   in the table will be undefined. When the symbol is referenced, the
-   message is printed.
-*/
-
-__define_stab (N_WARNING, 0x1e,"WARNING")
-
 /* Global variable.  Only the name is significant.
    To find the address, look in the corresponding external symbol.  */
 __define_stab (N_GSYM, 0x20, "GSYM")
@@ -37,7 +28,8 @@ __define_stab (N_FNAME, 0x22, "FNAME")
    and DBX seems not to miss it.  */
 __define_stab (N_FUN, 0x24, "FUN")
 
-/* Data-segment variable with internal linkage.  Value is its address.  */
+/* Data-segment variable with internal linkage.  Value is its address.
+   "Static Sym".  */
 __define_stab (N_STSYM, 0x26, "STSYM")
 
 /* BSS-segment variable with internal linkage.  Value is its address.  */
@@ -47,6 +39,10 @@ __define_stab (N_LCSYM, 0x28, "LCSYM")
    This is not used in C.  */
 __define_stab (N_MAIN, 0x2a, "MAIN")
 
+/* Global symbol in Pascal.
+   Supposedly the value is its line number; I'm skeptical.  */
+__define_stab (N_PC, 0x30, "PC")
+
 /* Number of symbols:  0, files,,funcs,lines according to Ultrix V4.0. */
 __define_stab (N_NSYMS, 0x32, "NSYMS")
 
@@ -56,101 +52,100 @@ __define_stab (N_NOMAP, 0x34, "NOMAP")
 /* Register variable.  Value is number of register.  */
 __define_stab (N_RSYM, 0x40, "RSYM")
 
+/* Modula-2 compilation unit.  Can someone say what info it contains?  */
+__define_stab (N_M2C, 0x42, "M2C")
+
+/* Line number in text segment.  Desc is the line number;
+   value is corresponding address.  */
+__define_stab (N_SLINE, 0x44, "SLINE")
+
+/* Similar, for data segment.  */
+__define_stab (N_DSLINE, 0x46, "DSLINE")
+
+/* Similar, for bss segment.  */
+__define_stab (N_BSLINE, 0x48, "BSLINE")
+
+/* Sun's source-code browser stabs.  ?? Don't know what the fields are.
+   Supposedly the field is "path to associated .cb file".  THIS VALUE
+   OVERLAPS WITH N_BSLINE!  */
+__define_stab (N_BROWS, 0x48, "BROWS")
+
+/* THE FOLLOWING TWO STAB VALUES CONFLICT.  Happily, one is for Modula-2
+   and one is for C++.   Still,... */
+/* GNU C++ exception variable.  Name is variable name.  */
+__define_stab (N_EHDECL, 0x50, "EHDECL")
+/* Modula2 info "for imc":  name,,0,0,0  according to Ultrix V4.0.  */
+__define_stab (N_MOD2, 0x50, "MOD2")
+
+/* GNU C++ `catch' clause.  Value is its address.  Desc is nonzero if
+   this entry is immediately followed by a CAUGHT stab saying what exception
+   was caught.  Multiple CAUGHT stabs means that multiple exceptions
+   can be caught here.  If Desc is 0, it means all exceptions are caught
+   here.  */
+__define_stab (N_CATCH, 0x54, "CATCH")
+
 /* Structure or union element.  Value is offset in the structure.  */
 __define_stab (N_SSYM, 0x60, "SSYM")
 
-/* Parameter variable.  Value is offset from argument pointer.
-   (On most machines the argument pointer is the same as the frame pointer.  */
-__define_stab (N_PSYM, 0xa0, "PSYM")
+/* Name of main source file.
+   Value is starting text address of the compilation.  */
+__define_stab (N_SO, 0x64, "SO")
 
 /* Automatic variable in the stack.  Value is offset from frame pointer.
    Also used for type descriptions.  */
 __define_stab (N_LSYM, 0x80, "LSYM")
 
-/* Alternate entry point.  Value is its address.  */
-__define_stab (N_ENTRY, 0xa4, "ENTRY")
-
-/* Name of main source file.
-   Value is starting text address of the compilation.  */
-__define_stab (N_SO, 0x64, "SO")
+/* Beginning of an include file.  Only Sun uses this.
+   In an object file, only the name is significant.
+   The Sun linker puts data into some of the other fields.  */
+__define_stab (N_BINCL, 0x82, "BINCL")
 
 /* Name of sub-source file (#include file).
    Value is starting text address of the compilation.  */
 __define_stab (N_SOL, 0x84, "SOL")
 
-/* Line number in text segment.  Desc is the line number;
-   value is corresponding address.  */
-__define_stab (N_SLINE, 0x44, "SLINE")
-/* Similar, for data segment.  */
-/* FIXME-NOW: gas's copy had 0x46 here. */
-__define_stab (N_DSLINE, 0x66, "DSLINE")
-/* Similar, for bss segment.  */
-/* FIXME-NOW: gas's copy had 0x48 here. */
-__define_stab (N_BSLINE, 0x68, "BSLINE")
+/* Parameter variable.  Value is offset from argument pointer.
+   (On most machines the argument pointer is the same as the frame pointer.  */
+__define_stab (N_PSYM, 0xa0, "PSYM")
 
-/* Beginning of an include file.  Only Sun uses this.
-   In an object file, only the name is significant.
-   The Sun linker puts data into some of the other fields.  */
-__define_stab (N_BINCL, 0x82, "BINCL")
 /* End of an include file.  No name.
-   These two act as brackets around the file's output.
+   This and N_BINCL act as brackets around the file's output.
    In an object file, there is no significant data in this entry.
    The Sun linker puts data into some of the fields.  */
 __define_stab (N_EINCL, 0xa2, "EINCL")
-/* Place holder for deleted include file.
-   This appears only in output from the Sun linker.  */
-__define_stab (N_EXCL, 0xc2, "EXCL")
+
+/* Alternate entry point.  Value is its address.  */
+__define_stab (N_ENTRY, 0xa4, "ENTRY")
 
 /* Beginning of lexical block.
    The desc is the nesting level in lexical blocks.
    The value is the address of the start of the text for the block.
    The variables declared inside the block *precede* the N_LBRAC symbol.  */
 __define_stab (N_LBRAC, 0xc0, "LBRAC")
+
+/* Place holder for deleted include file.  Replaces a N_BINCL and everything
+   up to the corresponding N_EINCL.  The Sun linker generates these when
+   it finds multiple identical copies of the symbols from an include file.
+   This appears only in output from the Sun linker.  */
+__define_stab (N_EXCL, 0xc2, "EXCL")
+
+/* Modula-2 scope information.  Can someone say what info it contains?  */
+__define_stab (N_SCOPE, 0xc4, "SCOPE")
+
 /* End of a lexical block.  Desc matches the N_LBRAC's desc.
    The value is the address of the end of the text for the block.  */
 __define_stab (N_RBRAC, 0xe0, "RBRAC")
 
 /* Begin named common block.  Only the name is significant.  */
 __define_stab (N_BCOMM, 0xe2, "BCOMM")
-/* Begin named common block.  Only the name is significant
+
+/* End named common block.  Only the name is significant
    (and it should match the N_BCOMM).  */
 __define_stab (N_ECOMM, 0xe4, "ECOMM")
+
 /* End common (local name): value is address.
    I'm not sure how this is used.  */
 __define_stab (N_ECOML, 0xe8, "ECOML")
-/* Second symbol entry containing a length-value for the preceding entry.
-   The value is the length.  */
-__define_stab (N_LENG, 0xfe, "LENG")
-
-/* Global symbol in Pascal.
-   Supposedly the value is its line number; I'm skeptical.  */
-__define_stab (N_PC, 0x30, "PC")
-
-/* Modula-2 compilation unit.  Can someone say what info it contains?  */
-__define_stab (N_M2C, 0x42, "M2C")
-/* Modula-2 scope information.  Can someone say what info it contains?  */
-__define_stab (N_SCOPE, 0xc4, "SCOPE")
-
-/* Sun's source-code browser stabs.  ?? Don't know what the fields are.
-   Supposedly the field is "path to associated .cb file".  */
-__define_stab (N_BROWS, 0x48, "BROWS")
-
-/* GNU C++ exception stabs.  */
-
-/* THE FOLLOWING TWO STAB VALUES CONFLICT.  Happily, one is for Modula-2
-   and one is for C++.   Still,... */
-/* GNU C++ exception variable.  Name is variable name.  */
-__define_stab (N_EHDECL, 0x50, "EHDECL")
-/* Modula2 info "for imc":  name,,0,0,0  according to Ultrix V4.0.  */
-__define_stab (N_MOD2, 0x50, "MOD2")
-
-
-/* GNU C++ `catch' clause.  Value is its address.  Desc is nonzero if
-   this entry is immediately followed by a CAUGHT stab saying what exception
-   was caught.  Multiple CAUGHT stabs means that multiple exceptions
-   can be caught here.  If Desc is 0, it means all exceptions are caught
-   here.  */
-__define_stab (N_CATCH, 0x54, "CATCH")
 
 /* These STAB's are used on Gould systems for Non-Base register symbols
    or something like that.  FIXME.  I have assigned the values at random
@@ -160,6 +155,10 @@ __define_stab (N_NBDATA, 0xF2, "NBDATA")
 __define_stab (N_NBBSS,  0xF4, "NBBSS")
 __define_stab (N_NBSTS,  0xF6, "NBSTS")
 __define_stab (N_NBLCS,  0xF8, "NBLCS")
+
+/* Second symbol entry containing a length-value for the preceding entry.
+   The value is the length.  */
+__define_stab (N_LENG, 0xfe, "LENG")
 
 /* The above information, in matrix format.
 
@@ -168,21 +167,21 @@ __define_stab (N_NBLCS,  0xF8, "NBLCS")
 	| 00 - 1F are not dbx stab symbols		|
 	| Entries with bit 01 set are external symbols. |
 	| 00 UNDEF  | 02 ABS	| 04 TEXT   | 06 DATA	|
-	| 08 BSS    | 0A INDR*	| 0C 	    | 0E 	|
+	| 08 BSS    | 0A INDR*	| 0C 	    | 0E FN	|
 	| 10 	    | 12 	| 14 SETA   | 16 SETT	|
-	| 18 SETD   | 1A SETB	| 1C SETV   | 1E FN	|
+	| 18 SETD   | 1A SETB	| 1C SETV   | 1E WARNING|
 	|_______________________________________________|
 	| Debug entries with bit 01 set are unused.	|
 	| 20 GSYM   | 22 FNAME	| 24 FUN    | 26 STSYM	|
 	| 28 LCSYM  | 2A MAIN	| 2C	    | 2E	|
 	| 30 PC	    | 32 NSYMS	| 34 NOMAP  | 36	|
 	| 38	    | 3A	| 3C	    | 3E	|
-	| 40 RSYM   | 42 M2C	| 44 SLINE  | 46        |
-	| 48 BROWS  | 4A	| 4C        | 4E	|
+	| 40 RSYM   | 42 M2C	| 44 SLINE  | 46 DSLINE |
+	| 48 BSLINE*| 4A	| 4C        | 4E	|
 	| 50 EHDECL*| 52	| 54 CATCH  | 56        |
 	| 58        | 5A        | 5C        | 5E	|
-	| 60 SSYM   | 62	| 64 SO	    | 66 DSLINE	|
-	| 68 BSLINE | 6A	| 6C	    | 6E	|
+	| 60 SSYM   | 62	| 64 SO	    | 66 	|
+	| 68 	    | 6A	| 6C	    | 6E	|
 	| 70	    | 72	| 74	    | 76	|
 	| 78	    | 7A	| 7C	    | 7E	|
 	| 80 LSYM   | 82 BINCL	| 84 SOL    | 86	|
@@ -203,5 +202,6 @@ __define_stab (N_NBLCS,  0xF8, "NBLCS")
 	| F8	    | FA	| FC	    | FE LENG	|
 	+-----------------------------------------------+
  * 50 EHDECL is also MOD2.
+ * 48 BSLINE is also BROWS.
  * 0A INDR is also COMM (supposedly only used internally to unix ld?)
-*/
+ */
diff --git a/include/stab.gnu.h b/include/stab.gnu.h
index 77f2d41..80bd594 100755
--- a/include/stab.gnu.h
+++ b/include/stab.gnu.h
@@ -9,6 +9,7 @@
 enum __stab_debug_code
 {
 #include "stab.def"
+LAST_UNUSED_STAB_CODE
 };
 
 #undef __define_stab