diff options
| author | Nick Clifton <nickc@redhat.com> | 2005-02-11 17:18:41 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2005-02-11 17:18:41 +0000 |
| commit | 3d65d6951a9455f73b796a9ea0bcb5227446ff0b (patch) | |
| tree | 11935c8a52a016fb029c913b0aae5c5e2072bd9a | |
| parent | 2fe81c36fc94b21129708f16aa868ef28f6f0a84 (diff) | |
| download | gdb-3d65d6951a9455f73b796a9ea0bcb5227446ff0b.tar.gz | |
(m32r_reloc_map_old): Use #ifdef USE_M32R_OLD_RELOC to protect the declaration of this array.
| -rw-r--r-- | bfd/ChangeLog | 3 | ||||
| -rw-r--r-- | bfd/elf32-m32r.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 168d9ca0be9..dd70bc069dc 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 <amodra@bigpond.net.au> * elf64-ppc.c (toc_adjusting_stub_needed): Return true for diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index a72da4a9baa..ac6446bc59e 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) |