From 054862cfa129057778d433aeb8e0598c82456513 Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Thu, 12 Sep 1991 21:27:49 +0000 Subject: [PATCH] * internalcoff.h (SYMNMLEN, FILNMLEN, DIMNUM): Define these for internalcoff, separately from the various external coff's. * amdcoff.h, bcs88kcoff.h, i386coff.h, intel-coff.h, m68kcoff.h, m88k-bcs.h: Prefix SYMNMLEN, FILNMLEN, and DIMNUM with E_'s for the external struct definitions. * ecoff.h: Remove these #define's, kludge no longer needed. --- include/bcs88kcoff.h | 12 ++++++------ include/coff-a29k.h | 12 ++++++------ include/coff-i386.h | 12 ++++++------ include/coff-i960.h | 12 ++++++------ include/coff-m68k.h | 12 ++++++------ include/coff-m88k.h | 12 ++++++------ include/coff-mips.h | 8 -------- include/internalcoff.h | 4 ++++ include/sysdep.h | 5 +++++ 9 files changed, 45 insertions(+), 44 deletions(-) diff --git a/include/bcs88kcoff.h b/include/bcs88kcoff.h index 8710f43bf29..bc8df2d8dbe 100755 --- a/include/bcs88kcoff.h +++ b/include/bcs88kcoff.h @@ -151,14 +151,14 @@ struct lineno{ /********************** SYMBOLS **********************/ -#define SYMNMLEN 8 /* # characters in a symbol name */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ struct syment { union { - char _n_name[SYMNMLEN]; /* old COFF version */ + char _n_name[E_SYMNMLEN]; /* old COFF version */ struct { long _n_zeroes; /* new == 0 */ long _n_offset; /* offset into string table */ @@ -245,14 +245,14 @@ union auxent { long x_endndx; /* entry ndx past block end */ } x_fcn; struct { /* if ISARY, up to 4 dimen. */ - unsigned short x_dimen[DIMNUM]; + unsigned short x_dimen[E_DIMNUM]; } x_ary; } x_fcnary; unsigned short x_tvndx; /* tv index */ } x_sym; union { - char x_fname[FILNMLEN]; + char x_fname[E_FILNMLEN]; struct { long x_zeroes; long x_offset; diff --git a/include/coff-a29k.h b/include/coff-a29k.h index 35e4dddb10f..46c131dbd31 100755 --- a/include/coff-a29k.h +++ b/include/coff-a29k.h @@ -203,12 +203,12 @@ struct external_lineno ** Symbol entry declaration and related definitions */ -#define SYMNMLEN 8 /* Number of characters in a symbol name */ +#define E_SYMNMLEN 8 /* Number of characters in a symbol name */ struct external_syment { union { - char e_name[SYMNMLEN]; + char e_name[E_SYMNMLEN]; struct { char e_zeroes[4]; char e_offset[4]; @@ -253,8 +253,8 @@ struct external_syment ** definitions. */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ union external_auxent { struct { @@ -272,14 +272,14 @@ union external_auxent { char x_endndx[4]; /* entry ndx past block end */ } x_fcn; struct { /* if ISARY, up to 4 dimen. */ - char x_dimen[DIMNUM][2]; + char x_dimen[E_DIMNUM][2]; } x_ary; } x_fcnary; char x_tvndx[2]; /* tv index */ } x_sym; union { - char x_fname[FILNMLEN]; + char x_fname[E_FILNMLEN]; struct { char x_zeroes[4]; char x_offset[4]; diff --git a/include/coff-i386.h b/include/coff-i386.h index cc79c56d562..a3e902e3bc3 100755 --- a/include/coff-i386.h +++ b/include/coff-i386.h @@ -161,14 +161,14 @@ struct external_lineno { /********************** SYMBOLS **********************/ -#define SYMNMLEN 8 /* # characters in a symbol name */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ struct external_syment { union { - char e_name[SYMNMLEN]; + char e_name[E_SYMNMLEN]; struct { char e_zeroes[4]; char e_offset[4]; @@ -256,14 +256,14 @@ union external_auxent { char x_endndx[4]; /* entry ndx past block end */ } x_fcn; struct { /* if ISARY, up to 4 dimen. */ - char x_dimen[DIMNUM][2]; + char x_dimen[E_DIMNUM][2]; } x_ary; } x_fcnary; char x_tvndx[2]; /* tv index */ } x_sym; union { - char x_fname[FILNMLEN]; + char x_fname[E_FILNMLEN]; struct { char x_zeroes[4]; char x_offset[4]; diff --git a/include/coff-i960.h b/include/coff-i960.h index 073d6463cc7..871aa87c750 100755 --- a/include/coff-i960.h +++ b/include/coff-i960.h @@ -130,14 +130,14 @@ struct external_lineno { /********************** SYMBOLS **********************/ -#define SYMNMLEN 8 /* # characters in a symbol name */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ struct external_syment { union { - char e_name[SYMNMLEN]; + char e_name[E_SYMNMLEN]; struct { char e_zeroes[4]; char e_offset[4]; @@ -176,14 +176,14 @@ union external_auxent { char x_endndx[4]; /* entry ndx past block end */ } x_fcn; struct { /* if ISARY, up to 4 dimen. */ - char x_dimen[DIMNUM][2]; + char x_dimen[E_DIMNUM][2]; } x_ary; } x_fcnary; char x_tvndx[2]; /* tv index */ } x_sym; union { - char x_fname[FILNMLEN]; + char x_fname[E_FILNMLEN]; struct { char x_zeroes[4]; char x_offset[4]; diff --git a/include/coff-m68k.h b/include/coff-m68k.h index f6a58f7fb4f..fb215bbaab6 100755 --- a/include/coff-m68k.h +++ b/include/coff-m68k.h @@ -102,14 +102,14 @@ struct external_lineno { /********************** SYMBOLS **********************/ -#define SYMNMLEN 8 /* # characters in a symbol name */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ struct external_syment { union { - char e_name[SYMNMLEN]; + char e_name[E_SYMNMLEN]; struct { char e_zeroes[4]; char e_offset[4]; @@ -146,14 +146,14 @@ union external_auxent { char x_endndx[4]; /* entry ndx past block end */ } x_fcn; struct { /* if ISARY, up to 4 dimen. */ - char x_dimen[DIMNUM][2]; + char x_dimen[E_DIMNUM][2]; } x_ary; } x_fcnary; char x_tvndx[2]; /* tv index */ } x_sym; union { - char x_fname[FILNMLEN]; + char x_fname[E_FILNMLEN]; struct { char x_zeroes[4]; char x_offset[4]; diff --git a/include/coff-m88k.h b/include/coff-m88k.h index 8b11470e3b0..7f46b2897d0 100755 --- a/include/coff-m88k.h +++ b/include/coff-m88k.h @@ -130,14 +130,14 @@ struct external_lineno{ /********************** SYMBOLS **********************/ -#define SYMNMLEN 8 /* # characters in a symbol name */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ +#define E_SYMNMLEN 8 /* # characters in a symbol name */ +#define E_FILNMLEN 14 /* # characters in a file name */ +#define E_DIMNUM 4 /* # array dimensions in auxiliary entry */ struct external_syment { union { - char e_name[SYMNMLEN]; + char e_name[E_SYMNMLEN]; struct { char e_zeroes[4]; char e_offset[4]; @@ -180,7 +180,7 @@ union external_auxent { /* 12 */ union { struct { /* if ISARY, up to 4 dimen. */ - char x_dimen[DIMNUM][2]; + char x_dimen[E_DIMNUM][2]; } x_ary; } x_fcnary; /* 20 */ @@ -188,7 +188,7 @@ union external_auxent { } x_sym; union { - char x_fname[FILNMLEN]; + char x_fname[E_FILNMLEN]; struct { char x_zeroes[4]; char x_offset[4]; diff --git a/include/coff-mips.h b/include/coff-mips.h index 2222e5627b2..2faad589eb1 100755 --- a/include/coff-mips.h +++ b/include/coff-mips.h @@ -93,11 +93,3 @@ struct external_reloc { #define RELOC struct external_reloc #define RELSZ 12 - -/* These definitions are not used in ecoff, but they make it possible - for ecoff to use the same "internalcoff.h" as other coff implementations. */ - -#define SYMNMLEN 8 /* # characters in a symbol name */ -#define FILNMLEN 14 /* # characters in a file name */ -#define DIMNUM 4 /* # array dimensions in auxiliary entry */ - diff --git a/include/internalcoff.h b/include/internalcoff.h index a3dfa608fdd..1cfd0d4a012 100755 --- a/include/internalcoff.h +++ b/include/internalcoff.h @@ -151,6 +151,10 @@ struct internal_lineno { /********************** SYMBOLS **********************/ +#define SYMNMLEN 8 /* # characters in a symbol name */ +#define FILNMLEN 14 /* # characters in a file name */ +#define DIMNUM 4 /* # array dimensions in auxiliary entry */ + struct internal_syment { union { char _n_name[SYMNMLEN]; /* old COFF version */ diff --git a/include/sysdep.h b/include/sysdep.h index fd05606adc9..66288c0ca49 100755 --- a/include/sysdep.h +++ b/include/sysdep.h @@ -53,6 +53,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define IRIX3_SYS 17 /* SGI Iris running irix 3.x */ #define IRIX4_SYS 18 /* SGI Iris running cypress */ #define HP300BSD_SYS 19 +#define ULTRA3_SYM1_SYS 20 /* NYU Ultracomputer */ #include @@ -146,4 +147,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include #endif +#if HOST_SYS == ULTRA3_SYM1_SYS +#include +#endif + #endif /* _SYSDEP_H */ -- 2.30.2