From: Kirill Yukhin <kirill.yukhin@intel.com>
Date: Mon, 16 Jul 2012 14:08:42 +0000 (+0000)
Subject: Revert r189513.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aaba3304b2a43b12dd31b7b583cc87b038c52f9e;p=gcc.git

Revert r189513.

From-SVN: r189538
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bffd7bce32d..b85d4600318 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-16  Kirill Yukhin  <kirill.yukhin@intel.com>
+
+	Revert
+	2012-07-16 Sergey Melnikov <sergey.melnikov@intel.com>
+
+	* config/i386/i386.md (stack_protect_set): Disable the pattern
+	for Android since Android libc (bionic) does not provide random
+	value for stack protection guard at gs:0x14. Guard value
+	will be provided from external symbol (default implementation).
+	(stack_protect_set_<mode>): Likewise.
+	(stack_protect_test): Likewise.
+	(stack_protect_test_<mode>): Likewise.
+
 2012-07-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR middle-end/53959
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index a1c5b791282..49a56863617 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -17708,7 +17708,7 @@
 (define_expand "stack_protect_set"
   [(match_operand 0 "memory_operand")
    (match_operand 1 "memory_operand")]
-  "!OPTION_BIONIC"
+  ""
 {
   rtx (*insn)(rtx, rtx);
 
@@ -17733,7 +17733,7 @@
 		    UNSPEC_SP_SET))
    (set (match_scratch:PTR 2 "=&r") (const_int 0))
    (clobber (reg:CC FLAGS_REG))]
-  "!OPTION_BIONIC"
+  ""
   "mov{<imodesuffix>}\t{%1, %2|%2, %1}\;mov{<imodesuffix>}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2"
   [(set_attr "type" "multi")])
 
@@ -17751,7 +17751,7 @@
   [(match_operand 0 "memory_operand")
    (match_operand 1 "memory_operand")
    (match_operand 2)]
-  "!OPTION_BIONIC"
+  ""
 {
   rtx flags = gen_rtx_REG (CCZmode, FLAGS_REG);
 
@@ -17781,7 +17781,7 @@
 		     (match_operand:PTR 2 "memory_operand" "m")]
 		    UNSPEC_SP_TEST))
    (clobber (match_scratch:PTR 3 "=&r"))]
-  "!OPTION_BIONIC"
+  ""
   "mov{<imodesuffix>}\t{%1, %3|%3, %1}\;xor{<imodesuffix>}\t{%2, %3|%3, %2}"
   [(set_attr "type" "multi")])