diff options
author | quxm <xianmiao.qxm@alibaba-inc.com> | 2023-01-25 17:47:33 +0800 |
---|---|---|
committer | Mao Han <han_mao@linux.alibaba.com> | 2023-02-07 16:34:24 +0800 |
commit | ec6d2b83f254606fc2e646595782a70b301a2524 (patch) | |
tree | 1db32c468ba0ca1b387f30140aac6266f8ad46c6 /sysdeps/csky/preconfigure.ac | |
parent | 41f67ccbe92b4fd09e1062b383e55e407ae5bfa1 (diff) | |
download | glibc-ec6d2b83f254606fc2e646595782a70b301a2524.tar.gz glibc-ec6d2b83f254606fc2e646595782a70b301a2524.tar.xz glibc-ec6d2b83f254606fc2e646595782a70b301a2524.zip |
C-SKY: Strip hard float abi from hard float feature.
The hard float abi and hard float are different, Hard float abi: Use float register to pass float type arguments. Hard float: Enable the hard float ISA feature. So the with_fp_cond cannot represent these two features. When -mfloat-abi=softfp, the float abi is soft and hard float is enabled. So add 'with_hard_float_abi' in preconfigure and define 'CSKY_HARD_FLOAT_ABI' if float abi is hard, and use 'CSKY_HARD_FLOAT_ABI' to determine dynamic linker because it is what determines compatibility. And with_fp_cond is still needed to tell glibc whether to enable hard floating feature. In addition, use AC_TRY_COMMAND to test gcc to ensure compatibility between different versions of gcc. The original way has a problem that __CSKY_HARD_FLOAT_FPU_SF__ means the target only has single hard float-points ISA, so it's not defined in CPUs like ck810f. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/csky/preconfigure.ac')
-rw-r--r-- | sysdeps/csky/preconfigure.ac | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/sysdeps/csky/preconfigure.ac b/sysdeps/csky/preconfigure.ac index 332c0f1cab..9a4083dda5 100644 --- a/sysdeps/csky/preconfigure.ac +++ b/sysdeps/csky/preconfigure.ac @@ -5,10 +5,8 @@ case "$machine" in csky*) abi=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define __CSKYABI__ \(.*\)/\1/p'` - hard_float=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | - sed -n 's/^#define __CSKY_HARD_FLOAT__ \(.*\)/\1/p'` - hard_float_sf=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | - sed -n 's/^#define __CSKY_HARD_FLOAT_FPU_SF__ \(.*\)/\1/p'` + soft_float=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | + sed -n 's/^#define __CSKY_SOFT_FLOAT__ \(.*\)/\1/p'` hard_float_abi=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define __CSKY_HARD_FLOAT_ABI__ \(.*\)/\1/p'` @@ -24,26 +22,34 @@ csky*) ;; esac - # __CSKY_HARD_FLOAT_ABI__ was added on gcc 11 to specify whether - # -mfloat-abi=hard is set. On older gcc, the float ABI is defined solely - # with __CSKY_HARD_FLOAT__. If __CSKY_HARD_FLOAT__ is set, it can be - # either a hard-float ABI (gcc older than 11, or gcc11 -mfloat-abi=hard - # (__CSKY_HARD_FLOAT_ABI__ is set) or -mfloat-abi=softfp - # (__CSKY_HARD_FLOAT_ABI__ is not set). To be compatible with older gcc, - # use __CSKY_HARD_FLOAT_FPU_SF__ identify if -mfloat-abi is supported, - # because it is added to gcc at the same time as -mfloat-abi. - if test -n "$hard_float"; then - if test -z "$hard_float_sf"; then - with_fp_cond=1 - else + # This check is for compatibility with GCC versions earlier than 11. + # The older versions of C-SKY GCC do not support the '-mfloat-abi=softfp' option + # and never define the '__CSKY_HARD_FLOAT_ABI__'. + # Therefore, if a check for '-mfloat-abi=softfp' is added as the expression + # 'defined(__CSKY_HARD_FLOAT__) && !defined(__CSKY_HARD_FLOAT_ABI__)' + # which is correct for newer versions of GCC will not work for those older versions. + # Since no expression compatible with all versions of GCC exists, + # a check for the '-mfloat-abi=softfp' option is added. + if AC_TRY_COMMAND(${CC-cc} -S -mfloat-abi=softfp /dev/null 1>&AS_MESSAGE_LOG_FD); then + soft_float_abi_support=1 + else + soft_float_abi_support=0 + fi + + if test -n "$soft_float"; then + with_fp_cond=0 + with_hard_float_abi=0 + else + with_fp_cond=1 + if test -n "$soft_float_abi_support"; then if test -n "$hard_float_abi"; then - with_fp_cond=1 + with_hard_float_abi=1 else - with_fp_cond=0 + with_hard_float_abi=0 fi + else + with_hard_float_abi=1 fi - else - with_fp_cond=0 fi base_machine=csky @@ -51,5 +57,6 @@ csky*) AC_DEFINE_UNQUOTED([CSKYABI], [$abi]) AC_DEFINE_UNQUOTED([CSKY_HARD_FLOAT], [$with_fp_cond]) + AC_DEFINE_UNQUOTED([CSKY_HARD_FLOAT_ABI], [$with_hard_float_abi]) ;; esac |