summaryrefslogtreecommitdiff
path: root/gcc/config/xtensa
diff options
context:
space:
mode:
authoraesok <aesok@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-07 13:45:04 +0000
committeraesok <aesok@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-07 13:45:04 +0000
commit77a69f9f5f05598c0e61b4b977a101cbc757c7fb (patch)
tree711671a91b2a7606e5eb0f3825877e88c666495f /gcc/config/xtensa
parente47d6ba50ad9bf72b16298dd51499eea7ada6e2a (diff)
downloadgcc-77a69f9f5f05598c0e61b4b977a101cbc757c7fb.tar.gz
* config/xtensa/xtensa.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
* config/xtensa/xtensa-protos.h (xtensa_output_addr_const_extra): Remove. * config/xtensa/xtensa.c (xtensa_output_addr_const_extra): Make static. (TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168568 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/xtensa')
-rw-r--r--gcc/config/xtensa/xtensa-protos.h1
-rw-r--r--gcc/config/xtensa/xtensa.c7
-rw-r--r--gcc/config/xtensa/xtensa.h8
3 files changed, 6 insertions, 10 deletions
diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h
index 898c8085cea..356e0f12074 100644
--- a/gcc/config/xtensa/xtensa-protos.h
+++ b/gcc/config/xtensa/xtensa-protos.h
@@ -62,7 +62,6 @@ extern void init_cumulative_args (CUMULATIVE_ARGS *, int);
extern void print_operand (FILE *, rtx, int);
extern void print_operand_address (FILE *, rtx);
-extern bool xtensa_output_addr_const_extra (FILE *, rtx);
extern void xtensa_output_literal (FILE *, rtx, enum machine_mode, int);
extern rtx xtensa_return_addr (int, rtx);
extern enum reg_class xtensa_preferred_reload_class (rtx, enum reg_class, int);
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index c3c69fdcc94..0a6f34bbb85 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -157,6 +157,7 @@ static bool xtensa_frame_pointer_required (void);
static rtx xtensa_static_chain (const_tree, bool);
static void xtensa_asm_trampoline_template (FILE *);
static void xtensa_trampoline_init (rtx, tree, rtx);
+static bool xtensa_output_addr_const_extra (FILE *, rtx);
static const int reg_nonleaf_alloc_order[FIRST_PSEUDO_REGISTER] =
REG_ALLOC_ORDER;
@@ -274,6 +275,9 @@ static const struct default_options xtensa_option_optimization_table[] =
#undef TARGET_OPTION_OPTIMIZATION_TABLE
#define TARGET_OPTION_OPTIMIZATION_TABLE xtensa_option_optimization_table
+#undef TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA
+#define TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA xtensa_output_addr_const_extra
+
struct gcc_target targetm = TARGET_INITIALIZER;
@@ -2437,8 +2441,9 @@ print_operand_address (FILE *file, rtx addr)
}
}
+/* Implement TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA. */
-bool
+static bool
xtensa_output_addr_const_extra (FILE *fp, rtx x)
{
if (GET_CODE (x) == UNSPEC && XVECLEN (x, 0) == 1)
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
index bd04893d1b6..ab1738333f2 100644
--- a/gcc/config/xtensa/xtensa.h
+++ b/gcc/config/xtensa/xtensa.h
@@ -816,14 +816,6 @@ typedef struct xtensa_args
#define PRINT_OPERAND(FILE, X, CODE) print_operand (FILE, X, CODE)
#define PRINT_OPERAND_ADDRESS(FILE, ADDR) print_operand_address (FILE, ADDR)
-/* Recognize machine-specific patterns that may appear within
- constants. Used for PIC-specific UNSPECs. */
-#define OUTPUT_ADDR_CONST_EXTRA(STREAM, X, FAIL) \
- do { \
- if (xtensa_output_addr_const_extra (STREAM, X) == FALSE) \
- goto FAIL; \
- } while (0)
-
/* Globalizing directive for a label. */
#define GLOBAL_ASM_OP "\t.global\t"