procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR target/58595 (internal compiler error: in gen_movsi when compiling on arm some files of lttng-tools with -fPIE)

Browse source 
PR target/58595
	* config/arm/arm.c (arm_tls_symbol_p): Remove.
	(arm_legitimize_address): Call legitimize_tls_address for any
	arm_tls_referenced_p expression, handle constant addend.  Call it
	before testing for !TARGET_ARM.
	(thumb_legitimize_address): Don't handle arm_tls_symbol_p here.

	* gcc.dg/tls/pr58595.c: New test.

Co-Authored-By: Meador Inge <meadori@codesourcery.com>

From-SVN: r208380
This commit is contained in:
Jakub Jelinek 2014-03-06 13:07:07 +01:00 • committed by Jakub Jelinek
parent a74158c7f2
commit ab19cc6c93
4 changed files with 69 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gcc/ChangeLog
View file

@ -1,3 +1,13 @@
2014-03-06 Jakub Jelinek <jakub@redhat.com>
Meador Inge <meadori@codesourcery.com>
PR target/58595
* config/arm/arm.c (arm_tls_symbol_p): Remove.
(arm_legitimize_address): Call legitimize_tls_address for any
arm_tls_referenced_p expression, handle constant addend. Call it
before testing for !TARGET_ARM.
(thumb_legitimize_address): Don't handle arm_tls_symbol_p here.
2014-03-06 Richard Biener <rguenther@suse.de>
PR middle-end/60445

47
gcc/config/arm/arm.c
View file

@ -235,7 +235,6 @@ static tree arm_gimplify_va_arg_expr (tree, tree, gimple_seq *, gimple_seq *);
static void arm_option_override (void);
static unsigned HOST_WIDE_INT arm_shift_truncation_mask (enum machine_mode);
static bool arm_cannot_copy_insn_p (rtx);
static bool arm_tls_symbol_p (rtx x);
static int arm_issue_rate (void);
static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED;
static bool arm_output_addr_const_extra (FILE *, rtx);
@ -7336,6 +7335,32 @@ legitimize_tls_address (rtx x, rtx reg)
rtx
arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
{
if (arm_tls_referenced_p (x))
{
rtx addend = NULL;
if (GET_CODE (x) == CONST && GET_CODE (XEXP (x, 0)) == PLUS)
{
addend = XEXP (XEXP (x, 0), 1);
x = XEXP (XEXP (x, 0), 0);
}
if (GET_CODE (x) != SYMBOL_REF)
return x;
gcc_assert (SYMBOL_REF_TLS_MODEL (x) != 0);
x = legitimize_tls_address (x, NULL_RTX);
if (addend)
{
x = gen_rtx_PLUS (SImode, x, addend);
orig_x = x;
}
else
return x;
}
if (!TARGET_ARM)
{
/* TODO: legitimize_address for Thumb2. */
@ -7344,9 +7369,6 @@ arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
return thumb_legitimize_address (x, orig_x, mode);
}
if (arm_tls_symbol_p (x))
return legitimize_tls_address (x, NULL_RTX);
if (GET_CODE (x) == PLUS)
{
rtx xop0 = XEXP (x, 0);
@ -7459,9 +7481,6 @@ arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
rtx
thumb_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode)
{
if (arm_tls_symbol_p (x))
return legitimize_tls_address (x, NULL_RTX);
if (GET_CODE (x) == PLUS
&& CONST_INT_P (XEXP (x, 1))
&& (INTVAL (XEXP (x, 1)) >= 32 * GET_MODE_SIZE (mode)
@ -7756,20 +7775,6 @@ thumb_legitimize_reload_address (rtx *x_p,
/* Test for various thread-local symbols. */
/* Return TRUE if X is a thread-local symbol. */
static bool
arm_tls_symbol_p (rtx x)
{
if (! TARGET_HAVE_TLS)
return false;
if (GET_CODE (x) != SYMBOL_REF)
return false;
return SYMBOL_REF_TLS_MODEL (x) != 0;
}
/* Helper for arm_tls_referenced_p. */
static int

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2014-03-06 Jakub Jelinek <jakub@redhat.com>
PR target/58595
* gcc.dg/tls/pr58595.c: New test.
2014-03-06 Richard Biener <rguenther@suse.de>
PR middle-end/60445

28
gcc/testsuite/gcc.dg/tls/pr58595.c Normal file
View file

@ -0,0 +1,28 @@
/* PR target/58595 */
/* { dg-do run } */
/* { dg-options "-O2" } */
/* { dg-additional-options "-fpic" { target fpic } } */
/* { dg-require-effective-target tls } */
/* { dg-require-effective-target sync_int_long } */
struct S { unsigned long a, b; };
__thread struct S s;
void bar (unsigned long *);
__attribute__((noinline)) void
foo (void)
{
int i;
for (i = 0; i < 10; i++)
__sync_fetch_and_add (&s.b, 1L);
}
int
main ()
{
s.b = 12;
foo ();
if (s.b != 22)
__builtin_abort ();
return 0;
}