From: Sam Tebbs <sam.tebbs@arm.com>
Date: Thu, 30 May 2019 12:26:14 +0000 (+0000)
Subject: [PATCH][GCC][AARCH64] Fix libstdc++ build failure after r271735
X-Git-Tag: misc/cutover-git~5156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e2e15abd0765c1866f36f0312f77c9595e7fdec;p=thirdparty%2Fgcc.git

[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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 57533478f716..2f6c2a2ea2c0 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 9e4b335244ac..757a6210ab7d 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");
 }