From 39836432f8cf5a210f3ec4d577f7b4cadcf283ac Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 14 Sep 1994 00:51:33 +0000 Subject: [PATCH] * som.h (som_symbol_type): Delete unused a.out-related fields. * som.c (bfd_section_from_som_symbol): Use bfd_abs_section_ptr instead of &bfd_abs_section. --- bfd/ChangeLog | 5 +++++ bfd/som.c | 5 ++--- bfd/som.h | 7 +++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4f1234ef1b..66e81c5189 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ Tue Sep 13 17:57:00 1994 Jeff Law (law@snake.cs.utah.edu) + * som.h (som_symbol_type): Delete unused a.out-related fields. + + * som.c (bfd_section_from_som_symbol): Use bfd_abs_section_ptr + instead of &bfd_abs_section. + * som.c (som_object_setup): Handle exec_entry and exec_flags being switched in executables created by the OSF1 linker. (som_write_fixups): Handle R_EXIT just like the R_{F,L,R}SEL diff --git a/bfd/som.c b/bfd/som.c index cea677bc43..3e0fbad778 100644 --- a/bfd/som.c +++ b/bfd/som.c @@ -2310,7 +2310,6 @@ som_prep_for_fixups (abfd, syms, num_syms) } } - /* Now sort the symbols. */ qsort (syms, num_syms, sizeof (asymbol *), compare_syms); /* Compute the symbol indexes, they will be needed by the relocation @@ -3678,7 +3677,7 @@ bfd_section_from_som_symbol (abfd, symbol) /* Could be a symbol from an external library (such as an OMOS shared library). Don't abort. */ - return &bfd_abs_section; + return bfd_abs_section_ptr; } else @@ -3696,7 +3695,7 @@ bfd_section_from_som_symbol (abfd, symbol) /* Could be a symbol from an external library (such as an OMOS shared library). Don't abort. */ - return &bfd_abs_section; + return bfd_abs_section_ptr; } } diff --git a/bfd/som.h b/bfd/som.h index 4dbf7fedc1..06f68e0f3b 100644 --- a/bfd/som.h +++ b/bfd/som.h @@ -45,9 +45,6 @@ typedef struct som_symbol { asymbol symbol; - short desc; - char other; - unsigned char type; unsigned int som_type; /* Structured like the ELF tc_data union. Allows more code sharing @@ -106,6 +103,7 @@ struct somdata struct header *file_hdr; struct copyright_aux_hdr *copyright_aux_hdr; struct user_string_aux_hdr *version_aux_hdr; + struct som_exec_auxhdr *exec_hdr; /* Pointers to a saved copy of the symbol and string tables. These need not be copied for objcopy or strip to work. */ @@ -174,6 +172,7 @@ struct som_section_data_struct #define somdata(bfd) ((bfd)->tdata.som_data->a) #define obj_som_exec_data(bfd) (somdata(bfd).exec_data) #define obj_som_file_hdr(bfd) (somdata(bfd).file_hdr) +#define obj_som_exec_hdr(bfd) (somdata(bfd).exec_hdr) #define obj_som_copyright_hdr(bfd) (somdata(bfd).copyright_aux_hdr) #define obj_som_version_hdr(bfd) (somdata(bfd).version_aux_hdr) #define obj_som_symtab(bfd) (somdata(bfd).symtab) @@ -203,7 +202,7 @@ struct som_section_data_struct #define R_HPPA_GOTOFF R_DP_RELATIVE #define R_HPPA_ENTRY R_ENTRY #define R_HPPA_EXIT R_EXIT -#define R_COMPLEX R_COMP1 +#define R_HPPA_COMPLEX R_COMP1 /* Exported functions, mostly for use by GAS. */ boolean bfd_som_set_section_attributes PARAMS ((asection *, int, int,