summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatherine Moore <clm@redhat.com>2000-03-09 22:07:28 +0000
committerCatherine Moore <clm@redhat.com>2000-03-09 22:07:28 +0000
commitb503a50c53e0d52cd46105a4083974a6f966a5c4 (patch)
tree569ebffefd54346bdb0240b680e9a28fe33dccc8
parent872ffea1ed91fc46dc5677fd5b921ae4abe7adc8 (diff)
downloadbinutils-redhat-b503a50c53e0d52cd46105a4083974a6f966a5c4.tar.gz
* config/tc-m32r.c (m32r_fix_adjustable): Look up the
relocation type based on the entry in the fixup structure.
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-m32r.c16
2 files changed, 19 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index e9607ba150..d9840a18e3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-09 Catherine Moore <clm@cygnus.com>
+
+ * config/tc-m32r.c (m32r_fix_adjustable): Look up the
+ relocation type based on the entry in the fixup structure.
+
2000-03-08 H.J. Lu (hjl@gnu.org)
* Makefile.am (install-exec-tooldir): Depend on
diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index f73f034583..7745338b08 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -1887,6 +1887,18 @@ m32r_fix_adjustable (fixP)
fixS *fixP;
{
+ bfd_reloc_code_real_type reloc_type;
+
+ if ((int) fixP->fx_r_type >= (int) BFD_RELOC_UNUSED)
+ {
+ const CGEN_INSN *insn = NULL;
+ int opindex = (int) fixP->fx_r_type - (int) BFD_RELOC_UNUSED;
+ const CGEN_OPERAND *operand = cgen_operand_lookup_by_num(gas_cgen_cpu_desc, opindex);
+ reloc_type = md_cgen_lookup_reloc (insn, operand, fixP);
+ }
+ else
+ reloc_type = fixP->fx_r_type;
+
if (fixP->fx_addsy == NULL)
return 1;
@@ -1897,8 +1909,8 @@ m32r_fix_adjustable (fixP)
return 0;
/* We need the symbol name for the VTABLE entries */
- if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT
- || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
+ if (reloc_type == BFD_RELOC_VTABLE_INHERIT
+ || reloc_type == BFD_RELOC_VTABLE_ENTRY)
return 0;
return 1;