From: Nick Clifton Date: Fri, 11 Feb 2005 17:18:41 +0000 (+0000) Subject: (m32r_reloc_map_old): Use #ifdef USE_M32R_OLD_RELOC to protect the declaration of... X-Git-Tag: insight_6_8-branchpoint~5852 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9bc313f41fb1fbae335577273fd94c90d381780;p=pf3gnuchains%2Fpf3gnuchains4x.git (m32r_reloc_map_old): Use #ifdef USE_M32R_OLD_RELOC to protect the declaration of this array. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 168d9ca0be..dd70bc069d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -38,6 +38,9 @@ * elf32-iq2000.c (iq2000_reloc_map): Remove unused structure and array. + * elf32-m32r.c (m32r_reloc_map_old): Use #ifdef USE_M32R_OLD_RELOC + to protect the declaration of this array. + 2005-02-12 Alan Modra * elf64-ppc.c (toc_adjusting_stub_needed): Return true for diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index a72da4a9ba..ac6446bc59 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -1254,6 +1254,7 @@ struct m32r_reloc_map unsigned char elf_reloc_val; }; +#ifdef USE_M32R_OLD_RELOC static const struct m32r_reloc_map m32r_reloc_map_old[] = { { BFD_RELOC_NONE, R_M32R_NONE }, @@ -1270,7 +1271,7 @@ static const struct m32r_reloc_map m32r_reloc_map_old[] = { BFD_RELOC_VTABLE_INHERIT, R_M32R_GNU_VTINHERIT }, { BFD_RELOC_VTABLE_ENTRY, R_M32R_GNU_VTENTRY }, }; - +#else static const struct m32r_reloc_map m32r_reloc_map[] = { { BFD_RELOC_NONE, R_M32R_NONE }, @@ -1305,6 +1306,7 @@ static const struct m32r_reloc_map m32r_reloc_map[] = { BFD_RELOC_M32R_GOTOFF_HI_SLO, R_M32R_GOTOFF_HI_SLO }, { BFD_RELOC_M32R_GOTOFF_LO, R_M32R_GOTOFF_LO }, }; +#endif static reloc_howto_type * bfd_elf32_bfd_reloc_type_lookup (abfd, code)