From a8a98fa6ef410f63b7ef9a5cc3e272f519f13e07 Mon Sep 17 00:00:00 2001 From: Jiawei Date: Thu, 18 Aug 2022 10:31:41 +0800 Subject: Switch gcc to upstream and update binutils commits --- .gitmodules | 6 +++--- binutils | 2 +- configure | 2 +- configure.ac | 2 +- gcc | 1 + riscv-gcc | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 gcc delete mode 160000 riscv-gcc diff --git a/.gitmodules b/.gitmodules index 0991184..bcc73ad 100644 --- 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 index 20756b0..b51c2fe 160000 --- a/binutils +++ b/binutils @@ -1 +1 @@ -Subproject commit 20756b0fbe065a84710aa38f2457563b57546440 +Subproject commit b51c2fec1da205ea3e7354cbb3e253018d64873c diff --git a/configure b/configure index 5556785..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 diff --git a/configure.ac b/configure.ac index 592c02d..f2464d1 100644 --- 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 new file mode 160000 index 0000000..1ea978e --- /dev/null +++ b/gcc @@ -0,0 +1 @@ +Subproject commit 1ea978e3066ac565a1ec28a96a4d61eaf38e2726 diff --git a/riscv-gcc b/riscv-gcc deleted file mode 160000 index 5964b5c..0000000 --- a/riscv-gcc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5964b5cd72721186ea2195a7be8d40cfe6554023 -- cgit v1.1