Index: tools/toolchain.sh
===================================================================
--- tools/toolchain.sh	(revision 0cb53ea5ca7c2cc86beec62f1c696b8badb2e6ca)
+++ tools/toolchain.sh	(revision 9e5cc73161c96d8e96285672f0c8d58f77fbaf83)
@@ -238,10 +238,17 @@
 	HELENOS_TARGET="${GNU_ARCH}-helenos"
 
+	# TODO: Clean up this mess.
 	case "$1" in
 		"amd64")
 			LINUX_TARGET="${GNU_ARCH}-unknown-elf"
 			;;
+		"ia32" | "ia64")
+			LINUX_TARGET="${GNU_ARCH}-pc-linux-gnu"
+			;;
 		"arm32")
 			LINUX_TARGET="${GNU_ARCH}-linux-gnueabi"
+			;;
+		"riscv64")
+			LINUX_TARGET="${GNU_ARCH}-unknown-linux-gnu"
 			;;
 		*)