mirror of
https://git.yoctoproject.org/poky
synced 2026-04-10 14:02:21 +02:00
gcc: Add upstream fix for gcc bug 58595
Fix for internal compiler error hit when building lttng-tools_4.2.0: kernel-consumer.c:324:1: internal compiler error: in gen_movsi, at config/arm/arm.md:5539 (From OE-Core rev: ec1d5bdf4cc0a7a3e4747b42b7b95805752bea07) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi
committed by
Richard Purdie
Richard Purdie
parent
755aaad12d
commit
7217f9290d
@@ -69,7 +69,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
|
||||
file://0046-libatomic-deptracking.patch \
|
||||
file://0047-repomembug.patch \
|
||||
file://0048-PR58854_fix_arm_apcs_epilogue.patch \
|
||||
file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \
|
||||
file://0049-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch \
|
||||
file://0050-PR-target-58595.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d"
|
||||
SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8"
|
||||
|
||||
132
meta/recipes-devtools/gcc/gcc-4.8/0050-PR-target-58595.patch
Normal file
132
meta/recipes-devtools/gcc/gcc-4.8/0050-PR-target-58595.patch
Normal file
@@ -0,0 +1,132 @@
|
||||
Backport fix for PR target/58595
|
||||
|
||||
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Thu, 6 Mar 2014 12:07:07 +0000
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208380 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
|
||||
Index: gcc-4.8.2/gcc/ChangeLog
|
||||
===================================================================
|
||||
--- gcc-4.8.2.orig/gcc/ChangeLog
|
||||
+++ gcc-4.8.2/gcc/ChangeLog
|
||||
@@ -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.
|
||||
+
|
||||
2013-10-16 Release Manager
|
||||
|
||||
* GCC 4.8.2 released.
|
||||
Index: gcc-4.8.2/gcc/config/arm/arm.c
|
||||
===================================================================
|
||||
--- gcc-4.8.2.orig/gcc/config/arm/arm.c
|
||||
+++ gcc-4.8.2/gcc/config/arm/arm.c
|
||||
@@ -230,7 +230,6 @@ static tree arm_gimplify_va_arg_expr (tr
|
||||
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);
|
||||
@@ -6573,6 +6572,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. */
|
||||
@@ -6581,9 +6606,6 @@ arm_legitimize_address (rtx x, rtx orig_
|
||||
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);
|
||||
@@ -6695,9 +6717,6 @@ arm_legitimize_address (rtx x, rtx orig_
|
||||
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)
|
||||
@@ -6988,20 +7007,6 @@ thumb_legitimize_reload_address (rtx *x_
|
||||
|
||||
/* 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
|
||||
Index: gcc-4.8.2/gcc/testsuite/ChangeLog
|
||||
===================================================================
|
||||
--- gcc-4.8.2.orig/gcc/testsuite/ChangeLog
|
||||
+++ gcc-4.8.2/gcc/testsuite/ChangeLog
|
||||
@@ -1,3 +1,8 @@
|
||||
+2014-03-06 Jakub Jelinek <jakub@redhat.com>
|
||||
+
|
||||
+ PR target/58595
|
||||
+ * gcc.dg/tls/pr58595.c: New test.
|
||||
+
|
||||
2013-10-16 Release Manager
|
||||
|
||||
* GCC 4.8.2 released.
|
||||
Reference in New Issue
Block a user