Default arch is rv64g, not ERROR

configure

@@ -626,6 +626,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -701,6 +702,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -953,6 +955,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1090,7 +1101,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1243,6 +1254,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3212,11 +3224,9 @@ fi
 
 # Check whether --with-arch was given.
 if test "${with_arch+set}" = set; then :
-  withval=$with_arch; WITH_ARCH=--with-arch=$withval
-
+  withval=$with_arch;
 else
-  WITH_ARCH=--with-arch=rv64g
-
+  with_arch=rv64g
 
 fi
 
@@ -3251,6 +3261,8 @@ if test "x$with_abi" == xdefault; then :
 esac
 fi
 
+WITH_ARCH=--with-arch=$with_arch
+
 WITH_ABI=--with-abi=$with_abi
 
 

configure.ac

@@ -60,8 +60,8 @@ AC_ARG_ENABLE(atomic,
 AC_ARG_WITH(arch,
 	[AS_HELP_STRING([--with-arch=rv64g],
 		[Sets the base RISC-V ISA, defaults to rv64g])],
-	AC_SUBST(WITH_ARCH, --with-arch=$withval),
-	AC_SUBST(WITH_ARCH, --with-arch=rv64g)
+	[],
+	[with_arch=rv64g]
 	)
 
 AC_ARG_WITH(abi,
@@ -82,6 +82,7 @@ AS_IF([test "x$with_abi" == xdefault],
 		[AC_MSG_ERROR([Unknown arch])]
 	)])
 
+AC_SUBST(WITH_ARCH, --with-arch=$with_arch)
 AC_SUBST(WITH_ABI, --with-abi=$with_abi)
 
 AC_ARG_ENABLE(multilib,