From 2a01c351e30b778e7011a7de741f81c708b71688 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 4 Oct 1995 20:25:21 +0000 Subject: [PATCH] NS32k changes from Ian Dall: * aoutx.h (MY_final_link_relocate, MY_relocate_contents): New macros. (aout_link_input_section_std, aout_link_input_section_ext, aout_link_reloc_link_order): Call them instead of _bfd_* versions. * aout-target.h (MY_exec_header_not_counted): New macro, defaults to zero. (backend_data): Use it instead of hardcoded zero. * aout-ns32k.c (CTOR_TABLE_RELOC_HOWTO): New macro. (MY_swap_std_reloc_out): Use udata.i for KEEPIT, don't call stoi. * ns32knetbsd.c: Include bfd.h. (MY_text_includes_header, MY_bfd_reloc_type_lookup): New macros. (MY_bfd_reloc_type_lookup): Declare function too. * pc532-mach.c (set_sizes): Don't declare. (MY_text_includes_header, MY_exec_header_not_counted): Define. (backend_data, MY_backend_data): Don't define. * config.bfd: Treat ns32k-pc532-ux* like ns32k-pc532-mach*, and ns32k-*-lites* like ns32k-*-netbsd*. * hosts/nbsd.h: Swap order of sys/vmparam.h and sys/param.h, to compile on lites. --- bfd/ChangeLog | 28 ++++++++++++++++++++++++++++ bfd/aout-target.h | 40 ++++++++++++++++++++++++++++++++++++---- bfd/config.bfd | 7 +++++-- bfd/hosts/nbsd.h | 2 +- 4 files changed, 70 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3bd8c920ca6..c11740c2908 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,31 @@ +Wed Oct 4 15:36:36 1995 Ken Raeburn + + NS32k changes from Ian Dall: + * aoutx.h (MY_final_link_relocate, MY_relocate_contents): New + macros. + (aout_link_input_section_std, aout_link_input_section_ext, + aout_link_reloc_link_order): Call them instead of _bfd_* + versions. + * aout-target.h (MY_exec_header_not_counted): New macro, defaults + to zero. + (backend_data): Use it instead of hardcoded zero. + + * aout-ns32k.c (CTOR_TABLE_RELOC_HOWTO): New macro. + (MY_swap_std_reloc_out): Use udata.i for KEEPIT, don't call stoi. + + * ns32knetbsd.c: Include bfd.h. + (MY_text_includes_header, MY_bfd_reloc_type_lookup): New macros. + (MY_bfd_reloc_type_lookup): Declare function too. + * pc532-mach.c (set_sizes): Don't declare. + (MY_text_includes_header, MY_exec_header_not_counted): Define. + (backend_data, MY_backend_data): Don't define. + + * config.bfd: Treat ns32k-pc532-ux* like ns32k-pc532-mach*, and + ns32k-*-lites* like ns32k-*-netbsd*. + + * hosts/nbsd.h: Swap order of sys/vmparam.h and sys/param.h, to + compile on lites. + Wed Oct 4 14:15:52 1995 Ian Lance Taylor * coffcode.h (coff_write_object_contents): Restore setting diff --git a/bfd/aout-target.h b/bfd/aout-target.h index 201fa1c33b6..6e0fccc6869 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -15,14 +15,14 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "aout/aout64.h" #include "aout/stab_gnu.h" #include "aout/ar.h" /*#include "libaout.h"*/ -extern CONST struct reloc_howto_struct * NAME(aout,reloc_type_lookup) (); +extern reloc_howto_type * NAME(aout,reloc_type_lookup) (); /* Set parameters about this a.out file that are machine-dependent. This routine is called from some_aout_object_p just before it returns. */ @@ -268,6 +268,9 @@ MY(set_sizes) (abfd) #ifndef MY_text_includes_header #define MY_text_includes_header 0 #endif +#ifndef MY_exec_header_not_counted +#define MY_exec_header_not_counted 0 +#endif #ifndef MY_add_dynamic_symbols #define MY_add_dynamic_symbols 0 #endif @@ -293,7 +296,7 @@ static CONST struct aout_backend_data MY(backend_data) = { MY_exec_hdr_flags, 0, /* text vma? */ MY_set_sizes, - 0, /* exec header is counted */ + MY_exec_header_not_counted, MY_add_dynamic_symbols, MY_add_one_symbol, MY_link_dynamic_object, @@ -355,6 +358,10 @@ MY_bfd_final_link (abfd, info) #ifndef MY_slurp_extended_name_table #define MY_slurp_extended_name_table _bfd_slurp_extended_name_table #endif +#ifndef MY_construct_extended_name_table +#define MY_construct_extended_name_table \ + _bfd_archive_bsd_construct_extended_name_table +#endif #ifndef MY_write_armap #define MY_write_armap bsd_write_armap #endif @@ -455,17 +462,43 @@ MY_bfd_final_link (abfd, info) #ifndef MY_bfd_make_debug_symbol #define MY_bfd_make_debug_symbol 0 #endif +#ifndef MY_read_minisymbols +#define MY_read_minisymbols NAME(aout,read_minisymbols) +#endif +#ifndef MY_minisymbol_to_symbol +#define MY_minisymbol_to_symbol NAME(aout,minisymbol_to_symbol) +#endif #ifndef MY_bfd_link_hash_table_create #define MY_bfd_link_hash_table_create NAME(aout,link_hash_table_create) #endif #ifndef MY_bfd_link_add_symbols #define MY_bfd_link_add_symbols NAME(aout,link_add_symbols) #endif +#ifndef MY_bfd_link_split_section +#define MY_bfd_link_split_section _bfd_generic_link_split_section +#endif + #ifndef MY_bfd_copy_private_bfd_data #define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data #endif +#ifndef MY_bfd_merge_private_bfd_data +#define MY_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data +#endif + +#ifndef MY_bfd_copy_private_symbol_data +#define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data +#endif + +#ifndef MY_bfd_print_private_bfd_data +#define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data +#endif + +#ifndef MY_bfd_set_private_flags +#define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags +#endif + #ifndef MY_bfd_is_local_label #define MY_bfd_is_local_label bfd_generic_is_local_label #endif @@ -524,7 +557,6 @@ const bfd_target MY(vec) = MY_symbol_leading_char, AR_PAD_CHAR, /* ar_pad_char */ 15, /* ar_max_namelen */ - 3, /* minimum alignment */ #ifdef TARGET_IS_BIG_ENDIAN_P bfd_getb64, bfd_getb_signed_64, bfd_putb64, bfd_getb32, bfd_getb_signed_32, bfd_putb32, diff --git a/bfd/config.bfd b/bfd/config.bfd index 5c506a957b2..ca7b244ef65 100755 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -337,11 +337,11 @@ case "${targ}" in targ_selvecs=bfd_elf32_littlemips_vec ;; - ns32k-pc532-mach*) + ns32k-pc532-mach* | ns32k-pc532-ux*) targ_defvec=pc532machaout_vec targ_underscore=yes ;; - ns32k-*-netbsd*) + ns32k-*-netbsd* | ns32k-*-lites*) targ_defvec=pc532netbsd_vec targ_underscore=yes ;; @@ -353,6 +353,9 @@ case "${targ}" in targ_defvec=bfd_elf32_powerpc_vec targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec" ;; + powerpc-*-macos* | powerpc-*-mpw*) + targ_defvec=pmac_xcoff_vec + ;; powerpc-*-netware*) targ_defvec=bfd_elf32_powerpc_vec targ_selvecs="nlm32_powerpc_vec rs6000coff_vec" diff --git a/bfd/hosts/nbsd.h b/bfd/hosts/nbsd.h index dda575709f4..938c62e25ec 100644 --- a/bfd/hosts/nbsd.h +++ b/bfd/hosts/nbsd.h @@ -1,7 +1,7 @@ /* Architecture independant NetBSD host support */ -#include #include +#include #include #define HOST_PAGE_SIZE NBPG -- 2.30.2