From e76c8e5612bc29569d90b3926eb761934251d97d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 19 Jan 2019 18:28:29 +0100 Subject: [PATCH] aarch64.c (aarch64_stack_protect_guard): Move outside of #if CHECKING_P code. * config/aarch64/aarch64.c (aarch64_stack_protect_guard): Move outside of #if CHECKING_P code. From-SVN: r268095 --- gcc/ChangeLog | 5 +++++ gcc/config/aarch64/aarch64.c | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4a4a8ed973c..01d4e7e6bb0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-01-19 Jakub Jelinek + + * config/aarch64/aarch64.c (aarch64_stack_protect_guard): Move + outside of #if CHECKING_P code. + 2019-01-19 Richard Sandiford * gimple-loop-versioning.cc (loop_versioning::dump_inner_likelihood): diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index e13badaf6cf..5df5a8b7843 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -18662,6 +18662,19 @@ aarch64_simd_clone_usable (struct cgraph_node *node) } } +/* Implement TARGET_STACK_PROTECT_GUARD. In case of a + global variable based guard use the default else + return a null tree. */ +static tree +aarch64_stack_protect_guard (void) +{ + if (aarch64_stack_protector_guard == SSP_GLOBAL) + return default_stack_protect_guard (); + + return NULL_TREE; +} + + /* Target-specific selftests. */ #if CHECKING_P @@ -18706,19 +18719,6 @@ aarch64_run_selftests (void) } // namespace selftest -/* Implement TARGET_STACK_PROTECT_GUARD. In case of a - global variable based guard use the default else - return a null tree. */ -static tree -aarch64_stack_protect_guard (void) -{ - if (aarch64_stack_protector_guard == SSP_GLOBAL) - return default_stack_protect_guard (); - - return NULL_TREE; -} - - #endif /* #if CHECKING_P */ #undef TARGET_STACK_PROTECT_GUARD -- 2.30.2