From d21140fb6ce1b3c358d9186421f0bc13598af415 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Mon, 26 Jun 2023 14:31:18 -0400 Subject: [PATCH] 11.4.1-2.1 Use -fno-stack-protector to fix bit-field aarch64 tests Resolves: #2213221 --- gcc.spec | 3 + gcc11-testsuite-fixes-2.patch | 134 ++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 gcc11-testsuite-fixes-2.patch diff --git a/gcc.spec b/gcc.spec index e2bbbbc..1d508d4 100644 --- a/gcc.spec +++ b/gcc.spec @@ -292,6 +292,7 @@ Patch28: gcc11-s390x-regarg-2.patch Patch29: gcc11-s390x-regarg-3.patch Patch30: gcc11-testsuite-fixes.patch Patch31: gcc11-pr96024.patch +Patch32: gcc11-testsuite-fixes-2.patch Patch100: gcc11-fortran-fdec-duplicates.patch Patch101: gcc11-fortran-flogical-as-integer.patch @@ -889,6 +890,7 @@ mark them as cross compiled. %patch29 -p1 -b .s390x-regarg-3~ %patch30 -p1 -b .testsuite~ %patch31 -p1 -b .pr96024~ +%patch32 -p1 -b .testsuite2~ %if 0%{?rhel} >= 9 %patch100 -p1 -b .fortran-fdec-duplicates~ @@ -3584,6 +3586,7 @@ end %changelog * Fri Jun 9 2023 Marek Polacek 11.4.1-2.1 - fix ICE on pr96024.f90 on big-endian hosts (PR fortran/96024, #2213211) +- use -fno-stack-protector to fix bit-field aarch64 tests (#2213221) * Mon Jun 5 2023 Marek Polacek 11.4.1-2 - update from releases/gcc-11-branch (#2193180) diff --git a/gcc11-testsuite-fixes-2.patch b/gcc11-testsuite-fixes-2.patch new file mode 100644 index 0000000..38ef12f --- /dev/null +++ b/gcc11-testsuite-fixes-2.patch @@ -0,0 +1,134 @@ +commit 74833b3165865a9373506f447720cf20f29c20c8 +Author: Christophe Lyon +Date: Tue Jan 17 13:10:10 2023 +0000 + + aarch64: add -fno-stack-protector to some tests [PR108411] + + As discussed in the PR, these recently added tests fail when the + testsuite is executed with -fstack-protector-strong. To avoid this, + this patch adds -fno-stack-protector to dg-options. + + PR target/108411 + gcc/testsuite + * g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C: Add + -fno-stack-protector. + * g++.target/aarch64/bitfield-abi-warning-align16-O2.C: Likewise. + * g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C: Likewise. + * g++.target/aarch64/bitfield-abi-warning-align32-O2.C: Likewise. + * g++.target/aarch64/bitfield-abi-warning-align8-O2.C: Likewise. + * gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c: Likewise. + * gcc.target/aarch64/bitfield-abi-warning-align16-O2.c: Likewise. + * gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c: Likewise. + * gcc.target/aarch64/bitfield-abi-warning-align32-O2.c: Likewise. + * gcc.target/aarch64/bitfield-abi-warning-align8-O2.c: Likewise. + +diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C +index 443cd458b4c..52f9cdd1ee9 100644 +--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C ++++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */ + + #define ALIGN 16 + //#define EXTRA +diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C +index 76a7e3d0ad4..9ff4e46645b 100644 +--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C ++++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */ + + #define ALIGN 16 + #define EXTRA +diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C +index 6f8f54f41ff..55dcbfe4b7c 100644 +--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C ++++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */ + + #define ALIGN 32 + //#define EXTRA +diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C +index 6b8ad5fbea1..6bb8778ee90 100644 +--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C ++++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */ + + #define ALIGN 32 + #define EXTRA +diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C +index b1764d97ea0..41bcc894a2b 100644 +--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C ++++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */ + + #define ALIGN 8 + #define EXTRA +diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c +index f248a129509..3b2c932ac23 100644 +--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c ++++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps" } */ + + #define ALIGN 16 + //#define EXTRA +diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c +index 22ee5ec4c92..ee5d6faa428 100644 +--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c ++++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps" } */ + + #define ALIGN 16 + #define EXTRA +diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c +index a8a50b35e8e..6d4a883a96e 100644 +--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c ++++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps" } */ + + #define ALIGN 32 + //#define EXTRA +diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c +index e872de3dbe0..331daba354c 100644 +--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c ++++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps" } */ + + #define ALIGN 32 + #define EXTRA +diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c +index cb2a945a819..e6d45f5dd5c 100644 +--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c ++++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -save-temps" } */ ++/* { dg-options "-O2 -fno-stack-protector -save-temps" } */ + + #define ALIGN 8 + #define EXTRA