re PR sanitizer/59122 (libsanitizer merge from upstream r191666 causes duplicate...

	PR sanitizer/59122
	* asan.c (asan_emit_stack_protection): Ensure -fsection-anchors
	isn't confused by the artificial decl.

From-SVN: r204801

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 307ac548e56473e0432b79abd32b15458d45859e..8d0d89352f63dbed8fd2b31cb9aa5ba9baa3a221 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-14  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/59122
+       * asan.c (asan_emit_stack_protection): Ensure -fsection-anchors
+       isn't confused by the artificial decl.
+
 2013-11-14  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * config/rs6000/rs6000.c (rs6000_emit_prologue): Do not place a

diff --git a/gcc/asan.c b/gcc/asan.c
index 9b6f96872ec87c2ec738b407acfed34ddf9e8ebc..a3fb51fa8dbf552dd28329b1f7f1d8f49254c844 100644 (file)
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1002,6 +1002,9 @@ asan_emit_stack_protection (rtx base, HOST_WIDE_INT *offsets, tree *decls,
   TREE_STATIC (decl) = 1;
   TREE_PUBLIC (decl) = 0;
   TREE_USED (decl) = 1;
+  DECL_INITIAL (decl) = decl;
+  TREE_ASM_WRITTEN (decl) = 1;
+  TREE_ASM_WRITTEN (id) = 1;
   emit_move_insn (mem, expand_normal (build_fold_addr_expr (decl)));
   shadow_base = expand_binop (Pmode, lshr_optab, base,
                              GEN_INT (ASAN_SHADOW_SHIFT),