From 4bd5abcae190858b0c1408f6d6f9d33481d18dbb Mon Sep 17 00:00:00 2001 From: Sergey Melnikov Date: Wed, 25 Jul 2012 10:33:20 +0000 Subject: [PATCH] i386.md (stack_protect_set): Disable the pattern for Android since Android libc (bionic) does not provide... 2012-07-25 Sergey Melnikov * 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_): Likewise. (stack_protect_test): Likewise. (stack_protect_test_): Likewise. * gcc/defaults.h: Define macro TARGET_HAS_BIONIC to 0 - target does not have Bionic by default * config/linux.h: Redefine macro TARGET_HAS_BIONIC to (OPTION_BIONIC) Macro OPTION_BIONIC is defined in this file and provides Bionic accessibility status From-SVN: r189840 --- gcc/ChangeLog | 15 +++++++++++++++ gcc/config/i386/i386.md | 8 ++++---- gcc/config/linux.h | 4 ++++ gcc/defaults.h | 5 +++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d79da22e9f12..60314f5f6bf2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2012-07-25 Sergey Melnikov + + * 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_): Likewise. + (stack_protect_test): Likewise. + (stack_protect_test_): Likewise. + * gcc/defaults.h: Define macro TARGET_HAS_BIONIC to 0 - target does + not have Bionic by default + * config/linux.h: Redefine macro TARGET_HAS_BIONIC to (OPTION_BIONIC) + Macro OPTION_BIONIC is defined in this file and provides Bionic + accessibility status + 2012-07-25 Steven Bosscher * gimple-pretty-print.c (gimple_dump_bb_buff): Call pp_flush. diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 6c2ac842bffb..6a446a31ca08 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -17677,7 +17677,7 @@ (define_expand "stack_protect_set" [(match_operand 0 "memory_operand") (match_operand 1 "memory_operand")] - "" + "!TARGET_HAS_BIONIC" { rtx (*insn)(rtx, rtx); @@ -17702,7 +17702,7 @@ UNSPEC_SP_SET)) (set (match_scratch:PTR 2 "=&r") (const_int 0)) (clobber (reg:CC FLAGS_REG))] - "" + "!TARGET_HAS_BIONIC" "mov{}\t{%1, %2|%2, %1}\;mov{}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2" [(set_attr "type" "multi")]) @@ -17720,7 +17720,7 @@ [(match_operand 0 "memory_operand") (match_operand 1 "memory_operand") (match_operand 2)] - "" + "!TARGET_HAS_BIONIC" { rtx flags = gen_rtx_REG (CCZmode, FLAGS_REG); @@ -17750,7 +17750,7 @@ (match_operand:PTR 2 "memory_operand" "m")] UNSPEC_SP_TEST)) (clobber (match_scratch:PTR 3 "=&r"))] - "" + "!TARGET_HAS_BIONIC" "mov{}\t{%1, %3|%3, %1}\;xor{}\t{%2, %3|%3, %2}" [(set_attr "type" "multi")]) diff --git a/gcc/config/linux.h b/gcc/config/linux.h index dbbeea5c7fdd..fb459e68028b 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -104,3 +104,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see /* Whether we have sincos that follows the GNU extension. */ #undef TARGET_HAS_SINCOS #define TARGET_HAS_SINCOS (OPTION_GLIBC || OPTION_BIONIC) + +/* Whether we have Bionic libc runtime */ +#undef TARGET_HAS_BIONIC +#define TARGET_HAS_BIONIC (OPTION_BIONIC) diff --git a/gcc/defaults.h b/gcc/defaults.h index cfd44babb0f7..316a1c31928f 100644 --- a/gcc/defaults.h +++ b/gcc/defaults.h @@ -1054,6 +1054,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define TARGET_HAS_SINCOS 0 #endif +/* Determin whether the target runtime library is Bionic */ +#ifndef TARGET_HAS_BIONIC +#define TARGET_HAS_BIONIC 0 +#endif + /* Indicate that CLZ and CTZ are undefined at zero. */ #ifndef CLZ_DEFINED_VALUE_AT_ZERO #define CLZ_DEFINED_VALUE_AT_ZERO(MODE, VALUE) 0 -- 2.39.5