Merge pull request #1108 from riscv-collab/bump-binutils-2.39

Switch binutils to upstream 2.39 branch and rename the folder name
riscv-collab · Aug 17, 2022 · ea1c0d2 · ea1c0d2
2 parents cb25bb8 + 3a5a9bf
commit ea1c0d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
-[submodule "riscv-binutils"]
- path = riscv-binutils
- url = https://github.com/riscv-collab/riscv-binutils-gdb.git
- branch = riscv-binutils-2.38
+[submodule "binutils"]
+ path = binutils
+ 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

diff --git a/riscv-binutils → binutils b/riscv-binutils → binutils
diff --git a/configure b/configure
@@ -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
@@ -236,7 +236,7 @@ AC_DEFUN([AX_ARG_WITH_SRC],
  }])
 
 AX_ARG_WITH_SRC(gcc, riscv-gcc)
-AX_ARG_WITH_SRC(binutils, riscv-binutils)
+AX_ARG_WITH_SRC(binutils, binutils)
 AX_ARG_WITH_SRC(newlib, newlib)
 AX_ARG_WITH_SRC(glibc, glibc)
 AX_ARG_WITH_SRC(musl, musl)