X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Firix-core.c;h=e4fb622d69497f959a552955f5f531b28f4277cd;hb=d1fbc3ba09fb2e79acf633df29ccbe9285624419;hp=41899ac53d6b156bce078c8f2e5851b3bf34db28;hpb=cd123cb70c845b890eed231a84e6e84c92c2ef92;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/irix-core.c b/bfd/irix-core.c index 41899ac53d..e4fb622d69 100644 --- a/bfd/irix-core.c +++ b/bfd/irix-core.c @@ -1,6 +1,5 @@ /* BFD back-end for Irix core files. - Copyright 1993, 1994, 1996, 1999, 2001, 2002, 2004, 2006, 2007 - Free Software Foundation, Inc. + Copyright (C) 1993-2021 Free Software Foundation, Inc. Written by Stu Grossman, Cygnus Support. Converted to back-end form by Ian Lance Taylor, Cygnus Support @@ -44,6 +43,7 @@ struct sgi_core_struct #define core_command(bfd) (core_hdr(bfd)->cmd) #define irix_core_core_file_matches_executable_p generic_core_file_matches_executable_p +#define irix_core_core_file_pid _bfd_nocore_core_file_pid static asection *make_bfd_asection (bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr); @@ -61,7 +61,7 @@ do_sections64 (bfd *abfd, struct coreout *coreout) for (i = 0; i < coreout->c_nvmap; i++) { - val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd); + val = bfd_bread (&vmap, (bfd_size_type) sizeof vmap, abfd); if (val != sizeof vmap) break; @@ -109,7 +109,7 @@ do_sections (bfd *abfd, struct coreout *coreout) for (i = 0; i < coreout->c_nvmap; i++) { - val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd); + val = bfd_bread (&vmap, (bfd_size_type) sizeof vmap, abfd); if (val != sizeof vmap) break; @@ -146,11 +146,11 @@ do_sections (bfd *abfd, struct coreout *coreout) static asection * make_bfd_asection (bfd *abfd, - const char *name, - flagword flags, - bfd_size_type size, - bfd_vma vma, - file_ptr filepos) + const char *name, + flagword flags, + bfd_size_type size, + bfd_vma vma, + file_ptr filepos) { asection *asect; @@ -166,15 +166,15 @@ make_bfd_asection (bfd *abfd, return asect; } -static const bfd_target * +static bfd_cleanup irix_core_core_file_p (bfd *abfd) { int val; struct coreout coreout; struct idesc *idg, *idf, *ids; - bfd_size_type amt; + size_t amt; - val = bfd_bread ((PTR) &coreout, (bfd_size_type) sizeof coreout, abfd); + val = bfd_bread (&coreout, (bfd_size_type) sizeof coreout, abfd); if (val != sizeof coreout) { if (bfd_get_error () != bfd_error_system_call) @@ -244,7 +244,7 @@ irix_core_core_file_p (bfd *abfd) /* OK, we believe you. You're a core file (sure, sure). */ bfd_default_set_arch_mach (abfd, bfd_arch_mips, 0); - return abfd->xvec; + return _bfd_no_cleanup; fail: bfd_release (abfd, core_hdr (abfd)); @@ -279,7 +279,7 @@ swap_abort(void) #define NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort) #define NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort) -const bfd_target irix_core_vec = +const bfd_target core_irix_vec = { "irix-core", bfd_target_unknown_flavour, @@ -289,9 +289,11 @@ const bfd_target irix_core_vec = HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED), (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* symbol prefix */ + 0, /* symbol prefix */ ' ', /* ar_pad_char */ 16, /* ar_max_namelen */ + 0, /* match_priority */ + TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols. */ NO_GET64, NO_GETS64, NO_PUT64, /* 64 bit data */ NO_GET, NO_GETS, NO_PUT, /* 32 bit data */ NO_GET, NO_GETS, NO_PUT, /* 16 bit data */ @@ -306,12 +308,16 @@ const bfd_target irix_core_vec = irix_core_core_file_p /* a core file */ }, { /* bfd_set_format */ - bfd_false, bfd_false, - bfd_false, bfd_false + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error }, { /* bfd_write_contents */ - bfd_false, bfd_false, - bfd_false, bfd_false + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error, + _bfd_bool_bfd_false_error }, BFD_JUMP_TABLE_GENERIC (_bfd_generic), @@ -326,7 +332,7 @@ const bfd_target irix_core_vec = NULL, - (PTR) 0 /* backend_data */ + NULL /* backend_data */ }; #endif /* IRIX_CORE */