Update N_FN value to 0x1F. Add comments about N_EXT bits.

diff --git a/gas/a.out.gnu.h b/gas/a.out.gnu.h
index 3833d7162b2edf6a557d47b679b6c536987babb3..9ce531d9f55a4ace546d0f220d2e67b5592cc940 100755 (executable)
--- a/gas/a.out.gnu.h
+++ b/gas/a.out.gnu.h
@@ -169,9 +169,12 @@ struct nlist {
 #define N_TEXT 4
 #define N_DATA 6
 #define N_BSS 8
-#define N_FN 0xe
 #define        N_COMM  0x12            /* common (visible in shared lib commons) */
+#define N_FN 0x1F              /* File name of a .o file */
 
+/* Note: N_EXT can only usefully be OR-ed with N_UNDF, N_ABS, N_TEXT,
+   N_DATA, or N_BSS.  When the low-order bit of other types is set,
+   (e.g. N_WARNING versus N_FN), they are two different types.  */
 #define N_EXT 1
 #define N_TYPE 036
 #define N_STAB 0340

diff --git a/include/aout64.h b/include/aout64.h
index 9edb7d35ab33741bd0a1cd72db811b18ceb5bb8b..e25770d496405090a591caa2b795113758ab880f 100755 (executable)
--- a/include/aout64.h
+++ b/include/aout64.h
@@ -175,8 +175,11 @@ struct internal_nlist {
 #define N_TEXT         4
 #define N_DATA         6
 #define N_BSS  8
-#define N_FN   0x0e
 #define        N_COMM  0x12    /* Common symbol (visible after shared lib dynlink) */
+#define N_FN   0x1f    /* File name of .o file */
+/* Note: N_EXT can only usefully be OR-ed with N_UNDF, N_ABS, N_TEXT,
+   N_DATA, or N_BSS.  When the low-order bit of other types is set,
+   (e.g. N_WARNING versus N_FN), they are two different types.  */
 #define N_EXT  1
 #define N_TYPE  0x1e
 #define N_STAB         0xe0

diff --git a/include/stab.def b/include/stab.def
index 8c5e5fe97b84d86ad76b2a2bca03636d06410103..005dd75bdcda090ac521b183ef3a8d207069715f 100755 (executable)
--- a/include/stab.def
+++ b/include/stab.def
@@ -171,11 +171,20 @@ __define_stab (N_LENG, 0xfe, "LENG")
                        STAB MATRIX
        _________________________________________________
        | 00 - 1F are not dbx stab symbols              |
-       | Entries with bit 01 set are external symbols. |
+       | In most cases, the low bit is the EXTernal bit|
+
        | 00 UNDEF  | 02 ABS    | 04 TEXT   | 06 DATA   |
-       | 08 BSS    | 0A INDR   | 0C        | 0E FN     |
+       | 01  |EXT  | 03  |EXT  | 05  |EXT  | 07  |EXT  |
+
+       | 08 BSS    | 0A INDR   | 0C        | 0E        |
+       | 09  |EXT  | 0B        | 0D        | 0F        |
+
        | 10        | 12 COMM   | 14 SETA   | 16 SETT   |
+       | 11        | 13        | 15        | 17        |
+
        | 18 SETD   | 1A SETB   | 1C SETV   | 1E WARNING|
+       | 19        | 1B        | 1D        | 1F FN     |
+
        |_______________________________________________|
        | Debug entries with bit 01 set are unused.     |
        | 20 GSYM   | 22 FNAME  | 24 FUN    | 26 STSYM  |