aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2003-10-11 13:08:44 +0000
committerAlan Modra <amodra@gmail.com>2003-10-11 13:08:44 +0000
commit8d6ad26e17445a86e1cac23707324c94ef16cd17 (patch)
treef3c7966514418d35f52f7d9abf37cf00f5366ac2
parent6ce6d90f6aef5f229c0356d49271bf56283a50f5 (diff)
downloadgdb-8d6ad26e17445a86e1cac23707324c94ef16cd17.zip
gdb-8d6ad26e17445a86e1cac23707324c94ef16cd17.tar.gz
gdb-8d6ad26e17445a86e1cac23707324c94ef16cd17.tar.bz2
* coff-sh.c: Move definition of MAP and guard more code with
COFF_IMAGE_WITH_PE.
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/coff-sh.c9
2 files changed, 8 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cd75ac4..a66ceaf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,4 +1,7 @@
-2003-10-11 Alan Modra <alan@modra.org>
+2003-10-11 Alan Modra <amodra@bigpond.net.au>
+
+ * coff-sh.c: Move definition of MAP and guard more code with
+ COFF_IMAGE_WITH_PE.
* section.c (bfd_get_section_size_before_reloc): Ignore reloc_done.
* bfd-in2.h: Regenerate.
@@ -64,7 +67,7 @@
2003-10-06 Matt Thomas <matt@3am-software.com>
- config.bfd: Move the hppa*-*-netbsd* case to the hppa*-*-linux* case.
+ * config.bfd: Move the hppa*-*-netbsd* case to the hppa*-*-linux* case.
2003-10-06 Robert Millan <robertmh@gnu.org>
diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c
index 6b1468e..d78cc16 100644
--- a/bfd/coff-sh.c
+++ b/bfd/coff-sh.c
@@ -1647,6 +1647,8 @@ struct sh_opcode
#define SETSAS (0x40000)
#define SETSAS_REG(x) USESAS_REG (x)
+#define MAP(a) a, sizeof a / sizeof a[0]
+
#ifndef COFF_IMAGE_WITH_PE
static bfd_boolean sh_insn_uses_reg
PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
@@ -1666,10 +1668,8 @@ static bfd_boolean sh_insns_conflict
static bfd_boolean sh_load_use
PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
const struct sh_opcode *));
-#endif
-/* The opcode maps. */
-#define MAP(a) a, sizeof a / sizeof a[0]
+/* The opcode maps. */
static const struct sh_opcode sh_opcode00[] =
{
@@ -2089,7 +2089,6 @@ static const struct sh_minor_opcode sh_opcodef[] =
{ MAP (sh_opcodef1), 0xf0ff }
};
-#ifndef COFF_IMAGE_WITH_PE
static struct sh_major_opcode sh_opcodes[] =
{
{ MAP (sh_opcode0) },
@@ -2109,7 +2108,6 @@ static struct sh_major_opcode sh_opcodes[] =
{ MAP (sh_opcodee) },
{ MAP (sh_opcodef) }
};
-#endif
/* The double data transfer / parallel processing insns are not
described here. This will cause sh_align_load_span to leave them alone. */
@@ -2131,7 +2129,6 @@ static const struct sh_minor_opcode sh_dsp_opcodef[] =
{ MAP (sh_dsp_opcodef0), 0xfc0d }
};
-#ifndef COFF_IMAGE_WITH_PE
/* Given an instruction, return a pointer to the corresponding
sh_opcode structure. Return NULL if the instruction is not
recognized. */