diff options
author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2023-05-05 09:01:58 +0100 |
---|---|---|
committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2023-05-05 11:34:44 +0100 |
commit | 642f1b9b3de8d847b43af928107057116eb6e7f1 (patch) | |
tree | 06d34c3100c98c2e1a59c138b086c5d4f86e6a9e | |
parent | ee68e9cba456ed02f080cccd0c37af671bd48108 (diff) | |
download | glibc-642f1b9b3de8d847b43af928107057116eb6e7f1.tar glibc-642f1b9b3de8d847b43af928107057116eb6e7f1.tar.gz glibc-642f1b9b3de8d847b43af928107057116eb6e7f1.tar.bz2 glibc-642f1b9b3de8d847b43af928107057116eb6e7f1.zip |
aarch64: More configure checks for libmvec
Check assembler and linker support too, not just SVE ACLE in the
compiler, since variant PCS requires at least binutils 2.32.1.
-rw-r--r-- | sysdeps/aarch64/configure | 29 | ||||
-rw-r--r-- | sysdeps/aarch64/configure.ac | 25 |
2 files changed, 48 insertions, 6 deletions
diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure index 030996c55a..5497dd397e 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -332,7 +332,7 @@ if test x"$build_mathvec" = xnotset; then build_mathvec=yes fi -# Check if compiler is sufficient to build mathvec (needs SVE ACLE) +# Check if compiler supports SVE ACLE. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for availability of SVE ACLE" >&5 $as_echo_n "checking for availability of SVE ACLE... " >&6; } if ${libc_cv_aarch64_sve_acle+:} false; then : @@ -355,6 +355,29 @@ EOF fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_aarch64_sve_acle" >&5 $as_echo "$libc_cv_aarch64_sve_acle" >&6; } -if test $build_mathvec = yes && test $libc_cv_aarch64_sve_acle = no; then - as_fn_error $? "mathvec is enabled but compiler does not have SVE ACLE. Either use a compatible compiler or configure with --disable-mathvec (this results in incomplete ABI)." "$LINENO" 5 + +# Check if compiler is sufficient to build mathvec +if test $build_mathvec = yes; then + fail=no + if test $libc_cv_aarch64_variant_pcs = no; then + fail=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mathvec is enabled but linker does not support variant PCS." >&5 +$as_echo "$as_me: WARNING: mathvec is enabled but linker does not support variant PCS." >&2;} + fi + if test $libc_cv_aarch64_sve_asm = no; then + fail=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mathvec is enabled but assembler does not support SVE." >&5 +$as_echo "$as_me: WARNING: mathvec is enabled but assembler does not support SVE." >&2;} + fi + if test $libc_cv_aarch64_sve_acle = no; then + fail=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mathvec is enabled but compiler does not have SVE ACLE." >&5 +$as_echo "$as_me: WARNING: mathvec is enabled but compiler does not have SVE ACLE." >&2;} + fi + if test $fail = yes; then + as_fn_error $? "use a compatible toolchain or configure with --disable-mathvec (this results in incomplete ABI)." "$LINENO" 5 + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mathvec is disabled, this results in incomplete ABI." >&5 +$as_echo "$as_me: WARNING: mathvec is disabled, this results in incomplete ABI." >&2;} fi diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac index 76f78fcba9..27874eceb4 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -106,7 +106,7 @@ if test x"$build_mathvec" = xnotset; then build_mathvec=yes fi -# Check if compiler is sufficient to build mathvec (needs SVE ACLE) +# Check if compiler supports SVE ACLE. AC_CACHE_CHECK(for availability of SVE ACLE, libc_cv_aarch64_sve_acle, [dnl cat > conftest.c <<EOF #include <arm_sve.h> @@ -117,6 +117,25 @@ EOF libc_cv_aarch64_sve_acle=no fi rm conftest.c]) -if test $build_mathvec = yes && test $libc_cv_aarch64_sve_acle = no; then - AC_MSG_ERROR([mathvec is enabled but compiler does not have SVE ACLE. Either use a compatible compiler or configure with --disable-mathvec (this results in incomplete ABI).]) + +# Check if compiler is sufficient to build mathvec +if test $build_mathvec = yes; then + fail=no + if test $libc_cv_aarch64_variant_pcs = no; then + fail=yes + AC_MSG_WARN([mathvec is enabled but linker does not support variant PCS.]) + fi + if test $libc_cv_aarch64_sve_asm = no; then + fail=yes + AC_MSG_WARN([mathvec is enabled but assembler does not support SVE.]) + fi + if test $libc_cv_aarch64_sve_acle = no; then + fail=yes + AC_MSG_WARN([mathvec is enabled but compiler does not have SVE ACLE.]) + fi + if test $fail = yes; then + AC_MSG_ERROR([use a compatible toolchain or configure with --disable-mathvec (this results in incomplete ABI).]) + fi +else + AC_MSG_WARN([mathvec is disabled, this results in incomplete ABI.]) fi |