gcc_4.5.1: add pr44290.patch
Add fix for PR44290 as proposed in http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44290 (From OE-Core rev: 94311ba57cd95b6b163d162587c6318da8c3b16a) Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
94a6e47402
commit
44f59d24d9
|
@ -59,6 +59,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
|
|||
file://COLLECT_GCC_OPTIONS.patch \
|
||||
file://use-defaults.h-and-t-oe-in-B.patch \
|
||||
file://pr43810.patch \
|
||||
file://pr44290.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
|
||||
|
|
|
@ -0,0 +1,119 @@
|
|||
From cb13264f07c419149b86e19c2187729bda8dd47d Mon Sep 17 00:00:00 2001
|
||||
From: jiez <jiez@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Fri, 23 Jul 2010 14:47:46 +0000
|
||||
Subject: [PATCH 2/6] PR target/44290 * attribs.c (decl_attributes): Insert "noinline" and "noclone" if "naked". * tree-sra.c (ipa_sra_preliminary_function_checks): Return false if ! tree_versionable_function_p.
|
||||
|
||||
testsuite/
|
||||
PR target/44290
|
||||
* gcc.dg/pr44290-1.c: New test.
|
||||
* gcc.dg/pr44290-2.c: New test.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162466 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
gcc/attribs.c | 13 +++++++++++++
|
||||
gcc/testsuite/gcc.dg/pr44290-1.c | 18 ++++++++++++++++++
|
||||
gcc/testsuite/gcc.dg/pr44290-2.c | 24 ++++++++++++++++++++++++
|
||||
gcc/tree-sra.c | 7 +++++++
|
||||
4 files changed, 62 insertions(+), 0 deletions(-)
|
||||
create mode 100644 gcc/testsuite/gcc.dg/pr44290-1.c
|
||||
create mode 100644 gcc/testsuite/gcc.dg/pr44290-2.c
|
||||
|
||||
diff --git a/gcc/attribs.c b/gcc/attribs.c
|
||||
index 4d91a0d..2e06608 100644
|
||||
--- a/gcc/attribs.c
|
||||
+++ b/gcc/attribs.c
|
||||
@@ -278,6 +278,19 @@ decl_attributes (tree *node, tree attributes, int flags)
|
||||
TREE_VALUE (cur_attr) = chainon (opts, TREE_VALUE (cur_attr));
|
||||
}
|
||||
|
||||
+ /* A "naked" function attribute implies "noinline" and "noclone" for
|
||||
+ those targets that support it. */
|
||||
+ if (TREE_CODE (*node) == FUNCTION_DECL
|
||||
+ && lookup_attribute_spec (get_identifier ("naked"))
|
||||
+ && lookup_attribute ("naked", attributes) != NULL)
|
||||
+ {
|
||||
+ if (lookup_attribute ("noinline", attributes) == NULL)
|
||||
+ attributes = tree_cons (get_identifier ("noinline"), NULL, attributes);
|
||||
+
|
||||
+ if (lookup_attribute ("noclone", attributes) == NULL)
|
||||
+ attributes = tree_cons (get_identifier ("noclone"), NULL, attributes);
|
||||
+ }
|
||||
+
|
||||
targetm.insert_attributes (*node, &attributes);
|
||||
|
||||
for (a = attributes; a; a = TREE_CHAIN (a))
|
||||
diff --git a/gcc/testsuite/gcc.dg/pr44290-1.c b/gcc/testsuite/gcc.dg/pr44290-1.c
|
||||
new file mode 100644
|
||||
index 0000000..071a271
|
||||
--- /dev/null
|
||||
+++ b/gcc/testsuite/gcc.dg/pr44290-1.c
|
||||
@@ -0,0 +1,18 @@
|
||||
+/* { dg-do compile { target arm*-*-* avr-*-* mcore-*-* rx-*-* spu-*-* } } */
|
||||
+/* { dg-options "-O2 -fdump-tree-optimized" } */
|
||||
+
|
||||
+static void __attribute__((naked))
|
||||
+foo(void *from, void *to)
|
||||
+{
|
||||
+ asm volatile("dummy"::"r"(from), "r"(to));
|
||||
+}
|
||||
+
|
||||
+unsigned int fie[2];
|
||||
+
|
||||
+void fum(void *to)
|
||||
+{
|
||||
+ foo(fie, to);
|
||||
+}
|
||||
+
|
||||
+/* { dg-final { scan-tree-dump "foo \\\(void \\\* from, void \\\* to\\\)" "optimized" } } */
|
||||
+/* { dg-final { cleanup-tree-dump "optimized" } } */
|
||||
diff --git a/gcc/testsuite/gcc.dg/pr44290-2.c b/gcc/testsuite/gcc.dg/pr44290-2.c
|
||||
new file mode 100644
|
||||
index 0000000..1951a51
|
||||
--- /dev/null
|
||||
+++ b/gcc/testsuite/gcc.dg/pr44290-2.c
|
||||
@@ -0,0 +1,24 @@
|
||||
+/* { dg-do compile { target arm*-*-* avr-*-* mcore-*-* rx-*-* spu-*-* } } */
|
||||
+/* { dg-options "-O2 -fdump-tree-optimized" } */
|
||||
+
|
||||
+static unsigned long __attribute__((naked))
|
||||
+foo (unsigned long base)
|
||||
+{
|
||||
+ asm volatile ("dummy");
|
||||
+}
|
||||
+unsigned long
|
||||
+bar (void)
|
||||
+{
|
||||
+ static int start, set;
|
||||
+
|
||||
+ if (!set)
|
||||
+ {
|
||||
+ set = 1;
|
||||
+ start = foo (0);
|
||||
+ }
|
||||
+
|
||||
+ return foo (start);
|
||||
+}
|
||||
+
|
||||
+/* { dg-final { scan-tree-dump "foo \\\(long unsigned int base\\\)" "optimized" } } */
|
||||
+/* { dg-final { cleanup-tree-dump "optimized" } } */
|
||||
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
|
||||
index 6a5b577..ea37d97 100644
|
||||
--- a/gcc/tree-sra.c
|
||||
+++ b/gcc/tree-sra.c
|
||||
@@ -4126,6 +4126,13 @@ modify_function (struct cgraph_node *node, ipa_parm_adjustment_vec adjustments)
|
||||
static bool
|
||||
ipa_sra_preliminary_function_checks (struct cgraph_node *node)
|
||||
{
|
||||
+ if (!tree_versionable_function_p (current_function_decl))
|
||||
+ {
|
||||
+ if (dump_file)
|
||||
+ fprintf (dump_file, "Function isn't allowed to be versioned.\n");
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
if (!cgraph_node_can_be_local_p (node))
|
||||
{
|
||||
if (dump_file)
|
||||
--
|
||||
1.7.4
|
||||
|
Loading…
Reference in New Issue