diff options
author | Kito Cheng <kito.cheng@sifive.com> | 2022-08-18 16:42:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-18 16:42:46 +0800 |
commit | c39061968972ac2e4a10844aa54b90c8fb94125e (patch) | |
tree | 9d0e5efb3168cfa4800fc993bdcfa39af23f6a90 | |
parent | ea1c0d29896e56f98d304a94dfd33c498de153ef (diff) | |
parent | a8a98fa6ef410f63b7ef9a5cc3e272f519f13e07 (diff) | |
download | riscv-gnu-toolchain-c39061968972ac2e4a10844aa54b90c8fb94125e.zip riscv-gnu-toolchain-c39061968972ac2e4a10844aa54b90c8fb94125e.tar.gz riscv-gnu-toolchain-c39061968972ac2e4a10844aa54b90c8fb94125e.tar.bz2 |
Merge pull request #1114 from pz9115/bump-gcc-12.12022.08.19
Switch gcc to upstream and update binutils commits
-rw-r--r-- | .gitmodules | 6 | ||||
m--------- | binutils | 0 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
m--------- | gcc | 0 | ||||
m--------- | riscv-gcc | 0 |
6 files changed, 5 insertions, 5 deletions
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 -Subproject 20756b0fbe065a84710aa38f2457563b5754644 +Subproject b51c2fec1da205ea3e7354cbb3e253018d64873 @@ -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 +Subproject 1ea978e3066ac565a1ec28a96a4d61eaf38e272 diff --git a/riscv-gcc b/riscv-gcc deleted file mode 160000 -Subproject 5964b5cd72721186ea2195a7be8d40cfe655402 |