yann@3294: Backport fix for PR target/58595
yann@3294: 
yann@3294: From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
yann@3294: Date: Thu, 6 Mar 2014 12:07:07 +0000
yann@3294: Subject: [PATCH] 	PR target/58595 	* config/arm/arm.c
yann@3294:  (arm_tls_symbol_p): Remove. 	(arm_legitimize_address): Call
yann@3294:  legitimize_tls_address for any 	arm_tls_referenced_p expression,
yann@3294:  handle constant addend.  Call it 	before testing for !TARGET_ARM. 
yann@3294:  (thumb_legitimize_address): Don't handle arm_tls_symbol_p here.
yann@3294: 
yann@3294: 	* gcc.dg/tls/pr58595.c: New test.
yann@3294: 
yann@3294: 
yann@3294: git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208380 138bc75d-0d04-0410-961f-82ee72b054a4
yann@3294: 
yann@3294: Index: gcc-4.8.2/gcc/config/arm/arm.c
yann@3294: ===================================================================
yann@3294: --- gcc-4.8.2.orig/gcc/config/arm/arm.c
yann@3294: +++ gcc-4.8.2/gcc/config/arm/arm.c
yann@3294: @@ -230,7 +230,6 @@ static tree arm_gimplify_va_arg_expr (tr
yann@3294:  static void arm_option_override (void);
yann@3294:  static unsigned HOST_WIDE_INT arm_shift_truncation_mask (enum machine_mode);
yann@3294:  static bool arm_cannot_copy_insn_p (rtx);
yann@3294: -static bool arm_tls_symbol_p (rtx x);
yann@3294:  static int arm_issue_rate (void);
yann@3294:  static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED;
yann@3294:  static bool arm_output_addr_const_extra (FILE *, rtx);
yann@3294: @@ -6573,6 +6572,32 @@ legitimize_tls_address (rtx x, rtx reg)
yann@3294:  rtx
yann@3294:  arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
yann@3294:  {
yann@3294: +  if (arm_tls_referenced_p (x))
yann@3294: +    {
yann@3294: +      rtx addend = NULL;
yann@3294: +
yann@3294: +      if (GET_CODE (x) == CONST && GET_CODE (XEXP (x, 0)) == PLUS)
yann@3294: +	{
yann@3294: +	  addend = XEXP (XEXP (x, 0), 1);
yann@3294: +	  x = XEXP (XEXP (x, 0), 0);
yann@3294: +	}
yann@3294: +
yann@3294: +      if (GET_CODE (x) != SYMBOL_REF)
yann@3294: +	return x;
yann@3294: +
yann@3294: +      gcc_assert (SYMBOL_REF_TLS_MODEL (x) != 0);
yann@3294: +
yann@3294: +      x = legitimize_tls_address (x, NULL_RTX);
yann@3294: +
yann@3294: +      if (addend)
yann@3294: +	{
yann@3294: +	  x = gen_rtx_PLUS (SImode, x, addend);
yann@3294: +	  orig_x = x;
yann@3294: +	}
yann@3294: +      else
yann@3294: +	return x;
yann@3294: +    }
yann@3294: +
yann@3294:    if (!TARGET_ARM)
yann@3294:      {
yann@3294:        /* TODO: legitimize_address for Thumb2.  */
yann@3294: @@ -6581,9 +6606,6 @@ arm_legitimize_address (rtx x, rtx orig_
yann@3294:        return thumb_legitimize_address (x, orig_x, mode);
yann@3294:      }
yann@3294:  
yann@3294: -  if (arm_tls_symbol_p (x))
yann@3294: -    return legitimize_tls_address (x, NULL_RTX);
yann@3294: -
yann@3294:    if (GET_CODE (x) == PLUS)
yann@3294:      {
yann@3294:        rtx xop0 = XEXP (x, 0);
yann@3294: @@ -6695,9 +6717,6 @@ arm_legitimize_address (rtx x, rtx orig_
yann@3294:  rtx
yann@3294:  thumb_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
yann@3294:  {
yann@3294: -  if (arm_tls_symbol_p (x))
yann@3294: -    return legitimize_tls_address (x, NULL_RTX);
yann@3294: -
yann@3294:    if (GET_CODE (x) == PLUS
yann@3294:        && CONST_INT_P (XEXP (x, 1))
yann@3294:        && (INTVAL (XEXP (x, 1)) >= 32 * GET_MODE_SIZE (mode)
yann@3294: @@ -6988,20 +7007,6 @@ thumb_legitimize_reload_address (rtx *x_
yann@3294:  
yann@3294:  /* Test for various thread-local symbols.  */
yann@3294:  
yann@3294: -/* Return TRUE if X is a thread-local symbol.  */
yann@3294: -
yann@3294: -static bool
yann@3294: -arm_tls_symbol_p (rtx x)
yann@3294: -{
yann@3294: -  if (! TARGET_HAVE_TLS)
yann@3294: -    return false;
yann@3294: -
yann@3294: -  if (GET_CODE (x) != SYMBOL_REF)
yann@3294: -    return false;
yann@3294: -
yann@3294: -  return SYMBOL_REF_TLS_MODEL (x) != 0;
yann@3294: -}
yann@3294: -
yann@3294:  /* Helper for arm_tls_referenced_p.  */
yann@3294:  
yann@3294:  static int