Multilibs go in /lib${XLEN}/${ABI}/, e.g. /lib64/lp64/

1 files changed, 13 insertions, 76 deletions

diff --git a/configure b/configure
index 278d0da..9d6d540 100755
--- a/configure
+++ b/configure
@@ -587,12 +587,8 @@ LIBOBJS
 gcc_checking
 multilib_names
 multilib_flags
-glibc_float_flags
-gcc_float_flags
-binutils_float_flags
-atomic_cflags
+WITH_ABI
 WITH_ARCH
-XLEN
 default_target
 FETCHER
 FTP
@@ -653,10 +649,9 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_linux
-with_xlen
 enable_atomic
-enable_float
 with_arch
+with_abi
 enable_multilib
 enable_gcc_checking
 '
@@ -1281,8 +1276,6 @@ Optional Features:
                           [--disable-linux]
   --disable-atomic        disable use of atomic memory instructions in glibc
                           [--enable-atomic]
-  --disable-float         use software floating point in glibc
-                          [--enable-float]
   --enable-multilib       build both RV32 and RV64 runtime libraries
                           [--disable-multilib]
   --enable-gcc-checking   Enable gcc internal checking, it will make gcc very
@@ -1292,8 +1285,8 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-xlen=XLEN        Set XLEN, the X-register bit width (default is 64)
-  --with-arch=RV64IMAFD   Sets the base RISC-V ISA, defaults to RV64IMAFD
+  --with-arch=rv64g       Sets the base RISC-V ISA, defaults to rv64g
+  --with-abi=lp64d        Sets the base RISC-V ABI, defaults to lp64d
 
 Some influential environment variables:
   CC          C compiler command
@@ -3207,18 +3200,6 @@ else
 
 fi
 
-
-# Check whether --with-xlen was given.
-if test "${with_xlen+set}" = set; then :
-  withval=$with_xlen; XLEN=$withval
-
-else
-  XLEN=64
-
-
-fi
-
-
 # Check whether --enable-atomic was given.
 if test "${enable_atomic+set}" = set; then :
   enableval=$enable_atomic;
@@ -3228,71 +3209,30 @@ else
 fi
 
 
-# Check whether --enable-float was given.
-if test "${enable_float+set}" = set; then :
-  enableval=$enable_float;
-else
-  enable_float=yes
-
-fi
-
-
-
-
-
-
-
-
-
-
 
 # Check whether --with-arch was given.
 if test "${with_arch+set}" = set; then :
-  withval=$with_arch; if echo "$withval" | $GREP -qE "^RV32"; then :
-  XLEN=32
-
-fi
-	 if echo "$withval" | $GREP -qE "^RV64"; then :
-  XLEN=64
-
-fi
+  withval=$with_arch; WITH_ARCH=--with-arch=$withval
 
-	 if echo "$withval" | $GREP -qE "^RV(32|64).*A"; then :
-  enable_atomic=yes
 else
-  enable_atomic=no
-fi
-
-	 if echo "$withval" | $GREP -qE "^RV(32|64).*F"; then :
-  enable_float=yes
-else
-  enable_float=no
-fi
+  WITH_ARCH=--with-arch=rv64g
 
 
-	 WITH_ARCH=--with-arch=$withval
-
 fi
 
 
-if test "x$enable_atomic" != xno; then :
-
-else
-  atomic_cflags=-mno-atomic
-
-fi
 
-if test "x$enable_float" != xno; then :
-  binutils_float_flags=--disable-soft-float
-gcc_float_flags="--disable-soft-float"
+# Check whether --with-abi was given.
+if test "${with_abi+set}" = set; then :
+  withval=$with_abi; WITH_ABI=--with-abi=$withval
 
 else
-  binutils_float_flags=--enable-soft-float
-gcc_float_flags="--enable-soft-float --with-float=soft"
-glibc_float_flags=--without-fp
+  WITH_ABI=--with-abi=lp64d
+
 
 fi
 
+
 # Check whether --enable-multilib was given.
 if test "${enable_multilib+set}" = set; then :
   enableval=$enable_multilib;
@@ -3311,10 +3251,7 @@ else
 fi
 
 if test "x$enable_multilib" != xno; then :
-  multilib_names="rv32ima-ilp32 rv32imafd-ilp32 rv32imafd-ilp32d rv64ima-lp64 rv64imafd-lp64 rv64imafd-lp64d"
-
-else
-  multilib_names="-"
+  multilib_names="rv32ima-ilp32 rv32imafd-ilp32d rv64ima-lp64 rv64imafd-lp64d"
 
 fi