From 89e2c05d92c6e9ad077bf2c12f24e495fbaf1c7d Mon Sep 17 00:00:00 2001
From: Kongou Hikari <hikari@nucleisys.com>
Date: Wed, 28 Aug 2019 11:51:06 +0800
Subject: [PATCH] Fix cross compiling error & tweaking multilib setting

---
 .gitignore     |  5 ++++-
 Makefile.in    | 19 +++++++++++++++++--
 configure      |  2 +-
 configure.ac   |  2 +-
 riscv-binutils |  2 +-
 riscv-gcc      |  2 +-
 riscv-gdb      |  2 +-
 7 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f63fbd3b8c5..fc2c416139d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 autom4te.cache
-build
+test
+build*
+stamps
+install*
 config.log
 config.status
 Makefile
diff --git a/Makefile.in b/Makefile.in
index dd2583f6c1c..3e6282a8491 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,6 +81,14 @@ MUSL_CXX_FOR_TARGET ?= $(MUSL_TUPLE)-g++
 
 CONFIGURE_HOST   = @configure_host@
 
+#For cross-compiling to Windows
+
+ifdef CONFIGURE_HOST
+    TARGET_GCC_EXECUTABLE := $(NEWLIB_TUPLE)-gcc
+else
+    TARGET_GCC_EXECUTABLE := $(INSTALL_DIR)/bin/$(NEWLIB_TUPLE)-gcc
+endif
+
 all: @default_target@
 newlib: stamps/build-gcc-newlib-stage2
 linux: stamps/build-gcc-linux-stage2
@@ -408,7 +416,8 @@ stamps/build-binutils-newlib: $(srcdir)/riscv-binutils
 		--disable-gdb \
 		--disable-sim \
 		--disable-libdecnumber \
-		--disable-readline
+		--disable-readline \
+		--disable-nls
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
@@ -434,6 +443,10 @@ stamps/build-gdb-newlib: $(srcdir)/riscv-gdb
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
 
+ifdef CONFIGURE_HOST
+stamps/build-gcc-newlib-stage1: stamps/build-binutils-newlib
+	mkdir -p $(dir $@) && touch $@
+else
 stamps/build-gcc-newlib-stage1: $(srcdir)/riscv-gcc stamps/build-binutils-newlib
 	if test -f $</contrib/download_prerequisites && test "@NEED_GCC_EXTERNAL_LIBRARIES@" == "true"; then cd $< && ./contrib/download_prerequisites; fi
 	rm -rf $@ $(notdir $@)
@@ -466,6 +479,8 @@ stamps/build-gcc-newlib-stage1: $(srcdir)/riscv-gcc stamps/build-binutils-newlib
 	$(MAKE) -C $(notdir $@) install-gcc
 	mkdir -p $(dir $@) && touch $@
 
+endif
+
 stamps/build-newlib: $(srcdir)/riscv-newlib stamps/build-gcc-newlib-stage1
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)
@@ -510,7 +525,7 @@ stamps/build-newlib-nano: $(srcdir)/riscv-newlib stamps/build-gcc-newlib-stage1
 stamps/merge-newlib-nano: stamps/build-newlib-nano stamps/build-newlib
 # Copy nano library files into newlib install dir.
 	set -e; \
-        for ml in `$(INSTALL_DIR)/bin/$(NEWLIB_TUPLE)-gcc --print-multi-lib`; \
+        for ml in `$(TARGET_GCC_EXECUTABLE) --print-multi-lib`; \
 	do \
 	    mld=`echo $${ml} | sed -e 's/;.*$$//'`; \
 	    cp $(builddir)/install-newlib-nano/$(NEWLIB_TUPLE)/lib/$${mld}/libc.a \
diff --git a/configure b/configure
index 4305ed4ffe1..283af09f8ce 100755
--- a/configure
+++ b/configure
@@ -3316,7 +3316,7 @@ else
 fi
 
 if test "x$enable_multilib" != xno; then :
-  newlib_multilib_names="rv32i-ilp32 rv32iac-ilp32 rv32im-ilp32 rv32imac-ilp32 rv32imafc-ilp32f rv64imac-lp64 rv64imafdc-lp64d"
+  newlib_multilib_names="rv32i-ilp32 rv32iac-ilp32 rv32imc-ilp32 rv32im-ilp32 rv32imac-ilp32 rv32imafc-ilp32f rv32imafdc-ilp32d rv32e-ilp32e rv32ec-ilp32e rv32emc-ilp32e rv32ema-ilp32e rv32emac-ilp32e"
 
 else
   newlib_multilib_names="$with_arch-$with_abi"
diff --git a/configure.ac b/configure.ac
index f82f8339229..6e6d5732780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ AS_IF([test "x$enable_multilib" != xno],
         [AC_SUBST(glibc_multilib_names,"$with_arch-$with_abi")])
 
 AS_IF([test "x$enable_multilib" != xno],
-        [AC_SUBST(newlib_multilib_names,"rv32i-ilp32 rv32iac-ilp32 rv32im-ilp32 rv32imac-ilp32 rv32imafc-ilp32f rv64imac-lp64 rv64imafdc-lp64d")],
+        [AC_SUBST(newlib_multilib_names,"rv32i-ilp32 rv32iac-ilp32 rv32imc-ilp32 rv32im-ilp32 rv32imac-ilp32 rv32imafc-ilp32f rv32imafdc-ilp32d rv32e-ilp32e rv32ec-ilp32e rv32emc-ilp32e rv32ema-ilp32e rv32emac-ilp32e")],
         [AC_SUBST(newlib_multilib_names,"$with_arch-$with_abi")])
 
 AC_ARG_ENABLE(gcc-checking,
diff --git a/riscv-binutils b/riscv-binutils
index a9d9a104dde..0a91baedcda 160000
--- a/riscv-binutils
+++ b/riscv-binutils
@@ -1 +1 @@
-Subproject commit a9d9a104dde6a749f40ce5c4576a0042a7d52d1f
+Subproject commit 0a91baedcda62bce52a4a8982df8311c03779318
diff --git a/riscv-gcc b/riscv-gcc
index 8fb74cd0021..124c6da92e4 160000
--- a/riscv-gcc
+++ b/riscv-gcc
@@ -1 +1 @@
-Subproject commit 8fb74cd00216817f5d1613e491fdde163aca65bc
+Subproject commit 124c6da92e44d8a8d093de0690ac581eb5b6bf7f
diff --git a/riscv-gdb b/riscv-gdb
index c3eb4078520..63c7e9a394c 160000
--- a/riscv-gdb
+++ b/riscv-gdb
@@ -1 +1 @@
-Subproject commit c3eb4078520dad8234ffd7fbf893ac0da23ad3c8
+Subproject commit 63c7e9a394c8e1f145bcb7351938271327ac4d85