aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Tebbs <sam.tebbs@arm.com>2019-05-30 12:26:14 +0000
committerSam Tebbs <samtebbs@gcc.gnu.org>2019-05-30 12:26:14 +0000
commit0e2e15abd0765c1866f36f0312f77c9595e7fdec (patch)
tree29a28ecfca1cfa002f11e5262b3e4209a1d19889
parentd4ecfa565cc8849d2475af5c485fc6dd27c6c4a8 (diff)
downloadgcc-0e2e15abd0765c1866f36f0312f77c9595e7fdec.zip
gcc-0e2e15abd0765c1866f36f0312f77c9595e7fdec.tar.gz
gcc-0e2e15abd0765c1866f36f0312f77c9595e7fdec.tar.bz2
[PATCH][GCC][AARCH64] Fix libstdc++ build failure after r271735
gcc/ChangeLog * aarch64/aarch64.c (aarch64_post_cfi_startproc): Add cfun->is_thunk check. From-SVN: r271780
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/aarch64/aarch64.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5753347..2f6c2a2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-30 Sam Tebbs <sam.tebbs@arm.com>
+
+ * aarch64/aarch64.c (aarch64_post_cfi_startproc): Add
+ cfun->is_thunk check.
+
2019-05-30 Jakub Jelinek <jakub@redhat.com>
* tree-predcom.c (is_inv_store_elimination_chain): Fix a typo - lenght
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 9e4b335..757a621 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -15370,7 +15370,7 @@ aarch64_declare_function_name (FILE *stream, const char* name,
void
aarch64_post_cfi_startproc (FILE *f, tree ignored ATTRIBUTE_UNUSED)
{
- if (aarch64_return_address_signing_enabled ()
+ if (!cfun->is_thunk && aarch64_return_address_signing_enabled ()
&& aarch64_ra_sign_key == AARCH64_KEY_B)
asm_fprintf (f, "\t.cfi_b_key_frame\n");
}