From 30d10e9ee899e608cf3a9f025b32122be8202141 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 25 Aug 2010 07:02:40 +0000 Subject: [PATCH] * aout-arm.c (MY(bfd_reloc_type_lookup)): Use bfd_arch_bits_per_address. * aout-ns32k.c (MY(bfd_reloc_type_lookup)): Likewise. * aoutx.h (NAME(aout,reloc_type_lookup)): Likewise. * coff-arm.c (coff_arm_reloc_type_lookup): Likewise. * elf-hppa.h (elf_hppa_reloc_final_type): Likewise. * reloc.c (bfd_default_reloc_type_lookup): Likewise. * riscix.c (riscix_reloc_type_lookup): Likewise. --- bfd/ChangeLog | 10 ++++++++++ bfd/aout-arm.c | 4 ++-- bfd/aout-ns32k.c | 4 ++-- bfd/aoutx.h | 2 +- bfd/coff-arm.c | 4 ++-- bfd/elf-hppa.h | 5 +++-- bfd/reloc.c | 2 +- bfd/riscix.c | 4 ++-- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b2608ad22c..3dc84348e7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2010-08-25 Alan Modra + + * aout-arm.c (MY(bfd_reloc_type_lookup)): Use bfd_arch_bits_per_address. + * aout-ns32k.c (MY(bfd_reloc_type_lookup)): Likewise. + * aoutx.h (NAME(aout,reloc_type_lookup)): Likewise. + * coff-arm.c (coff_arm_reloc_type_lookup): Likewise. + * elf-hppa.h (elf_hppa_reloc_final_type): Likewise. + * reloc.c (bfd_default_reloc_type_lookup): Likewise. + * riscix.c (riscix_reloc_type_lookup): Likewise. + 2010-08-25 Alan Modra * elf.c (_bfd_elf_map_sections_to_segments): Don't load program diff --git a/bfd/aout-arm.c b/bfd/aout-arm.c index 6e99b2ef4c..9a5d15599c 100644 --- a/bfd/aout-arm.c +++ b/bfd/aout-arm.c @@ -1,6 +1,6 @@ /* BFD back-end for raw ARM a.out binaries. Copyright 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, - 2007, 2009 Free Software Foundation, Inc. + 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org) This file is part of BFD, the Binary File Descriptor library. @@ -296,7 +296,7 @@ MY (bfd_reloc_type_lookup) (bfd *abfd, #define ASTD(i,j) case i: return & MY (howto_table)[j] if (code == BFD_RELOC_CTOR) - switch (bfd_get_arch_info (abfd)->bits_per_address) + switch (bfd_arch_bits_per_address (abfd)) { case 32: code = BFD_RELOC_32; diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c index ea7d8f4fd7..9a0737d7ef 100644 --- a/bfd/aout-ns32k.c +++ b/bfd/aout-ns32k.c @@ -1,6 +1,6 @@ /* BFD back-end for ns32k a.out-ish binaries. Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. + 2002, 2003, 2005, 2006, 2007, 2010 Free Software Foundation, Inc. Contributed by Ian Dall (idall@eleceng.adelaide.edu.au). This file is part of BFD, the Binary File Descriptor library. @@ -214,7 +214,7 @@ MY (bfd_reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code) BFD_ASSERT (ext == 0); if (code == BFD_RELOC_CTOR) - switch (bfd_get_arch_info (abfd)->bits_per_address) + switch (bfd_arch_bits_per_address (abfd)) { case 32: code = BFD_RELOC_32; diff --git a/bfd/aoutx.h b/bfd/aoutx.h index c6327226f9..11598a000d 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -269,7 +269,7 @@ NAME (aout, reloc_type_lookup) (bfd *abfd, bfd_reloc_code_real_type code) int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE; if (code == BFD_RELOC_CTOR) - switch (bfd_get_arch_info (abfd)->bits_per_address) + switch (bfd_arch_bits_per_address (abfd)) { case 32: code = BFD_RELOC_32; diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c index 2e0110a61a..bdadfb2cd4 100644 --- a/bfd/coff-arm.c +++ b/bfd/coff-arm.c @@ -1,6 +1,6 @@ /* BFD back-end for ARM COFF files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by Cygnus Support. @@ -817,7 +817,7 @@ coff_arm_reloc_type_lookup (bfd * abfd, bfd_reloc_code_real_type code) #define ASTD(i,j) case i: return aoutarm_std_reloc_howto + j if (code == BFD_RELOC_CTOR) - switch (bfd_get_arch_info (abfd)->bits_per_address) + switch (bfd_arch_bits_per_address (abfd)) { case 32: code = BFD_RELOC_32; diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h index 51a9484e00..3fa9dedbd0 100644 --- a/bfd/elf-hppa.h +++ b/bfd/elf-hppa.h @@ -1,5 +1,6 @@ /* Common code for PA ELF implementations. - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -678,7 +679,7 @@ elf_hppa_reloc_final_type (bfd *abfd, /* When in 64bit mode, a 32bit relocation is supposed to be a section relative relocation. Dwarf2 (for example) uses 32bit section relative relocations. */ - if (bfd_get_arch_info (abfd)->bits_per_address != 32) + if (bfd_arch_bits_per_address (abfd) != 32) final_type = R_PARISC_SECREL32; break; case e_psel: diff --git a/bfd/reloc.c b/bfd/reloc.c index f8a39c9aa0..e7210eba9a 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -5572,7 +5572,7 @@ bfd_default_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code) case BFD_RELOC_CTOR: /* The type of reloc used in a ctor, which will be as wide as the address - so either a 64, 32, or 16 bitter. */ - switch (bfd_get_arch_info (abfd)->bits_per_address) + switch (bfd_arch_bits_per_address (abfd)) { case 64: BFD_FAIL (); diff --git a/bfd/riscix.c b/bfd/riscix.c index 6ca26f6116..0d07d015f9 100644 --- a/bfd/riscix.c +++ b/bfd/riscix.c @@ -1,6 +1,6 @@ /* BFD back-end for RISC iX (Acorn, arm) binaries. Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, - 2005, 2007 Free Software Foundation, Inc. + 2005, 2007, 2010 Free Software Foundation, Inc. Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org) This file is part of BFD, the Binary File Descriptor library. @@ -254,7 +254,7 @@ riscix_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code) { #define ASTD(i,j) case i: return &riscix_std_reloc_howto[j] if (code == BFD_RELOC_CTOR) - switch (bfd_get_arch_info (abfd)->bits_per_address) + switch (bfd_arch_bits_per_address (abfd)) { case 32: code = BFD_RELOC_32;