From 6886ab292b8d2f4d666d39366c3da9a0cc8aa79a Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 5 Oct 1998 02:42:05 +0000 Subject: [PATCH] * cpu-hppa.c (bfd_hppa20_arch): Define. Link it into the bfd_hppa_arch structure. * som.c (CPU_PA_RISC2_0): Define. (_PA_RISC2_0_ID): Likewise. (som_finish_writing): Use CPU_PA_RISC2_0 for the system_id as needed. PA2.0 infrastructure. --- bfd/ChangeLog | 8 ++++++++ bfd/som.c | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 07289f35a76..0001aac760b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +Sun Oct 4 20:38:29 1998 Jeffrey A Law (law@cygnus.com) + + * cpu-hppa.c (bfd_hppa20_arch): Define. Link it into the bfd_hppa_arch + structure. + * som.c (CPU_PA_RISC2_0): Define. + (_PA_RISC2_0_ID): Likewise. + (som_finish_writing): Use CPU_PA_RISC2_0 for the system_id as needed. + Sun Oct 4 21:19:09 1998 Ian Lance Taylor * elf32-i386.c (elf_i386_info_to_howto_rel): Handle vtable relocs diff --git a/bfd/som.c b/bfd/som.c index 4cc78c73e45..ffdbf69886d 100644 --- a/bfd/som.c +++ b/bfd/som.c @@ -30,13 +30,10 @@ #include "libbfd.h" #include "som.h" -#include -#include #include #include #include #include -#include #include /* Magic not defined in standard HP-UX header files until 8.0 */ @@ -49,6 +46,10 @@ #define CPU_PA_RISC1_1 0x210 #endif /* CPU_PA_RISC1_1 */ +#ifndef CPU_PA_RISC2_0 +#define CPU_PA_RISC2_0 0x214 +#endif /* CPU_PA_RISC2_0 */ + #ifndef _PA_RISC1_0_ID #define _PA_RISC1_0_ID CPU_PA_RISC1_0 #endif /* _PA_RISC1_0_ID */ @@ -57,6 +58,10 @@ #define _PA_RISC1_1_ID CPU_PA_RISC1_1 #endif /* _PA_RISC1_1_ID */ +#ifndef _PA_RISC2_0_ID +#define _PA_RISC2_0_ID CPU_PA_RISC2_0 +#endif /* _PA_RISC2_0_ID */ + #ifndef _PA_RISC_MAXID #define _PA_RISC_MAXID 0x2FF #endif /* _PA_RISC_MAXID */ @@ -3649,6 +3654,8 @@ som_finish_writing (abfd) BFD private data happens *after* section contents are set. */ if (abfd->flags & (EXEC_P | DYNAMIC)) obj_som_file_hdr(abfd)->system_id = obj_som_exec_data (abfd)->system_id; + else if (bfd_get_mach (abfd) == pa20) + obj_som_file_hdr(abfd)->system_id = CPU_PA_RISC2_0; else if (bfd_get_mach (abfd) == pa11) obj_som_file_hdr(abfd)->system_id = CPU_PA_RISC1_1; else @@ -5975,6 +5982,8 @@ som_bfd_link_split_section (abfd, sec) #define som_bfd_link_add_symbols _bfd_generic_link_add_symbols #define som_bfd_final_link _bfd_generic_final_link +#define som_bfd_gc_sections bfd_generic_gc_sections + const bfd_target som_vec = { -- 2.30.2