From patchwork Sun Apr 13 19:58:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 338779 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id B7B8A1400B5 for ; Mon, 14 Apr 2014 05:59:11 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D453D8B164; Sun, 13 Apr 2014 19:59:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WTNMGFByvB82; Sun, 13 Apr 2014 19:59:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D18489D02; Sun, 13 Apr 2014 19:59:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7CD6E1C2826 for ; Sun, 13 Apr 2014 19:59:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7A6798AF96 for ; Sun, 13 Apr 2014 19:59:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nvXVswrxb8aD for ; Sun, 13 Apr 2014 19:59:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by fraxinus.osuosl.org (Postfix) with ESMTP id B9C7B88B97 for ; Sun, 13 Apr 2014 19:59:01 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 39EDD170D; Sun, 13 Apr 2014 21:59:00 +0200 (CEST) Received: from localhost (AToulouse-651-1-9-246.w92-149.abo.wanadoo.fr [92.149.184.246]) by mail.free-electrons.com (Postfix) with ESMTPSA id E0DF38E5 for ; Sun, 13 Apr 2014 21:58:59 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 13 Apr 2014 21:58:55 +0200 Message-Id: <1397419138-8776-2-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397419138-8776-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1397419138-8776-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 1/4] gcc: add fix for PR 58595 to gcc 4.8.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Thomas Petazzoni --- .../4.8.2/843-gcc-4.8.2-Fix-PR-target-58595.patch | 101 +++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 package/gcc/4.8.2/843-gcc-4.8.2-Fix-PR-target-58595.patch diff --git a/package/gcc/4.8.2/843-gcc-4.8.2-Fix-PR-target-58595.patch b/package/gcc/4.8.2/843-gcc-4.8.2-Fix-PR-target-58595.patch new file mode 100644 index 0000000..62a3994 --- /dev/null +++ b/package/gcc/4.8.2/843-gcc-4.8.2-Fix-PR-target-58595.patch @@ -0,0 +1,101 @@ +Backport fix for PR target/58595 + +From: jakub +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