From d0970db2ad7492604505bcc62e038fc79f9944cb Mon Sep 17 00:00:00 2001 From: James E Wilson Date: Fri, 15 Sep 2006 16:05:40 -0700 Subject: Short term fix for PR 28490. * config/ia64/ia64.c (ia64_legitimate_constant_p, cast CONST): Handle symbol offsets same as they are handled in ia64_expand_move and move_operand. From-SVN: r116983 --- gcc/ChangeLog | 6 ++++++ gcc/config/ia64/ia64.c | 24 +++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74bc58d..148db87 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-09-15 Jim Wilson + + * config/ia64/ia64.c (ia64_legitimate_constant_p, cast CONST): + Handle symbol offsets same as they are handled in ia64_expand_move + and move_operand. + 2006-09-16 Andreas Tobler * loop-doloop.c (doloop_optimize): Change type of max_cost to int. diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c index d38a19a..71953e2 100644 --- a/gcc/config/ia64/ia64.c +++ b/gcc/config/ia64/ia64.c @@ -815,7 +815,29 @@ ia64_legitimate_constant_p (rtx x) case CONST: case SYMBOL_REF: - return tls_symbolic_operand_type (x) == 0; + /* ??? Short term workaround for PR 28490. We must make the code here + match the code in ia64_expand_move and move_operand, even though they + are both technically wrong. */ + if (tls_symbolic_operand_type (x) == 0) + { + HOST_WIDE_INT addend = 0; + rtx op = x; + + if (GET_CODE (op) == CONST + && GET_CODE (XEXP (op, 0)) == PLUS + && GET_CODE (XEXP (XEXP (op, 0), 1)) == CONST_INT) + { + addend = INTVAL (XEXP (XEXP (op, 0), 1)); + op = XEXP (XEXP (op, 0), 0); + } + + if (any_offset_symbol_operand (op, GET_MODE (op))) + return true; + if (aligned_offset_symbol_operand (op, GET_MODE (op))) + return (addend & 0x3fff) == 0; + return false; + } + return false; case CONST_VECTOR: { -- cgit v1.1