aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2005-02-11 17:18:41 +0000
committerNick Clifton <nickc@redhat.com>2005-02-11 17:18:41 +0000
commitd5b2f13be7d24abb533d482b6bc80653b0c217d2 (patch)
tree2c7f87d762552c301b5f3806682366ea82821169
parent6c408f53b0ea91d28c9e1b06e1e3c2ea8c76c042 (diff)
downloadgdb-d5b2f13be7d24abb533d482b6bc80653b0c217d2.zip
gdb-d5b2f13be7d24abb533d482b6bc80653b0c217d2.tar.gz
gdb-d5b2f13be7d24abb533d482b6bc80653b0c217d2.tar.bz2
(m32r_reloc_map_old): Use #ifdef USE_M32R_OLD_RELOC to protect the declaration of this array.
-rw-r--r--bfd/ChangeLog3
-rw-r--r--bfd/elf32-m32r.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 168d9ca..dd70bc0 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 a72da4a..ac6446b 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)