From 7768b83385b2fa7bd095f7fa6a118635bfefdcbb Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sun, 3 Mar 2024 17:04:44 -0600
Subject: [PATCH] Add riscv64 and sh4eb compiler targets.

---
 scripts/mcm-buildall.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/mcm-buildall.sh b/scripts/mcm-buildall.sh
index 4b56a805..b5b19e5e 100755
--- a/scripts/mcm-buildall.sh
+++ b/scripts/mcm-buildall.sh
@@ -29,9 +29,9 @@ TARGETS=(i686:: aarch64:eabi:
   "armv7m:eabi:--with-arch=armv7-m --with-mode=thumb --disable-libatomic --enable-default-pie"
   armv7r:eabihf:"--with-arch=armv7-r --enable-default-pie"
   i486:: m68k:: microblaze:: mips:: mips64:: mipsel:: or1k:: powerpc::
-  powerpc64:: powerpc64le:: s390x:: sh2eb:fdpic:--with-cpu=mj2
-  sh4::--enable-incomplete-targets x86_64::--with-mtune=nocona
-  x86_64@x32:x32:
+  powerpc64:: powerpc64le:: riscv64:: s390x:: sh2eb:fdpic:--with-cpu=mj2
+  sh4::--enable-incomplete-targets sh4eb::--enable-incomplete-targets
+  x86_64::--with-mtune=nocona x86_64@x32:x32:
 )
 
 # All toolchains after the first are themselves cross compiled (so they
@@ -71,7 +71,8 @@ make_toolchain()
     if [ "$TYPE" == static ]
     then
       HOST=$BOOTSTRAP
-      [ "$TARGET" = "$HOST" ] && LP="$PWD/host-$HOST/bin:$LP"
+      [ "$TARGET" = "$HOST" ] && LP="$PWD/host-$HOST/bin:$LP" &&
+        GCC_CONFIG="--build=${TARGET%%-*}-donotmatch-linux $GCC_CONFIG"
       TYPE=cross
       EXTRASUB=y
       LP="$OUTPUT/$HOST-cross/bin:$LP"
-- 
2.39.2