mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-20 17:12:55 +00:00
cc/gcc: add some bug fixes to gcc 4.7.3 and 4.8.2
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
parent
dd15c93a11
commit
ab5fa8d8a3
102
patches/gcc/4.7.3/100-fix-PR-target-58595.patch
Normal file
102
patches/gcc/4.7.3/100-fix-PR-target-58595.patch
Normal file
@ -0,0 +1,102 @@
|
||||
commit 4fa1f8926227d4e79975b674dc4292b9bec4b137
|
||||
Author: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Thu Mar 6 12:07:07 2014 +0000
|
||||
|
||||
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
|
||||
|
||||
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
|
||||
index ce24bfe..af5666b 100644
|
||||
--- a/gcc/config/arm/arm.c
|
||||
+++ b/gcc/config/arm/arm.c
|
||||
@@ -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
|
@ -0,0 +1,29 @@
|
||||
commit 9a228f68817f79bbd1d295b8e6fcaed25c47ee8f
|
||||
Author: ramana <ramana@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Wed Oct 30 10:54:04 2013 +0000
|
||||
|
||||
Fix PR target/58854
|
||||
|
||||
2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
|
||||
|
||||
PR target/58854
|
||||
* config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage.
|
||||
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204203 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
|
||||
[yann.morin.1998@free.fr: removed the patch to the Changelog, it does not
|
||||
apply and we don't really need it; re-diff to avoid offsets]
|
||||
|
||||
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
|
||||
index 212a4bc..23dfc0e 100644
|
||||
--- a/gcc/config/arm/arm.c
|
||||
+++ b/gcc/config/arm/arm.c
|
||||
@@ -23555,6 +23555,7 @@ arm_expand_epilogue_apcs_frame (bool really_return)
|
||||
num_regs = bit_count (saved_regs_mask);
|
||||
if ((offsets->outgoing_args != (1 + num_regs)) || cfun->calls_alloca)
|
||||
{
|
||||
+ emit_insn (gen_blockage ());
|
||||
/* Unwind the stack to just below the saved registers. */
|
||||
emit_insn (gen_addsi3 (stack_pointer_rtx,
|
||||
hard_frame_pointer_rtx,
|
101
patches/gcc/4.8.2/110-fix-PR-target-58595.patch
Normal file
101
patches/gcc/4.8.2/110-fix-PR-target-58595.patch
Normal file
@ -0,0 +1,101 @@
|
||||
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/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
|
Loading…
x
Reference in New Issue
Block a user