From 81e9dbf59b8d8e2c97c7b69f19d9a2bbaec9f958 Mon Sep 17 00:00:00 2001 From: huang-xiaoquan Date: Wed, 28 Jun 2023 10:38:39 +0800 Subject: [PATCH] [Sync] Sync patch from openeuler/gcc --- ...-ftree-fold-phiopt-to-avoid-fail-NFC.patch | 143 ++++++++++++++++++ gcc.spec | 10 +- 2 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 0103-test-Add-option-ftree-fold-phiopt-to-avoid-fail-NFC.patch diff --git a/0103-test-Add-option-ftree-fold-phiopt-to-avoid-fail-NFC.patch b/0103-test-Add-option-ftree-fold-phiopt-to-avoid-fail-NFC.patch new file mode 100644 index 0000000..6bc7758 --- /dev/null +++ b/0103-test-Add-option-ftree-fold-phiopt-to-avoid-fail-NFC.patch @@ -0,0 +1,143 @@ +From 1d0bbeb4171f21baf18db6a802bd0b9685e2d25b Mon Sep 17 00:00:00 2001 +From: zhongyunde +Date: Tue, 20 Jun 2023 08:59:57 +0800 +Subject: [PATCH] [test] Add option -ftree-fold-phiopt to avoid fail, NFC + +Fix https://gitee.com/openeuler/gcc/issues/I7EQCC?from=project-issue +--- + gcc/testsuite/c-c++-common/ubsan/pr85213.c | 2 +- + gcc/testsuite/gcc.dg/uninit-8.c | 2 +- + gcc/testsuite/gcc.target/aarch64/bics_3.c | 2 +- + gcc/testsuite/gcc.target/aarch64/scalar-vca.c | 2 +- + gcc/testsuite/gcc.target/aarch64/scalar_intrinsics.c | 2 +- + gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c | 2 +- + gcc/testsuite/gcc.target/aarch64/simd/vcaled_f64.c | 2 +- + gcc/testsuite/gcc.target/aarch64/simd/vcales_f32.c | 2 +- + gcc/testsuite/gcc.target/aarch64/simd/vcaltd_f64.c | 2 +- + gcc/testsuite/gcc.target/aarch64/simd/vcalts_f32.c | 2 +- + 10 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/gcc/testsuite/c-c++-common/ubsan/pr85213.c b/gcc/testsuite/c-c++-common/ubsan/pr85213.c +index 8a6be81d2..804c29da7 100644 +--- a/gcc/testsuite/c-c++-common/ubsan/pr85213.c ++++ b/gcc/testsuite/c-c++-common/ubsan/pr85213.c +@@ -1,6 +1,6 @@ + /* PR sanitizer/85213 */ + /* { dg-do compile } */ +-/* { dg-options "-O1 -fsanitize=undefined -fcompare-debug" } */ ++/* { dg-options "-O1 -ftree-fold-phiopt -fsanitize=undefined -fcompare-debug" } */ + + int + foo (int x) +diff --git a/gcc/testsuite/gcc.dg/uninit-8.c b/gcc/testsuite/gcc.dg/uninit-8.c +index 98700f4aa..e8fd942cf 100644 +--- a/gcc/testsuite/gcc.dg/uninit-8.c ++++ b/gcc/testsuite/gcc.dg/uninit-8.c +@@ -3,7 +3,7 @@ + May be the same as uninit-1.c. */ + + /* { dg-do compile } */ +-/* { dg-options "-O -Wuninitialized" } */ ++/* { dg-options "-O -ftree-fold-phiopt -Wuninitialized" } */ + + #include + +diff --git a/gcc/testsuite/gcc.target/aarch64/bics_3.c b/gcc/testsuite/gcc.target/aarch64/bics_3.c +index 3257df622..ab6f0210e 100644 +--- a/gcc/testsuite/gcc.target/aarch64/bics_3.c ++++ b/gcc/testsuite/gcc.target/aarch64/bics_3.c +@@ -1,5 +1,5 @@ + /* { dg-do run } */ +-/* { dg-options "-O2 --save-temps" } */ ++/* { dg-options "-O2 -ftree-fold-phiopt --save-temps" } */ + + extern void abort (void); + +diff --git a/gcc/testsuite/gcc.target/aarch64/scalar-vca.c b/gcc/testsuite/gcc.target/aarch64/scalar-vca.c +index 40a359725..58ce99328 100644 +--- a/gcc/testsuite/gcc.target/aarch64/scalar-vca.c ++++ b/gcc/testsuite/gcc.target/aarch64/scalar-vca.c +@@ -1,5 +1,5 @@ + /* { dg-do run } */ +-/* { dg-options "-O3 --save-temps" } */ ++/* { dg-options "-O3 -ftree-fold-phiopt --save-temps" } */ + + #include + +diff --git a/gcc/testsuite/gcc.target/aarch64/scalar_intrinsics.c b/gcc/testsuite/gcc.target/aarch64/scalar_intrinsics.c +index c2e13b651..bcd7e4c83 100644 +--- a/gcc/testsuite/gcc.target/aarch64/scalar_intrinsics.c ++++ b/gcc/testsuite/gcc.target/aarch64/scalar_intrinsics.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O2 -dp" } */ ++/* { dg-options "-O2 -ftree-fold-phiopt -dp" } */ + + #include + +diff --git a/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c b/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c +index f2c55922f..3f989257b 100644 +--- a/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c ++++ b/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c +@@ -1,5 +1,5 @@ + /* { dg-do compile } */ +-/* { dg-options "-O3 -fno-inline" } */ ++/* { dg-options "-O3 -ftree-fold-phiopt -fno-inline" } */ + + /* Scan-assembler test, so, incorporate as little other code as possible. */ + +diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vcaled_f64.c b/gcc/testsuite/gcc.target/aarch64/simd/vcaled_f64.c +index 198b18b4e..357d0f61a 100644 +--- a/gcc/testsuite/gcc.target/aarch64/simd/vcaled_f64.c ++++ b/gcc/testsuite/gcc.target/aarch64/simd/vcaled_f64.c +@@ -1,7 +1,7 @@ + /* Test the vcaled_f64 AArch64 SIMD intrinsic. */ + + /* { dg-do run } */ +-/* { dg-options "-save-temps -O3" } */ ++/* { dg-options "-save-temps -O3 -ftree-fold-phiopt" } */ + + #include "arm_neon.h" + +diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vcales_f32.c b/gcc/testsuite/gcc.target/aarch64/simd/vcales_f32.c +index 6b58501f3..a2b5a5f50 100644 +--- a/gcc/testsuite/gcc.target/aarch64/simd/vcales_f32.c ++++ b/gcc/testsuite/gcc.target/aarch64/simd/vcales_f32.c +@@ -1,7 +1,7 @@ + /* Test the vcales_f32 AArch64 SIMD intrinsic. */ + + /* { dg-do run } */ +-/* { dg-options "-save-temps -O3" } */ ++/* { dg-options "-save-temps -O3 -ftree-fold-phiopt" } */ + + #include "arm_neon.h" + +diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vcaltd_f64.c b/gcc/testsuite/gcc.target/aarch64/simd/vcaltd_f64.c +index 50a3b2718..d77f68378 100644 +--- a/gcc/testsuite/gcc.target/aarch64/simd/vcaltd_f64.c ++++ b/gcc/testsuite/gcc.target/aarch64/simd/vcaltd_f64.c +@@ -1,7 +1,7 @@ + /* Test the vcaltd_f64 AArch64 SIMD intrinsic. */ + + /* { dg-do run } */ +-/* { dg-options "-save-temps -O3" } */ ++/* { dg-options "-save-temps -O3 -ftree-fold-phiopt" } */ + + #include "arm_neon.h" + +diff --git a/gcc/testsuite/gcc.target/aarch64/simd/vcalts_f32.c b/gcc/testsuite/gcc.target/aarch64/simd/vcalts_f32.c +index 1807e0b95..d723b9ac5 100644 +--- a/gcc/testsuite/gcc.target/aarch64/simd/vcalts_f32.c ++++ b/gcc/testsuite/gcc.target/aarch64/simd/vcalts_f32.c +@@ -1,7 +1,7 @@ + /* Test the vcalts_f32 AArch64 SIMD intrinsic. */ + + /* { dg-do run } */ +-/* { dg-options "-save-temps -O3" } */ ++/* { dg-options "-save-temps -O3 -ftree-fold-phiopt" } */ + + #include "arm_neon.h" + +-- +2.33.0 + diff --git a/gcc.spec b/gcc.spec index 2302f66..12430e4 100644 --- a/gcc.spec +++ b/gcc.spec @@ -61,7 +61,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: 36 +Release: 37 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD URL: https://gcc.gnu.org @@ -210,6 +210,7 @@ Patch99: 0099-Struct-Reorg-Add-escape-propagate-on-external-functi.patch Patch100: 0100-PGO-kernel-Add-fkernel-pgo-option-to-support-PGO-ker.patch Patch101: 0101-To-resolve-the-SPEC-.548-fluctuation-problem-revert-.patch Patch102: 0102-GOMP-Enabling-moutline-atomics-improves-libgomp-perf.patch +Patch103: 0103-test-Add-option-ftree-fold-phiopt-to-avoid-fail-NFC.patch %global gcc_target_platform %{_arch}-linux-gnu @@ -765,6 +766,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %build @@ -2789,6 +2791,12 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Wed Jun 28 2023 dingguangya - 10.3.1-37 +- Type:Spec +- ID:NA +- SUG:NA +- DESC: Sync patch from openeuler/gcc + * Mon Jun 19 2023 dingguangya - 10.3.1-36 - Type:Spec - ID:NA -- Gitee