!6 change GCC base version

Merge pull request !6 from eastb233/gcc-9.3

address-calculation-optimization-within-loop.patch

@@ -55,3 +55,14 @@ diff -Nurp a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
  	  || !is_widening_mult_p (rhs2_stmt, &type1, &mult_rhs1,
  				  &type2, &mult_rhs2))
  	return false;
+diff -Nurp a/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c b/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c
+--- a/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c	2020-03-31 09:51:36.000000000 +0800
++++ b/gcc/testsuite/gcc.target/aarch64/sve/var_stride_1.c	2020-04-29 10:55:44.937471475 +0800
+@@ -17,7 +17,6 @@ f (TYPE *x, TYPE *y, unsigned short n, l
+ /* { dg-final { scan-assembler {\tstr\tw[0-9]+} } } */
+ /* Should multiply by (VF-1)*4 rather than (257-1)*4.  */
+ /* { dg-final { scan-assembler-not {, 1024} } } */
+-/* { dg-final { scan-assembler-not {\t.bfiz\t} } } */
+ /* { dg-final { scan-assembler-not {lsl[^\n]*[, ]10} } } */
+ /* { dg-final { scan-assembler-not {\tcmp\tx[0-9]+, 0} } } */
+ /* { dg-final { scan-assembler-not {\tcmp\tw[0-9]+, 0} } } */

change-gcc-BASE-VER.patch

@@ -0,0 +1,17 @@
+diff -uprN a/gcc/BASE-VER b/gcc/BASE-VER
+--- a/gcc/BASE-VER	2020-03-31 09:51:52.000000000 +0800
++++ b/gcc/BASE-VER	2020-05-14 16:45:36.416688565 +0800
+@@ -1 +1 @@
+-9.3.0
++9.3.1
+diff -uprN a/gcc/ChangeLog b/gcc/ChangeLog
+--- a/gcc/ChangeLog	2020-03-31 09:51:30.000000000 +0800
++++ b/gcc/ChangeLog	2020-05-14 16:45:36.420688565 +0800
+@@ -1,3 +1,7 @@
++2020-03-12  openEuler
++
++	* BASE-VER: Set to 9.3.1.
++
+ 2020-03-12  Release Manager
+ 
+ 	* GCC 9.3.0 released.

gcc.spec

@@ -1,7 +1,7 @@
-%global DATE 20200428
+%global DATE 20200520
 
-%global gcc_version 9.3.0
-%global gcc_major 9.3.0
+%global gcc_version 9.3.1
+%global gcc_major 9.3.1
 %global gcc_release 20200312
 %global _unpackaged_files_terminate_build 0
 %global _performance_build 1
@@ -62,7 +62,7 @@ Name: gcc
 Version: %{gcc_version}
 Release: %{gcc_release}.h1
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
-Source0: gcc-%{version}.tar.xz
+Source0: gcc-9.3.0.tar.xz
 %global isl_version 0.16.1
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -130,6 +130,7 @@ Patch14: fix-regno-out-of-range.patch
 Patch15: fix-ICE-in-vectorizable-load.patch
 Patch16: address-calculation-optimization-within-loop.patch
 Patch17: skip-debug-insns-when-computing-inline-costs.patch
+Patch18: change-gcc-BASE-VER.patch
 
 %global gcc_target_platform %{_arch}-linux-gnu
 
@@ -568,7 +569,7 @@ for compiling GCC plugins.  The GCC plugin ABI is currently
 not stable, so plugins must be rebuilt any time GCC is updated.
 
 %prep
-%setup -q -n gcc-%{version}
+%setup -q -n gcc-9.3.0
 /bin/pwd
 
 %patch0 -p1
@@ -589,6 +590,7 @@ not stable, so plugins must be rebuilt any time GCC is updated.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 
 %build
@@ -2517,6 +2519,12 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Wed May 20 2020 eastb233 <xiezhiheng@huawei.com> - 9.3.1-20200312.h1
+- address-calculation-optimization-within-loop.patch: Modify testsuite
+- generate-csel.patch: Modify testsuite
+- change-gcc-BASE-VER.patch: New file, change GCC base version
+- gcc.spec: Add new Patch, change GCC version to 9.3.1
+
 * Tue Apr 28 2020 eastb233 <xiezhiheng@huawei.com> - 9.3.0-20200312.h1
 - Type:modify
 - Desc:modify patch name and gcc.spec

generate-csel.patch

@@ -1,3 +1,13 @@
+diff -uprN a/gcc/testsuite/gcc.dg/graphite/scop-21.c b/gcc/testsuite/gcc.dg/graphite/scop-21.c
+--- a/gcc/testsuite/gcc.dg/graphite/scop-21.c
++++ b/gcc/testsuite/gcc.dg/graphite/scop-21.c
+@@ -30,5 +30,4 @@ int test ()
+
+   return a[20];
+ }
+-/* XFAILed by the fix for PR86865.  */
+-/* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } } */
++/* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" } } */
 diff -uprN a/gcc/testsuite/gcc.dg/tree-ssa/pr89430-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr89430-1.c
 new file mode 100644
 --- /dev/null