Switch gcc to upstream and update binutils commits

4 years ago · a8a98fa6ef
6 changed files with 7 additions and 7 deletions
--- 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
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 20756b0fbe065a84710aa38f2457563b57546440
+Subproject commit b51c2fec1da205ea3e7354cbb3e253018d64873c
--- a/2
+++ b/2
@ -3572,7 +3572,7 @@ fi
  with_gcc_src=$with_gcc_src

 else
-  with_gcc_src="\$(srcdir)/riscv-gcc"
+  with_gcc_src="\$(srcdir)/gcc"

 fi

--- 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)
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 1ea978e3066ac565a1ec28a96a4d61eaf38e2726
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 5964b5cd72721186ea2195a7be8d40cfe6554023
			`@ -0,0 +1 @@`
			`Subproject commit 1ea978e3066ac565a1ec28a96a4d61eaf38e2726`
			`@ -1 +0,0 @@`
			`Subproject commit 5964b5cd72721186ea2195a7be8d40cfe6554023`