X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff-i860.c;h=751686411e133eb525847b60b7e741616f65a09f;hb=ca45f6e9905edbe4066e1c8f30cc22fb6a0716f9;hp=edc9f4e6a2780b5b2f5cbb333a0c330f3424c99e;hpb=1a101a422077cc4ebe1c0abb2f87e44cef3151e4;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c index edc9f4e6a2..751686411e 100644 --- a/bfd/coff-i860.c +++ b/bfd/coff-i860.c @@ -1,33 +1,37 @@ /* BFD back-end for Intel i860 COFF files. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright (C) 1990-2016 Free Software Foundation, Inc. Created mostly by substituting "860" for "386" in coff-i386.c Harry Dolan , October 1995 -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "coff/i860.h" #include "coff/internal.h" +#ifndef bfd_pe_print_pdata +#define bfd_pe_print_pdata NULL +#endif + #include "libcoff.h" @@ -126,7 +130,7 @@ coff_i860_reloc (bfd *abfd, return bfd_reloc_continue; } -/* This is just a temporary measure until we teach bfd to generate +/* This is just a temporary measure until we teach bfd to generate these relocations. */ static bfd_reloc_status_type @@ -139,7 +143,7 @@ coff_i860_reloc_nyi (bfd *abfd ATTRIBUTE_UNUSED, char **error_message ATTRIBUTE_UNUSED) { reloc_howto_type *howto = reloc_entry->howto; - fprintf (stderr, _("Relocation `%s' not yet implemented\n"), howto->name); + (*_bfd_error_handler) (_("relocation `%s' not yet implemented"), howto->name); return bfd_reloc_notsupported; } @@ -463,31 +467,10 @@ static reloc_howto_type howto_table[] = FIXME: This macro refers to symbols and asect; these are from the calling function, not the macro arguments. */ -/* FIXME: This was copied from the i386 version originally but - appears to be wrong for i860. For now we'll do nothing. */ -#if 0 -#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr) \ - { \ - coff_symbol_type *coffsym = (coff_symbol_type *) NULL; \ - if (ptr && bfd_asymbol_bfd (ptr) != abfd) \ - coffsym = (obj_symbols (abfd) \ - + (cache_ptr->sym_ptr_ptr - symbols)); \ - else if (ptr) \ - coffsym = coff_symbol_from (abfd, ptr); \ - if (coffsym != (coff_symbol_type *) NULL \ - && coffsym->native->u.syment.n_scnum == 0) \ - cache_ptr->addend = - coffsym->native->u.syment.n_value; \ - else if (ptr && bfd_asymbol_bfd (ptr) == abfd \ - && ptr->section != (asection *) NULL) \ - cache_ptr->addend = - (ptr->section->vma + ptr->value); \ - else \ - cache_ptr->addend = 0; \ - if (ptr && howto_table[reloc.r_type].pc_relative) \ - cache_ptr->addend += asect->vma; \ - } -#else -#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr) -#endif +/* PR 17512: file: 0a38fb7c + Set an addend value, even if it is not going to be used. A tool + like coffdump might be used to print out the contents of the reloc. */ +#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr) (cache_ptr)->addend = 0 /* We use the special COFF backend linker. */ #define coff_relocate_section _bfd_coff_generic_relocate_section @@ -579,6 +562,20 @@ coff_i860_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, } } +static reloc_howto_type * +coff_i860_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + unsigned int i; + + for (i = 0; i < sizeof (howto_table) / sizeof (howto_table[0]); i++) + if (howto_table[i].name != NULL + && strcasecmp (howto_table[i].name, r_name) == 0) + return &howto_table[i]; + + return NULL; +} + /* This is called from coff_slurp_reloc_table for each relocation entry. This special handling is due to the `PAIR' relocation which has a different meaning for the `r_symndx' field. */ @@ -607,8 +604,8 @@ i860_reloc_processing (arelent *cache_ptr, struct internal_reloc *dst, if (dst->r_symndx < 0 || dst->r_symndx >= obj_conv_table_size (abfd)) { (*_bfd_error_handler) - (_("%s: warning: illegal symbol index %ld in relocs"), - bfd_archive_filename (abfd), dst->r_symndx); + (_("%B: warning: illegal symbol index %ld in relocs"), + abfd, dst->r_symndx); cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; ptr = NULL; } @@ -634,6 +631,7 @@ i860_reloc_processing (arelent *cache_ptr, struct internal_reloc *dst, /* Calculate any reloc addend by looking at the symbol. */ CALC_ADDEND (abfd, ptr, (*dst), cache_ptr); + (void) ptr; cache_ptr->address -= asect->vma; @@ -644,6 +642,7 @@ i860_reloc_processing (arelent *cache_ptr, struct internal_reloc *dst, #define coff_rtype_to_howto coff_i860_rtype_to_howto #define coff_bfd_reloc_type_lookup coff_i860_reloc_type_lookup +#define coff_bfd_reloc_name_lookup coff_i860_reloc_name_lookup #define RELOC_PROCESSING(relent, reloc, symbols, abfd, section) \ i860_reloc_processing (relent, reloc, symbols, abfd, section) @@ -660,7 +659,7 @@ const bfd_target #ifdef TARGET_SYM TARGET_SYM = #else - i860coff_vec = + i860_coff_vec = #endif { #ifdef TARGET_NAME @@ -680,6 +679,7 @@ const bfd_target '_', /* leading underscore */ '/', /* ar_pad_char */ 15, /* ar_max_namelen */ + 0, /* match priority. */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32,