Merge pull request #1114 from pz9115/bump-gcc-12.1

kito-cheng · web-flow · commit c39061968972 · 2022-08-18T16:42:46.000+08:00
Switch gcc to upstream and update binutils commits
diff --git a/.gitmodules b/.gitmodules
@@ -3,9 +3,9 @@
 	url = https://sourceware.org/git/binutils-gdb.git
 	branch = binutils-2_39-branch
 [submodule "riscv-gcc"]
-	path = riscv-gcc
-	url = https://github.com/riscv-collab/riscv-gcc.git
-	branch = riscv-gcc-10.2.0
+	path = gcc
+	url = https://gcc.gnu.org/git/gcc.git
+	branch = releases/gcc-12.1.0
 [submodule "glibc"]
 	path = glibc
 	url = git://sourceware.org/git/glibc.git
diff --git a/binutils b/binutils
@@ -1 +1 @@
-Subproject commit 20756b0fbe065a84710aa38f2457563b57546440
+Subproject commit b51c2fec1da205ea3e7354cbb3e253018d64873c
diff --git 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
 
diff --git a/configure.ac b/configure.ac
@@ -235,7 +235,7 @@ AC_DEFUN([AX_ARG_WITH_SRC],
 	  m4_popdef([opt_name])
 	}])
 
-AX_ARG_WITH_SRC(gcc, riscv-gcc)
+AX_ARG_WITH_SRC(gcc, gcc)
 AX_ARG_WITH_SRC(binutils, binutils)
 AX_ARG_WITH_SRC(newlib, newlib)
 AX_ARG_WITH_SRC(glibc, glibc)
diff --git a/gcc b/gcc
@@ -0,0 +1 @@
+Subproject commit 1ea978e3066ac565a1ec28a96a4d61eaf38e2726
diff --git a/riscv-gcc b/riscv-gcc
