aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-xtensa.c9
-rw-r--r--gas/config/tc-xtensa.h6
3 files changed, 8 insertions, 13 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 98b873d..c095be1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-01 Bob Wilson <bob.wilson@acm.org>
+
+ * config/tc-xtensa.c (xg_add_opcode_fix, md_apply_fix): Delete use of
+ fx_tcbit.
+ * config/tc-xtensa.h (TC_FORCE_RELOCATION_LOCAL): Remove.
+
2007-02-02 Alan Modra <amodra@bigpond.net.au>
* write.h (struct fix <fx_pcrel_adjust, fx_size>): Move.
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 1facdc5..f83339a 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -1,5 +1,5 @@
/* tc-xtensa.c -- Assemble Xtensa instructions.
- Copyright 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@@ -4114,12 +4114,6 @@ xg_add_opcode_fix (TInsn *tinsn,
the_fix = fix_new_exp (fragP, offset, fmt_length, expr,
howto->pc_relative, reloc);
the_fix->fx_no_overflow = 1;
-
- if (expr->X_add_symbol
- && (S_IS_EXTERNAL (expr->X_add_symbol)
- || S_IS_WEAK (expr->X_add_symbol)))
- the_fix->fx_tcbit = TRUE;
-
the_fix->tc_fix_data.X_add_symbol = expr->X_add_symbol;
the_fix->tc_fix_data.X_add_number = expr->X_add_number;
the_fix->tc_fix_data.slot = slot;
@@ -5567,7 +5561,6 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
assert (fixP->fx_addsy);
if (S_GET_SEGMENT (fixP->fx_addsy) == seg
- && !fixP->fx_tcbit
&& !S_FORCE_RELOC (fixP->fx_addsy, 1))
{
val = (S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset
diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
index 47fee4e..b39395f 100644
--- a/gas/config/tc-xtensa.h
+++ b/gas/config/tc-xtensa.h
@@ -1,5 +1,5 @@
/* tc-xtensa.h -- Header file for tc-xtensa.c.
- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@@ -319,10 +319,6 @@ extern char *xtensa_section_rename (char *);
#define TC_FORCE_RELOCATION(fix) xtensa_force_relocation (fix)
#define TC_FORCE_RELOCATION_SUB_SAME(fix, seg) \
(! SEG_NORMAL (seg) || xtensa_force_relocation (fix))
-#define TC_FORCE_RELOCATION_LOCAL(FIX) \
- (!(FIX)->fx_pcrel \
- || (FIX)->fx_tcbit \
- || TC_FORCE_RELOCATION (FIX))
#define TC_VALIDATE_FIX_SUB(fix) xtensa_validate_fix_sub (fix)
#define NO_PSEUDO_DOT xtensa_check_inside_bundle ()
#define tc_canonicalize_symbol_name(s) xtensa_section_rename (s)