aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2019-02-21 18:59:00 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2019-02-21 10:59:00 -0800
commitf43044a3d7856c6d8b88c706d1e078268e12f7af (patch)
treeac4d8e0264dfacf90c41e1540351ed2f1aaf7896 /gcc
parent7b45322a5e5030d386a3ad3f747f5e390be4d3ff (diff)
downloadgcc-f43044a3d7856c6d8b88c706d1e078268e12f7af.zip
gcc-f43044a3d7856c6d8b88c706d1e078268e12f7af.tar.gz
gcc-f43044a3d7856c6d8b88c706d1e078268e12f7af.tar.bz2
i386: Replace -fcf-protection with -fcf-protection=branch
Since -mindirect-branch is incompatible with -fcf-protection=return and -fcf-protection, replace -fcf-protection with -fcf-protection=branch. PR target/87412 * gcc.target/i386/indirect-thunk-attr-14.c: Replace -fcf-protection with -fcf-protection=branch. * gcc.target/i386/indirect-thunk-attr-15.c: Likewise. * gcc.target/i386/indirect-thunk-attr-16.c: Likewise. * gcc.target/i386/indirect-thunk-extern-8.c: Likewise. * gcc.target/i386/indirect-thunk-extern-9.c: Likewise. * gcc.target/i386/indirect-thunk-extern-10.c: Likewise. From-SVN: r269074
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog11
-rw-r--r--gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c2
7 files changed, 17 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8d51a72..0093df6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2019-02-21 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/87412
+ * gcc.target/i386/indirect-thunk-attr-14.c: Replace
+ -fcf-protection with -fcf-protection=branch.
+ * gcc.target/i386/indirect-thunk-attr-15.c: Likewise.
+ * gcc.target/i386/indirect-thunk-attr-16.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-8.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-9.c: Likewise.
+ * gcc.target/i386/indirect-thunk-extern-10.c: Likewise.
+
2019-02-21 Wilco Dijkstra <wdijkstr@arm.com>
* gcc.target/arm/pr88850-2.c: Block -mfloat-abi override.
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c
index eb25139..8516be5 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection=branch" } */
extern void (*bar) (void);
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c
index 1ad459e..28eafba 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection=branch" } */
extern void (*bar) (void);
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c
index 86fe035..737d85d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection=branch" } */
extern void (*bar) (void) __attribute__((nocf_check));
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c
index 95731d6..539781c 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection=branch" } */
extern void (*bar) (void) __attribute__((nocf_check));
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c
index 0c61516..2cef59d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection=branch" } */
extern void (*bar) (void);
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c
index 731d4c4..a579cdd 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c
@@ -1,5 +1,5 @@
/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection=branch" } */
extern void (*bar) (void);