diff --git a/configure b/configure
index 93366a13593..3b81d6bca94 100755
--- a/configure
+++ b/configure
@@ -1384,7 +1384,7 @@ Optional Features:
                           information
   --enable-default-pie    build linux toolchain with default PIE
                           [--enable-default-pie]
-  --enable-multilib       build both RV32 and RV64 runtime libraries 
+  --enable-multilib       build both RV32 and RV64 runtime libraries
                           [--disable-multilib]
   --enable-gcc-checking   Enable gcc internal checking, it will make gcc very
                           slow, only enable it when developing gcc
@@ -4166,7 +4166,7 @@ fi
 
 if test "x$enable_multilib" != xno
 then :
-  musl_multilib_names="rv64imac-lp64 rv64imafdc-lp64d"
+  musl_multilib_names="rv32imac-ilp32 rv32imafdc-ilp32d rv64imac-lp64 rv64imafdc-lp64d"
 
 else $as_nop
   musl_multilib_names="$with_arch-$with_abi"
diff --git a/configure.ac b/configure.ac
index 3c881cf6a6f..0fc282c21f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ## Process this file with autoconf 2.69. Other versions may not work.
-AC_INIT(riscv-toolchain, 1.0)
+AC_INIT([riscv-toolchain],[1.0])
 
 AC_PROG_CC
 AC_PROG_FGREP
@@ -141,7 +141,7 @@ AC_SUBST(WITH_LANGUAGES, $with_languages)
 
 AC_ARG_ENABLE(multilib,
 	[AS_HELP_STRING([--enable-multilib],
-		[build both RV32 and RV64 runtime libraries (only RV64 for musl libc) @<:@--disable-multilib@:>@])],
+		[build both RV32 and RV64 runtime libraries @<:@--disable-multilib@:>@])],
 	[],
 	[enable_multilib=no]
 	)
@@ -246,8 +246,7 @@ AS_IF([test "x$with_system_zlib" != xno],
 	[AC_SUBST(with_system_zlib,--without-system-zlib)])
 
 AC_ARG_WITH(guile,
-	[AC_HELP_STRING([--with-guile],
-			[Set which guile to use, if any])],
+	[AS_HELP_STRING([--with-guile],[Set which guile to use, if any])],
 	[],
 	[with_guile=default]
 	)
@@ -291,8 +290,7 @@ AS_IF([test "x$enable_host_gcc" != xyes],
 AC_DEFUN([AX_ARG_WITH_SRC],
 	[{m4_pushdef([opt_name], with_$1_src)
 	  AC_ARG_WITH($1-src,
-		[AC_HELP_STRING([--with-$1-src],
-				[Set $1 source path, use builtin source by default])],
+		[AS_HELP_STRING([--with-$1-src],[Set $1 source path, use builtin source by default])],
 		[],
 		[opt_name=default]
 		)
@@ -316,8 +314,7 @@ AX_ARG_WITH_SRC(llvm, llvm)
 AX_ARG_WITH_SRC(dejagnu, dejagnu)
 
 AC_ARG_WITH(linux-headers-src,
-	[AC_HELP_STRING([--with-linux-headers-src],
-			[Set linux-headers source path, use builtin source by default])],
+	[AS_HELP_STRING([--with-linux-headers-src],[Set linux-headers source path, use builtin source by default])],
 	[],
 	[with_linux_headers_src=default]
 	)