From eb15d47b4d58a4f841f55a02c77216e24b550b2a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 6 Aug 2016 20:36:44 +0100
Subject: [PATCH] Cross-compile binutils into stage3 chroot.

---
 .gitignore |  1 +
 Makefile   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8b01137..fa5d563 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@ stamp-*
 /mpc-1.0.3/
 /mpfr-3.1.4/
 /ncurses-6.0-20160730/
+/riscv-binutils-gdb-riscv-binutils-2.26/
 /riscv-gcc-riscv-gcc-6.1.0/
 /util-linux-2.28/
diff --git a/Makefile b/Makefile
index 787a820..5bd53ec 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ COREUTILS_VERSION  = 8.25
 GMP_VERSION        = 6.1.1
 MPFR_VERSION       = 3.1.4
 MPC_VERSION        = 1.0.3
+BINUTILS_X_VERSION = 2.26
 GCC_X_VERSION      = 6.1.0
 UTIL_LINUX_VERSION = 2.28
 
@@ -252,6 +253,7 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
 	stage3-chroot/usr/lib64/libgmp.so.10 \
 	stage3-chroot/usr/lib64/libmpfr.so.4 \
 	stage3-chroot/usr/lib64/libmpc.so.3 \
+	stage3-chroot/usr/bin/as \
 	stage3-chroot/usr/bin/gcc \
 	stage3-chroot/usr/bin/mount \
 	stage3-chroot/init \
@@ -367,6 +369,24 @@ coreutils-$(COREUTILS_VERSION).tar.xz:
 	wget -O $@-t ftp://ftp.gnu.org/gnu/coreutils/coreutils-$(COREUTILS_VERSION).tar.xz
 	mv $@-t $@
 
+# Cross-compile binutils.
+stage3-chroot/usr/bin/as: binutils-$(BINUTILS_X_VERSION).tar.gz
+	rm -rf binutils-$(BINUTILS_X_VERSION)
+	zcat $^ | tar xf -
+	mkdir riscv-binutils-gdb-riscv-binutils-$(BINUTILS_X_VERSION)/build
+	cd riscv-binutils-gdb-riscv-binutils-$(BINUTILS_X_VERSION)/build && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	../configure \
+	    --host=riscv64-unknown-linux-gnu \
+	    --prefix=/usr --libdir=/usr/lib64
+	cd riscv-binutils-gdb-riscv-binutils-$(BINUTILS_X_VERSION)/build && PATH=$(ROOT)/fixed-gcc:$$PATH make
+	cd riscv-binutils-gdb-riscv-binutils-$(BINUTILS_X_VERSION)/build && make DESTDIR=$(ROOT)/stage3-chroot install
+
+binutils-$(BINUTILS_X_VERSION).tar.gz:
+	rm -f $@ $@-t
+	wget -O $@-t https://github.com/riscv/riscv-binutils-gdb/archive/riscv-binutils-$(BINUTILS_X_VERSION).tar.gz
+	mv $@-t $@
+
 # Cross-compile GMP, MPFR and MPC (deps of GCC).
 stage3-chroot/usr/lib64/libgmp.so.10: gmp-$(GMP_VERSION).tar.lz
 	rm -rf gmp-$(GMP_VERSION)
-- 
1.8.3.1