From 656dd306d49f34fb89a118624def9c1db8a9cfcb Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Sat, 30 Mar 2019 01:11:31 +0000 Subject: [PATCH] RISC-V: Fix `test' operand error with soft-float ABI being configured Fix a: .../sysdeps/unix/sysv/linux/riscv/configure: line 181: test: =: unary operator expected message produced by the RISC-V configure fragment with the soft-float ABI selected, caused by $libc_cv_riscv_float_abi evaluating to nil in the invocation of `test $libc_cv_riscv_float_abi = no'. * sysdeps/unix/sysv/linux/riscv/configure.ac: Quote $libc_cv_riscv_float_abi in `test' invocation. * sysdeps/unix/sysv/linux/riscv/configure: Regenerate. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/riscv/configure | 2 +- sysdeps/unix/sysv/linux/riscv/configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60f76450e5f..bef50d40f60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-03-30 Maciej W. Rozycki + + * sysdeps/unix/sysv/linux/riscv/configure.ac: Quote + $libc_cv_riscv_float_abi in `test' invocation. + * sysdeps/unix/sysv/linux/riscv/configure: Regenerate. + 2019-03-29 Paul A. Clarke * sysdeps/powerpc/fpu/fenv_libc.h (fegetenv_register): Replace inline diff --git a/sysdeps/unix/sysv/linux/riscv/configure b/sysdeps/unix/sysv/linux/riscv/configure index 816e9145ebb..3018ca8f1b8 100755 --- a/sysdeps/unix/sysv/linux/riscv/configure +++ b/sysdeps/unix/sysv/linux/riscv/configure @@ -178,7 +178,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | fi rm -f conftest* -if test $libc_cv_riscv_float_abi = no; then +if test "$libc_cv_riscv_float_abi" = no; then as_fn_error $? "Unable to determine floating-point ABI" "$LINENO" 5 fi diff --git a/sysdeps/unix/sysv/linux/riscv/configure.ac b/sysdeps/unix/sysv/linux/riscv/configure.ac index 4fae013ec91..d4819931ca3 100644 --- a/sysdeps/unix/sysv/linux/riscv/configure.ac +++ b/sysdeps/unix/sysv/linux/riscv/configure.ac @@ -20,7 +20,7 @@ AC_EGREP_CPP(yes, [#ifdef __riscv_float_abi_soft yes #endif ],libc_cv_riscv_float_abi=) -if test $libc_cv_riscv_float_abi = no; then +if test "$libc_cv_riscv_float_abi" = no; then AC_MSG_ERROR([Unable to determine floating-point ABI]) fi -- 2.39.2