From 5ed12b58ef022b5186edc6c31eb05addc828fd8b Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue, 18 Jun 2019 11:11:07 +0000
Subject: [PATCH] aarch64: fix gcc.target/aarch64/pcs_attribute-2.c on non-gnu
 targets

Move the ifunc symbol tests into a separate file with dg-require-ifunc.
And added a base pcs ifunc symbol to the test for completeness.

gcc/testsuite/ChangeLog:

	* gcc.target/aarch64/pcs_attribute-2.c: Remove ifunc usage.
	* gcc.target/aarch64/pcs_attribute-3.c: New test.

From-SVN: r272414
---
 gcc/testsuite/ChangeLog                       |  5 ++
 .../gcc.target/aarch64/pcs_attribute-2.c      | 21 -------
 .../gcc.target/aarch64/pcs_attribute-3.c      | 58 +++++++++++++++++++
 3 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/pcs_attribute-3.c

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56c4e7f1271..321565cdb3c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-18  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* gcc.target/aarch64/pcs_attribute-2.c: Remove ifunc usage.
+	* gcc.target/aarch64/pcs_attribute-3.c: New test.
+
 2019-06-18  Alejandro Martinez  <alejandro.martinezvicente@arm.com>
 	* gcc.target/aarch64/sve/fadda_1.c: New test.
 
diff --git a/gcc/testsuite/gcc.target/aarch64/pcs_attribute-2.c b/gcc/testsuite/gcc.target/aarch64/pcs_attribute-2.c
index d997f52921c..e85465f25fb 100644
--- a/gcc/testsuite/gcc.target/aarch64/pcs_attribute-2.c
+++ b/gcc/testsuite/gcc.target/aarch64/pcs_attribute-2.c
@@ -53,21 +53,6 @@ ATTR void bar_def_vpcs (void)
 {
 }
 
-static void (*f_ifunc_resolver ()) (void)
-{
-  return (void (*)(void))f_local_vpcs;
-}
-
-__attribute__ ((ifunc ("f_ifunc_resolver")))
-ATTR void f_ifunc_vpcs (void);
-
-__attribute__ ((visibility ("hidden")))
-__attribute__ ((ifunc ("f_ifunc_resolver")))
-ATTR void f_hidden_ifunc_vpcs (void);
-
-__attribute__ ((ifunc ("f_ifunc_resolver")))
-ATTR static void f_local_ifunc_vpcs (void);
-
 void (*refs_basepcs[]) (void) = {
 	f_undef_basepcs,
 	f_def_basepcs,
@@ -86,9 +71,6 @@ void (*ATTR refs_vpcs[]) (void) = {
 	f_local_weakref_def_vpcs,
 	bar_undef_vpcs,
 	bar_def_vpcs,
-	f_ifunc_vpcs,
-	f_hidden_ifunc_vpcs,
-	f_local_ifunc_vpcs,
 };
 
 /* Note: local symbols don't need .variant_pcs, but gcc generates it, so
@@ -109,6 +91,3 @@ void (*ATTR refs_vpcs[]) (void) = {
 /* { dg-final { scan-assembler-times {\.variant_pcs\tf_local_weakref_def_vpcs} 1 } } */
 /* { dg-final { scan-assembler-times {\.variant_pcs\tf_undef_renamed_vpcs} 1 } } */
 /* { dg-final { scan-assembler-times {\.variant_pcs\tf_def_renamed_vpcs} 1 } } */
-/* { dg-final { scan-assembler-times {\.variant_pcs\tf_ifunc_vpcs} 1 } } */
-/* { dg-final { scan-assembler-times {\.variant_pcs\tf_hidden_ifunc_vpcs} 1 } } */
-/* { dg-final { scan-assembler-times {\.variant_pcs\tf_local_ifunc_vpcs} 1 } } */
diff --git a/gcc/testsuite/gcc.target/aarch64/pcs_attribute-3.c b/gcc/testsuite/gcc.target/aarch64/pcs_attribute-3.c
new file mode 100644
index 00000000000..8e306af660f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/pcs_attribute-3.c
@@ -0,0 +1,58 @@
+/* { dg-do compile } */
+/* { dg-require-ifunc "" } */
+/* { dg-require-effective-target aarch64_variant_pcs } */
+
+/* Test that .variant_pcs is emitted for vector PCS symbol references.  */
+
+#define ATTR __attribute__ ((aarch64_vector_pcs))
+
+static void f_local_basepcs (void)
+{
+}
+
+static void (*f_ifunc_basepcs_resolver ()) (void)
+{
+  return (void (*)(void))f_local_basepcs;
+}
+
+__attribute__ ((ifunc ("f_ifunc_basepcs_resolver")))
+void f_ifunc_basepcs (void);
+
+ATTR static void f_local_vpcs (void)
+{
+}
+
+static void (*f_ifunc_vpcs_resolver ()) (void)
+{
+  return (void (*)(void))f_local_vpcs;
+}
+
+__attribute__ ((ifunc ("f_ifunc_vpcs_resolver")))
+ATTR void f_ifunc_vpcs (void);
+
+__attribute__ ((visibility ("hidden")))
+__attribute__ ((ifunc ("f_ifunc_vpcs_resolver")))
+ATTR void f_hidden_ifunc_vpcs (void);
+
+__attribute__ ((ifunc ("f_ifunc_vpcs_resolver")))
+ATTR static void f_local_ifunc_vpcs (void);
+
+void (*refs_basepcs[]) (void) = {
+	f_ifunc_basepcs,
+};
+
+void (*ATTR refs_vpcs[]) (void) = {
+	f_ifunc_vpcs,
+	f_hidden_ifunc_vpcs,
+	f_local_ifunc_vpcs,
+};
+
+/* Note: local symbols don't need .variant_pcs, but gcc generates it, so
+   we check them here.  */
+
+/* { dg-final { scan-assembler-not {\.variant_pcs\tf_local_basepcs} } } */
+/* { dg-final { scan-assembler-not {\.variant_pcs\tf_ifunc_basepcs} } } */
+/* { dg-final { scan-assembler-times {\.variant_pcs\tf_local_vpcs} 1 } } */
+/* { dg-final { scan-assembler-times {\.variant_pcs\tf_ifunc_vpcs} 1 } } */
+/* { dg-final { scan-assembler-times {\.variant_pcs\tf_hidden_ifunc_vpcs} 1 } } */
+/* { dg-final { scan-assembler-times {\.variant_pcs\tf_local_ifunc_vpcs} 1 } } */
-- 
2.30.2