From: mkuvyrkov <mkuvyrkov@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 12 May 2010 11:05:19 +0000 (+0000)
Subject: 	* targhooks.c (default_stack_protect_guard): Avoid sharing RTL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5d5f0d6d03083ab37fc960f3b3f3302922fdd82;p=thirdparty%2Fgcc.git

	* targhooks.c (default_stack_protect_guard): Avoid sharing RTL
	for __stack_chk_guard.

	* gcc.target/m68k/20100512-1.c: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159310 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9b67952f1df..b63cde5115b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-12  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* targhooks.c (default_stack_protect_guard): Avoid sharing RTL
+	for __stack_chk_guard.
+
 2010-05-11  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-opts.c (c_common_parse_file): If start_end_main_source_file,
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 8df0de421f81..2c0a65dc9263 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -499,6 +499,8 @@ default_stack_protect_guard (void)
 
   if (t == NULL)
     {
+      rtx x;
+
       t = build_decl (UNKNOWN_LOCATION,
 		      VAR_DECL, get_identifier ("__stack_chk_guard"),
 		      ptr_type_node);
@@ -510,6 +512,11 @@ default_stack_protect_guard (void)
       DECL_ARTIFICIAL (t) = 1;
       DECL_IGNORED_P (t) = 1;
 
+      /* Do not share RTL as the declaration is visible outside of
+	 current function.  */
+      x = DECL_RTL (t);
+      RTX_FLAG (x, used) = 1;
+
       stack_chk_guard_decl = t;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a1275c845c7b..4daeaa6b6b72 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-12  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* gcc.target/m68k/20100512-1.c: New.
+
 2010-05-12  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/lto8.adb: New test.
diff --git a/gcc/testsuite/gcc.target/m68k/20100512-1.c b/gcc/testsuite/gcc.target/m68k/20100512-1.c
new file mode 100644
index 000000000000..d07bb519abc1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/20100512-1.c
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fstack-protector" } */
+/* { dg-require-effective-target fstack_protector } */
+/* There should be 2 references to __stack_chk_guard in every function.  */
+/* { dg-final { scan-assembler-times "__stack_chk_guard" 4 } } */
+
+#include <stdlib.h>
+#include <string.h>
+void doTest1(void) {
+  volatile char foo[10];
+  memset((void *)foo, 1, 100);
+}
+void doTest2(void) {
+  volatile char foo[10];
+  memset((void *)foo, 1, 100);
+}