RISC-V: Add configure check for Zaamo/Zalrsc assembler support
Binutils 2.42 and before don't support Zaamo/Zalrsc. Add a configure check to prevent emitting Zaamo/Zalrsc in the arch string when the assember does not support it. gcc/ChangeLog: * common/config/riscv/riscv-common.cc (riscv_subset_list::to_string): Skip zaamo/zalrsc when not supported by the assembler. * config.in: Regenerate. * configure: Regenerate. * configure.ac: Add zaamo/zalrsc assmeber check. Signed-off-by: Patrick O'Neill <patrick@rivosinc.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com> # RISC-V Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> # RISC-V
This commit is contained in:
@@ -916,6 +916,7 @@ riscv_subset_list::to_string (bool version_p) const
|
||||
riscv_subset_t *subset;
|
||||
|
||||
bool skip_zifencei = false;
|
||||
bool skip_zaamo_zalrsc = false;
|
||||
bool skip_zicsr = false;
|
||||
bool i2p0 = false;
|
||||
|
||||
@@ -943,6 +944,10 @@ riscv_subset_list::to_string (bool version_p) const
|
||||
a mistake in that binutils 2.35 supports zicsr but not zifencei. */
|
||||
skip_zifencei = true;
|
||||
#endif
|
||||
#ifndef HAVE_AS_MARCH_ZAAMO_ZALRSC
|
||||
/* Skip since binutils 2.42 and earlier don't recognize zaamo/zalrsc. */
|
||||
skip_zaamo_zalrsc = true;
|
||||
#endif
|
||||
|
||||
for (subset = m_head; subset != NULL; subset = subset->next)
|
||||
{
|
||||
@@ -954,6 +959,12 @@ riscv_subset_list::to_string (bool version_p) const
|
||||
subset->name == "zicsr")
|
||||
continue;
|
||||
|
||||
if (skip_zaamo_zalrsc && subset->name == "zaamo")
|
||||
continue;
|
||||
|
||||
if (skip_zaamo_zalrsc && subset->name == "zalrsc")
|
||||
continue;
|
||||
|
||||
/* For !version_p, we only separate extension with underline for
|
||||
multi-letter extension. */
|
||||
if (!first &&
|
||||
|
||||
@@ -629,6 +629,12 @@
|
||||
#endif
|
||||
|
||||
|
||||
/* Define if the assembler understands -march=rv*_zaamo_zalrsc. */
|
||||
#ifndef USED_FOR_TARGET
|
||||
#undef HAVE_AS_MARCH_ZAAMO_ZALRSC
|
||||
#endif
|
||||
|
||||
|
||||
/* Define if the assembler understands -march=rv*_zifencei. */
|
||||
#ifndef USED_FOR_TARGET
|
||||
#undef HAVE_AS_MARCH_ZIFENCEI
|
||||
|
||||
Vendored
+31
@@ -30820,6 +30820,37 @@ if test $gcc_cv_as_riscv_march_zifencei = yes; then
|
||||
|
||||
$as_echo "#define HAVE_AS_MARCH_ZIFENCEI 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for -march=rv32i_zaamo_zalrsc support" >&5
|
||||
$as_echo_n "checking assembler for -march=rv32i_zaamo_zalrsc support... " >&6; }
|
||||
if ${gcc_cv_as_riscv_march_zaamo_zalrsc+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
gcc_cv_as_riscv_march_zaamo_zalrsc=no
|
||||
if test x$gcc_cv_as != x; then
|
||||
$as_echo '' > conftest.s
|
||||
if { ac_try='$gcc_cv_as $gcc_cv_as_flags -march=rv32i_zaamo_zalrsc -o conftest.o conftest.s >&5'
|
||||
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; }
|
||||
then
|
||||
gcc_cv_as_riscv_march_zaamo_zalrsc=yes
|
||||
else
|
||||
echo "configure: failed program was" >&5
|
||||
cat conftest.s >&5
|
||||
fi
|
||||
rm -f conftest.o conftest.s
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_riscv_march_zaamo_zalrsc" >&5
|
||||
$as_echo "$gcc_cv_as_riscv_march_zaamo_zalrsc" >&6; }
|
||||
if test $gcc_cv_as_riscv_march_zaamo_zalrsc = yes; then
|
||||
|
||||
$as_echo "#define HAVE_AS_MARCH_ZAAMO_ZALRSC 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
;;
|
||||
|
||||
@@ -5452,6 +5452,11 @@ configured with --enable-newlib-nano-formatted-io.])
|
||||
[-march=rv32i_zifencei2p0],,,
|
||||
[AC_DEFINE(HAVE_AS_MARCH_ZIFENCEI, 1,
|
||||
[Define if the assembler understands -march=rv*_zifencei.])])
|
||||
gcc_GAS_CHECK_FEATURE([-march=rv32i_zaamo_zalrsc support],
|
||||
gcc_cv_as_riscv_march_zaamo_zalrsc,
|
||||
[-march=rv32i_zaamo_zalrsc],,,
|
||||
[AC_DEFINE(HAVE_AS_MARCH_ZAAMO_ZALRSC, 1,
|
||||
[Define if the assembler understands -march=rv*_zaamo_zalrsc.])])
|
||||
;;
|
||||
loongarch*-*-*)
|
||||
gcc_GAS_CHECK_FEATURE([.dtprelword support],
|
||||
|
||||
Reference in New Issue
Block a user