Skip to content

Commit ad52c0d

Browse files
authored
Merge pull request #1060 from riscv-collab/jimw-configure-update
Rebuild configure file.
2 parents a72aaaa + 1f2786e commit ad52c0d

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

configure

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ target_cxxflags
600600
target_cflags
601601
cmodel
602602
gcc_checking
603+
musl_multilib_names
603604
newlib_multilib_names
604605
glibc_multilib_names
605606
multilib_flags
@@ -1322,8 +1323,8 @@ Optional Features:
13221323
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
13231324
--enable-linux set linux as the default make target
13241325
[--disable-linux]
1325-
--enable-multilib build both RV32 and RV64 runtime libraries (only RV64 for musl libc)
1326-
[--disable-multilib]
1326+
--enable-multilib build both RV32 and RV64 runtime libraries (only
1327+
RV64 for musl libc) [--disable-multilib]
13271328
--enable-gcc-checking Enable gcc internal checking, it will make gcc very
13281329
slow, only enable it when developing gcc
13291330
[--disable-gcc-checking]
@@ -1339,7 +1340,7 @@ Optional Packages:
13391340
available options: 2.2, 20190608, 20191213
13401341
--with-multilib-generator
13411342
Multi-libs configuration string, only supported for
1342-
bare-metal/elf toolchaih, this option implied
1343+
bare-metal/elf toolchain, this option implied
13431344
--enable-multilib
13441345
--with-cmodel Select the code model to use when building libc and
13451346
libgcc [--with-cmodel=medlow]
@@ -3398,6 +3399,14 @@ else
33983399
33993400
fi
34003401
3402+
if test "x$enable_multilib" != xno; then :
3403+
musl_multilib_names="rv64imac-lp64 rv64imafdc-lp64d"
3404+
3405+
else
3406+
musl_multilib_names="$with_arch-$with_abi"
3407+
3408+
fi
3409+
34013410
# Check whether --enable-gcc-checking was given.
34023411
if test "${enable_gcc_checking+set}" = set; then :
34033412
enableval=$enable_gcc_checking;
@@ -4836,3 +4845,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
48364845
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
48374846
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
48384847
fi
4848+

0 commit comments

Comments
 (0)