From 25bcc51d8f60fcd875d25877ea5caeaeab49681d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 7 Sep 1999 03:28:54 +0000 Subject: [PATCH] 1999-09-06 Donn Terry * internal.h (DTYPE): Define. * pe.h (struct external_PEI_filehdr): Rename from external_PE_filehdr. Define even if COFF_IMAGE_WITH_PE is not defined. --- include/coff/ChangeLog | 7 +++++++ include/coff/internal.h | 1 + include/coff/pe.h | 15 +++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog index 659dcdc520a..d946c772255 100644 --- a/include/coff/ChangeLog +++ b/include/coff/ChangeLog @@ -1,3 +1,10 @@ +1999-09-06 Donn Terry + + * internal.h (DTYPE): Define. + * pe.h (struct external_PEI_filehdr): Rename from + external_PE_filehdr. Define even if COFF_IMAGE_WITH_PE is not + defined. + 1999-07-17 Nick Clifton * arm.h (F_SOFT_FLOAT): Rename from F_SOFTFLOAT. diff --git a/include/coff/internal.h b/include/coff/internal.h index b01730eadcc..e0f5067d960 100644 --- a/include/coff/internal.h +++ b/include/coff/internal.h @@ -421,6 +421,7 @@ struct internal_syment #define DT_ARY (3) /* array */ #define BTYPE(x) ((x) & N_BTMASK) +#define DTYPE(x) (((x) & N_TMASK) >> N_BTSHFT) #define ISPTR(x) \ (((unsigned long) (x) & N_TMASK) == ((unsigned long) DT_PTR << N_BTSHFT)) diff --git a/include/coff/pe.h b/include/coff/pe.h index 7e676a50882..7ea1f6cc3a0 100644 --- a/include/coff/pe.h +++ b/include/coff/pe.h @@ -76,12 +76,7 @@ #undef FILNMLEN #define FILNMLEN 18 /* # characters in a file name */ - -#ifdef COFF_IMAGE_WITH_PE -/* The filehdr is only weired in images */ - -#undef FILHDR -struct external_PE_filehdr +struct external_PEI_filehdr { /* DOS header fields */ char e_magic[2]; /* Magic number, 0x5a4d */ @@ -119,12 +114,16 @@ struct external_PE_filehdr }; +#ifdef COFF_IMAGE_WITH_PE + +/* The filehdr is only weird in images */ -#define FILHDR struct external_PE_filehdr +#undef FILHDR +#define FILHDR struct external_PEI_filehdr #undef FILHSZ #define FILHSZ 152 -#endif +#endif /* COFF_IMAGE_WITH_PE */ typedef struct { -- 2.30.2