Merge branch 'riscv-collab:master' into master

17 files changed, 50 insertions, 97 deletions

diff --git a/.gitmodules b/.gitmodules
index 4f45627..6594e48 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
-[submodule "riscv-binutils"]
-	path = riscv-binutils
-	url = https://github.com/riscv-collab/riscv-binutils-gdb.git
-	branch = riscv-binutils-2.38
-[submodule "riscv-gcc"]
-	path = riscv-gcc
-	url = https://github.com/riscv-collab/riscv-gcc.git
-	branch = riscv-gcc-10.2.0
+[submodule "binutils"]
+	path = binutils
+	url = https://sourceware.org/git/binutils-gdb.git
+	branch = binutils-2_39-branch
+[submodule "gcc"]
+	path = gcc
+	url = https://gcc.gnu.org/git/gcc.git
+	branch = releases/gcc-12.1.0
 [submodule "glibc"]
 	path = glibc
 	url = https://sourceware.org/git/glibc.git
@@ -23,7 +23,7 @@
 	branch = fsf-gdb-10.1-with-sim
 [submodule "qemu"]
 	path = qemu
-	url = https://git.qemu.org/git/qemu.git
+	url = https://gitlab.com/qemu-project/qemu.git
 [submodule "musl"]
 	path = musl
 	url = git://git.musl-libc.org/musl
diff --git a/binutils b/binutils
new file mode 160000
+Subproject b51c2fec1da205ea3e7354cbb3e253018d64873
diff --git a/configure b/configure
index f7d2219..e148a8f 100755
--- a/configure
+++ b/configure
@@ -3572,7 +3572,7 @@ fi
   with_gcc_src=$with_gcc_src
 
 else
-  with_gcc_src="\$(srcdir)/riscv-gcc"
+  with_gcc_src="\$(srcdir)/gcc"
 
 fi
 
@@ -3591,7 +3591,7 @@ fi
   with_binutils_src=$with_binutils_src
 
 else
-  with_binutils_src="\$(srcdir)/riscv-binutils"
+  with_binutils_src="\$(srcdir)/binutils"
 
 fi
 
diff --git a/configure.ac b/configure.ac
index 9c0d60d..f2464d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,8 +235,8 @@ AC_DEFUN([AX_ARG_WITH_SRC],
 	  m4_popdef([opt_name])
 	}])
 
-AX_ARG_WITH_SRC(gcc, riscv-gcc)
-AX_ARG_WITH_SRC(binutils, riscv-binutils)
+AX_ARG_WITH_SRC(gcc, gcc)
+AX_ARG_WITH_SRC(binutils, binutils)
 AX_ARG_WITH_SRC(newlib, newlib)
 AX_ARG_WITH_SRC(glibc, glibc)
 AX_ARG_WITH_SRC(musl, musl)
diff --git a/gcc b/gcc
new file mode 160000
+Subproject 1ea978e3066ac565a1ec28a96a4d61eaf38e272
diff --git a/riscv-binutils b/riscv-binutils
deleted file mode 160000
-Subproject 20756b0fbe065a84710aa38f2457563b5754644
diff --git a/riscv-gcc b/riscv-gcc
deleted file mode 160000
-Subproject 5964b5cd72721186ea2195a7be8d40cfe655402
diff --git a/test/allowlist/binutils/common.log b/test/allowlist/binutils/common.log
index c9cda0b..792d600 100644
--- a/test/allowlist/binutils/common.log
+++ b/test/allowlist/binutils/common.log
@@ -1,18 +1 @@
 #
-# Following fail cases is cause by mismatch ABI,
-# because -march/-mabi didn't pass to as/ld.
-#
-FAIL: --gc-sections with --defsym
-FAIL: --gc-sections with KEEP
-FAIL: --gc-sections with __start_SECTIONNAME
-FAIL: ld-plugin/lto-3r
-FAIL: ld-plugin/lto-5r
-FAIL: PR ld/19317 (2)
-FAIL: PR ld/19317 (3)
-FAIL: LTO 5 symbol
-FAIL: LTO 3b
-FAIL: LTO 5
-#
-# .align insert nop cause unexpected size.
-#
-FAIL: ld-scripts/size-1
diff --git a/test/allowlist/binutils/glibc.log b/test/allowlist/binutils/glibc.log
index f3245a3..c9a2eb3 100644
--- a/test/allowlist/binutils/glibc.log
+++ b/test/allowlist/binutils/glibc.log
@@ -1,15 +1,9 @@
 #
 # Missing a relaxation to convert PC-relative GOT references to
-# local symbols to PC-relative direct references.
+# local symbols to PC-relative direct references.needs a new 
+# relaxation and maybe a new relocation to eliminate tprel 
+# relocations in pie mode.
 #
 # This is an optimization, not a correctness issue.
 #
-FAIL: indirect5c dynsym
-FAIL: indirect5d dynsym
-#
-# Similarly to the above case, needs a new relaxation and maybe a new relocation
-# to eliminate tprel relocations in pie mode.
-#
-# This is an optimization, not a correctness issue too.
-#
 FAIL: Build pr22263-1
diff --git a/test/allowlist/binutils/newlib.log b/test/allowlist/binutils/newlib.log
index 57ffc2d..c40c0f4 100644
--- a/test/allowlist/binutils/newlib.log
+++ b/test/allowlist/binutils/newlib.log
@@ -1,9 +1,4 @@
 #
-# -shared unsupported on bare-metal toolchain
-#
-FAIL: Build libpr23818.so
-FAIL: Build libpr23958.so
-#
 # XXX: Unknown reason.
 #
 FAIL: Build pr22983
diff --git a/test/allowlist/gcc/common.log b/test/allowlist/gcc/common.log
index 558aae3..1740753 100644
--- a/test/allowlist/gcc/common.log
+++ b/test/allowlist/gcc/common.log
@@ -14,16 +14,29 @@ XPASS: gcc.dg/attr-alloc_size-11.c
 #
 FAIL: c-c++-common/spec-barrier-1.c
 #
-# XXX: Need review.
-#
-FAIL: gcc.dg/debug/dwarf2/inline5.c
-#
-# We're optimizing something that shouldn't be optimized.
-#
-XPASS: gcc.dg/graphite/pr69728.c
-#
-# Upstream regression, PR 90811.
-# Patch under review:
-#   https://gcc.gnu.org/pipermail/gcc-patches/2020-April/543798.html
-#
-FAIL: gfortran.dg/pr45636.f90
+# Upstream fail cases due to target check with 'vect_slp_v2hi_store_align' and 'vect_slp_v4hi_store_unalign'
+#
+FAIL: gcc.dg/Warray-bounds-48.c
+FAIL: gcc.dg/Wzero-length-array-bounds-2.c
+FAIL: gcc.dg/uninit-pred-9_b.c
+XPASS: gcc.dg/uninit-pred-7_a.c
+# Upstream regression,
+# Patch by Palmer:
+#   https://gcc.gnu.org/pipermail/gcc-patches/2022-May/593995.html
+# Discuss in:
+#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102892
+FAIL: gcc.dg/analyzer/pr104308.c
+FAIL: gcc.dg/pr102892-1.c
+#
+# Upstream fail cases due to tree dump check
+#
+FAIL: gcc.dg/tree-ssa/ssa-sink-18.c
+#
+# Upstream fixed cases
+#
+# By Palmer:
+#   https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=010af1040bcf4870c8f1aac88a7b1538f622858b
+FAIL: gcc.dg/debug/btf/btf-datasec-1.c
+# By Jiawei:
+#   https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=dc32901a0221a43e121591b9819b4e33bcc2fd0a
+FAIL: g++.dg/opt/const7.C
diff --git a/test/allowlist/gcc/glibc.ilp32.log b/test/allowlist/gcc/glibc.ilp32.log
index dd034f9..4e27b28 100644
--- a/test/allowlist/gcc/glibc.ilp32.log
+++ b/test/allowlist/gcc/glibc.ilp32.log
@@ -1,5 +1,2 @@
-FAIL: gfortran.dg/matmul_15.f90   -O  execution test
-FAIL: gfortran.dg/ieee/ieee_2.f90
-FAIL: gfortran.dg/ieee/large_2.f90
-FAIL: gfortran.dg/ieee/large_3.F90
-FAIL: gfortran.dg/ieee/rounding_1.f90
+FAIL: c-c++-common/goacc/kernels-decompose-pr100400-1-2.c
+XPASS: c-c++-common/goacc/kernels-decompose-pr100400-1-2.c
diff --git a/test/allowlist/gcc/glibc.log b/test/allowlist/gcc/glibc.log
index fe57a44..922ee5f 100644
--- a/test/allowlist/gcc/glibc.log
+++ b/test/allowlist/gcc/glibc.log
@@ -1,30 +1,10 @@
 #
-# Signal related bug, might be mismatch siginfo?
-#
-FAIL: g++.dg/ext/cleanup-8.C
-FAIL: g++.dg/ext/cleanup-9.C
-FAIL: g++.dg/ext/cleanup-10.C
-FAIL: g++.dg/ext/cleanup-11.C
-FAIL: gcc.dg/cleanup-8.c
-FAIL: gcc.dg/cleanup-9.c
-FAIL: gcc.dg/cleanup-10.c
-FAIL: gcc.dg/cleanup-11.c
-#
 # XXX: Need review why.
 #
+FAIL: c-c++-common/goacc/kernels-decompose-pr100400-1-2.c
+XPASS: c-c++-common/goacc/kernels-decompose-pr100400-1-2.c
 FAIL: gfortran.dg/ieee/ieee_6.f90
 #
-# ieee_1.F90 is a QEMU bug: https://github.com/riscv/riscv-qemu/issues/64
-#
-FAIL: gfortran.dg/ieee/ieee_1.F90
-#
 # Synchronization problem.
 #
 FAIL: gcc.dg/tree-prof/time-profiler-2.c
-#
-# TLS related testcase might random fail on qemu
-# But it's hard to reproduce and seems only happen on qemu.
-# So put those case here for now.
-#
-FAIL: g++.dg/tls/thread_local4.C
-FAIL: g++.dg/tls/thread_local4g.C
diff --git a/test/allowlist/gcc/glibc.lp64.log b/test/allowlist/gcc/glibc.lp64.log
index dd034f9..4e27b28 100644
--- a/test/allowlist/gcc/glibc.lp64.log
+++ b/test/allowlist/gcc/glibc.lp64.log
@@ -1,5 +1,2 @@
-FAIL: gfortran.dg/matmul_15.f90   -O  execution test
-FAIL: gfortran.dg/ieee/ieee_2.f90
-FAIL: gfortran.dg/ieee/large_2.f90
-FAIL: gfortran.dg/ieee/large_3.F90
-FAIL: gfortran.dg/ieee/rounding_1.f90
+FAIL: c-c++-common/goacc/kernels-decompose-pr100400-1-2.c
+XPASS: c-c++-common/goacc/kernels-decompose-pr100400-1-2.c
diff --git a/test/allowlist/gcc/lp64.log b/test/allowlist/gcc/lp64.log
index fd6581b..e2b1413 100644
--- a/test/allowlist/gcc/lp64.log
+++ b/test/allowlist/gcc/lp64.log
@@ -1,5 +1,5 @@
 #
 # fesetround not work with soft-fp
 #
-FAIL: gcc.dg/torture/fp-int-convert-timode-3.c
-FAIL: gcc.dg/torture/fp-int-convert-timode-4.c
+#FAIL: gcc.dg/torture/fp-int-convert-timode-3.c
+#FAIL: gcc.dg/torture/fp-int-convert-timode-4.c
diff --git a/test/allowlist/gcc/newlib.log b/test/allowlist/gcc/newlib.log
index 8841dbd..47dd445 100644
--- a/test/allowlist/gcc/newlib.log
+++ b/test/allowlist/gcc/newlib.log
@@ -1,7 +1,6 @@
 #
 # We didn't init thread pointer in qemu nor newlib.
 #
-FAIL: gcc.dg/tls/pr78796.c execution test
 FAIL: g++.dg/cpp2a/decomp2.C
 #
 # freopen with stdout not work correctly for newlib
@@ -10,10 +9,6 @@ FAIL: gcc.c-torture/execute/user-printf.c
 FAIL: gcc.c-torture/execute/fprintf-2.c
 FAIL: gcc.c-torture/execute/printf-2.c
 #
-# Missing dg-require-effective-target shared
-#
-FAIL: g++.dg/lto/pr87906 cp_lto_pr87906_0.o-cp_lto_pr87906_1.o link,  -O -fPIC -flto
-#
 # -lc not enough to link final executable for newlib.
 #
 FAIL: g++.dg/abi/pure-virtual1.C
diff --git a/test/allowlist/gcc/rv64.log b/test/allowlist/gcc/rv64.log
index f8358ef..6d53000 100644
--- a/test/allowlist/gcc/rv64.log
+++ b/test/allowlist/gcc/rv64.log
@@ -1,5 +1,4 @@
 #
 # XXX: Need review
 #
-FAIL: gcc.dg/tree-ssa/pr84512.c
 XPASS: gcc.dg/tree-ssa/ssa-fre-3.c