From 57740d97cdec928c372d8e752c04a691418cbfa1 Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 3 Nov 2017 18:08:32 -0700
Subject: Un-break "--enable-32bit"

We had the wrong set of compiler options for 32-bit builds, "-m32"
hasn't been supported in a while.

This should fix https://github.com/riscv/riscv-gnu-toolchain/issues/294
---
 configure    | 8 ++++----
 configure.ac | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index d7d3380..61c0292 100755
--- a/configure
+++ b/configure
@@ -4084,13 +4084,13 @@ fi
 case "${BUILD_32BIT}" in
   yes|default)
 	echo "Building 32-bit pk"
-	CFLAGS="$default_CFLAGS -m32"
-	LDFLAGS="-m32"
+	CFLAGS="$default_CFLAGS -march=rv32imafdc -mabi=ilp32d"
+	LDFLAGS="-march=rv32imafdc -mabi=ilp32d"
 	install_subdir="riscv32-unknown-elf"
 	;;
   *)
-	CFLAGS="$default_CFLAGS"
-	LDFLAGS=
+	CFLAGS="$default_CFLAGS -march=rv64imafdc -mabi=lp64d"
+	LDFLAGS="-march=rv64imafdc -mabi=lp64d"
 	install_subdir="riscv64-unknown-elf"
 	;;
 esac
diff --git a/configure.ac b/configure.ac
index 4cf9b61..06fdc28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,13 +88,13 @@ AC_ARG_ENABLE([32bit],
 case "${BUILD_32BIT}" in
   yes|default)
 	echo "Building 32-bit pk"
-	CFLAGS="$default_CFLAGS -m32"
-	LDFLAGS="-m32"
+	CFLAGS="$default_CFLAGS -march=rv32imafdc -mabi=ilp32d"
+	LDFLAGS="-march=rv32imafdc -mabi=ilp32d"
 	install_subdir="riscv32-unknown-elf"
 	;;
   *)
-	CFLAGS="$default_CFLAGS"
-	LDFLAGS=
+	CFLAGS="$default_CFLAGS -march=rv64imafdc -mabi=lp64d"
+	LDFLAGS="-march=rv64imafdc -mabi=lp64d"
 	install_subdir="riscv64-unknown-elf"
 	;;
 esac
-- 
cgit v1.1