From 3a5a9bfec11a3928ecfcf8f28f9ba7e7c6614fa4 Mon Sep 17 00:00:00 2001
From: Kito Cheng <kito.cheng@sifive.com>
Date: Mon, 8 Aug 2022 14:09:52 +0800
Subject: [PATCH] Switch binutils to upstream 2.39 branch

---
 .gitmodules                | 8 ++++----
 riscv-binutils => binutils | 0
 configure                  | 2 +-
 configure.ac               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename riscv-binutils => binutils (100%)

diff --git a/.gitmodules b/.gitmodules
index e7d5ce5b9a1..0991184dc92 100644
--- 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 b/binutils
similarity index 100%
rename from riscv-binutils
rename to binutils
diff --git a/configure b/configure
index f7d22193643..5556785a165 100755
--- 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
index 9c0d60d6889..592c02df6ca 100644
--- 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)