X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fm68klinux.c;h=c3166d9133aae6a5a7348750c5692de19424127d;hb=5dc74d659d1c84b8ffdb4fcbf2ef73dc974d8a5b;hp=08b0010627c7c8ca04aea06f033bacf5b11c61a7;hpb=4a056f1472ee3ce5a2dde5df46a0faf6e794b114;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c index 08b0010627..c3166d9133 100644 --- a/bfd/m68klinux.c +++ b/bfd/m68klinux.c @@ -1,6 +1,5 @@ /* BFD back-end for linux flavored m68k a.out binaries. - Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1992-2017 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -40,7 +39,7 @@ /* Do not "beautify" the CONCAT* macro args. Traditional C will not remove whitespace added here, and thus will fail to concatenate the tokens. */ -#define MY(OP) CONCAT2 (m68klinux_,OP) +#define MY(OP) CONCAT2 (m68k_aout_linux_,OP) #define TARGETNAME "a.out-m68k-linux" extern const bfd_target MY(vec); @@ -50,15 +49,11 @@ extern const bfd_target MY(vec); becomes important. */ static void MY_final_link_callback - PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *)); -static bfd_boolean m68klinux_bfd_final_link - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean m68klinux_write_object_contents PARAMS ((bfd *)); + (bfd *, file_ptr *, file_ptr *, file_ptr *); static bfd_boolean -m68klinux_bfd_final_link (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +m68klinux_bfd_final_link (bfd *abfd, + struct bfd_link_info *info) { obj_aout_subformat (abfd) = q_magic_format; return NAME(aout,final_link) (abfd, info, MY_final_link_callback); @@ -69,17 +64,16 @@ m68klinux_bfd_final_link (abfd, info) /* Set the machine type correctly. */ static bfd_boolean -m68klinux_write_object_contents (abfd) - bfd *abfd; +m68klinux_write_object_contents (bfd *abfd) { struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); - N_SET_MACHTYPE (*execp, M_68020); + N_SET_MACHTYPE (execp, M_68020); obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; - WRITE_HEADERS(abfd, execp); + WRITE_HEADERS (abfd, execp); return TRUE; } @@ -170,31 +164,12 @@ struct linux_link_hash_table struct fixup *fixup_list; }; -static struct bfd_hash_entry *linux_link_hash_newfunc - PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); -static struct bfd_link_hash_table *linux_link_hash_table_create - PARAMS ((bfd *)); -static struct fixup *new_fixup - PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *, - bfd_vma, int)); -static bfd_boolean linux_link_create_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean linux_add_one_symbol - PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *, - bfd_vma, const char *, bfd_boolean, bfd_boolean, - struct bfd_link_hash_entry **)); -static bfd_boolean linux_tally_symbols - PARAMS ((struct linux_link_hash_entry *, PTR)); -static bfd_boolean linux_finish_dynamic_link - PARAMS ((bfd *, struct bfd_link_info *)); - /* Routine to create an entry in an Linux link hash table. */ static struct bfd_hash_entry * -linux_link_hash_newfunc (entry, table, string) - struct bfd_hash_entry *entry; - struct bfd_hash_table *table; - const char *string; +linux_link_hash_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) { struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry; @@ -221,13 +196,12 @@ linux_link_hash_newfunc (entry, table, string) /* Create a Linux link hash table. */ static struct bfd_link_hash_table * -linux_link_hash_table_create (abfd) - bfd *abfd; +linux_link_hash_table_create (bfd *abfd) { struct linux_link_hash_table *ret; bfd_size_type amt = sizeof (struct linux_link_hash_table); - ret = (struct linux_link_hash_table *) bfd_malloc (amt); + ret = (struct linux_link_hash_table *) bfd_zmalloc (amt); if (ret == (struct linux_link_hash_table *) NULL) { bfd_set_error (bfd_error_no_memory); @@ -241,11 +215,6 @@ linux_link_hash_table_create (abfd) return (struct bfd_link_hash_table *) NULL; } - ret->dynobj = NULL; - ret->fixup_count = 0; - ret->local_builtins = 0; - ret->fixup_list = NULL; - return &ret->root.root; } @@ -261,7 +230,7 @@ linux_link_hash_table_create (abfd) #define linux_link_hash_traverse(table, func, info) \ (aout_link_hash_traverse \ (&(table)->root, \ - (bfd_boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \ + (bfd_boolean (*) (struct aout_link_hash_entry *, void *)) (func), \ (info))) /* Get the Linux link hash table from the info structure. This is @@ -272,11 +241,10 @@ linux_link_hash_table_create (abfd) /* Store the information for a new fixup. */ static struct fixup * -new_fixup (info, h, value, builtin) - struct bfd_link_info *info; - struct linux_link_hash_entry *h; - bfd_vma value; - int builtin; +new_fixup (struct bfd_link_info *info, + struct linux_link_hash_entry *h, + bfd_vma value, + int builtin) { struct fixup *f; @@ -302,12 +270,11 @@ new_fixup (info, h, value, builtin) create it for now. */ static bfd_boolean -linux_link_create_dynamic_sections (abfd, info) - bfd *abfd; - struct bfd_link_info *info ATTRIBUTE_UNUSED; +linux_link_create_dynamic_sections (bfd *abfd, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { flagword flags; - register asection *s; + asection *s; /* Note that we set the SEC_IN_MEMORY flag. */ flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY; @@ -329,18 +296,16 @@ linux_link_create_dynamic_sections (abfd, info) tweaking needed for dynamic linking support. */ static bfd_boolean -linux_add_one_symbol (info, abfd, name, flags, section, value, string, - copy, collect, hashp) - struct bfd_link_info *info; - bfd *abfd; - const char *name; - flagword flags; - asection *section; - bfd_vma value; - const char *string; - bfd_boolean copy; - bfd_boolean collect; - struct bfd_link_hash_entry **hashp; +linux_add_one_symbol (struct bfd_link_info *info, + bfd *abfd, + const char *name, + flagword flags, + asection *section, + bfd_vma value, + const char *string, + bfd_boolean copy, + bfd_boolean collect, + struct bfd_link_hash_entry **hashp) { struct linux_link_hash_entry *h; bfd_boolean insert; @@ -355,7 +320,7 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string, insert = FALSE; - if (! info->relocatable + if (! bfd_link_relocatable (info) && linux_hash_table (info)->dynobj == NULL && strcmp (name, SHARABLE_CONFLICTS) == 0 && (flags & BSF_CONSTRUCTOR) != 0 @@ -429,9 +394,8 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string, This function is called via linux_link_hash_traverse. */ static bfd_boolean -linux_tally_symbols (h, data) - struct linux_link_hash_entry *h; - PTR data; +linux_tally_symbols (struct linux_link_hash_entry *h, + void * data) { struct bfd_link_info *info = (struct bfd_link_info *) data; struct fixup *f, *f1; @@ -439,9 +403,6 @@ linux_tally_symbols (h, data) struct linux_link_hash_entry *h1, *h2; bfd_boolean exists; - if (h->root.root.type == bfd_link_hash_warning) - h = (struct linux_link_hash_entry *) h->root.root.u.i.link; - if (h->root.root.type == bfd_link_hash_undefined && CONST_STRNEQ (h->root.root.root.string, NEEDS_SHRLIB)) { @@ -455,14 +416,15 @@ linux_tally_symbols (h, data) alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1); if (p == NULL || alloc == NULL) - (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"), - name); + _bfd_error_handler (_("Output file requires shared library `%s'\n"), + name); else { strcpy (alloc, name); p = strrchr (alloc, '_'); *p++ = '\0'; - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("Output file requires shared library `%s.so.%s'\n"), alloc, p); free (alloc); @@ -555,9 +517,8 @@ linux_tally_symbols (h, data) are required. */ bfd_boolean -bfd_m68klinux_size_dynamic_sections (output_bfd, info) - bfd *output_bfd; - struct bfd_link_info *info; +bfd_m68klinux_size_dynamic_sections (bfd *output_bfd, + struct bfd_link_info *info) { struct fixup *f; asection *s; @@ -568,7 +529,7 @@ bfd_m68klinux_size_dynamic_sections (output_bfd, info) /* First find the fixups... */ linux_link_hash_traverse (linux_hash_table (info), linux_tally_symbols, - (PTR) info); + info); /* If there are builtin fixups, leave room for a marker. This is used by the dynamic linker so that it knows that all that follow @@ -613,9 +574,7 @@ bfd_m68klinux_size_dynamic_sections (output_bfd, info) the stuff we need. */ static bfd_boolean -linux_finish_dynamic_link (output_bfd, info) - bfd *output_bfd; - struct bfd_link_info *info; +linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info) { asection *s, *os, *is; bfd_byte *fixup_table; @@ -654,7 +613,7 @@ linux_finish_dynamic_link (output_bfd, info) if (f->h->root.root.type != bfd_link_hash_defined && f->h->root.root.type != bfd_link_hash_defweak) { - (*_bfd_error_handler) + _bfd_error_handler (_("Symbol %s not defined for fixups\n"), f->h->root.root.root.string); continue; @@ -702,7 +661,7 @@ linux_finish_dynamic_link (output_bfd, info) if (f->h->root.root.type != bfd_link_hash_defined && f->h->root.root.type != bfd_link_hash_defweak) { - (*_bfd_error_handler) + _bfd_error_handler (_("Symbol %s not defined for fixups\n"), f->h->root.root.root.string); continue; @@ -727,7 +686,7 @@ linux_finish_dynamic_link (output_bfd, info) if (linux_hash_table (info)->fixup_count != fixups_written) { - (*_bfd_error_handler) (_("Warning: fixup count mismatch\n")); + _bfd_error_handler (_("Warning: fixup count mismatch\n")); while (linux_hash_table (info)->fixup_count > fixups_written) { bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table); @@ -763,7 +722,7 @@ linux_finish_dynamic_link (output_bfd, info) SEEK_SET) != 0) return FALSE; - if (bfd_bwrite ((PTR) s->contents, s->size, output_bfd) != s->size) + if (bfd_bwrite (s->contents, s->size, output_bfd) != s->size) return FALSE; return TRUE;