about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorCooper Qu <cooper.qu@linux.alibaba.com>2020-10-20 23:00:59 +0800
committerMao Han <han_mao@linux.alibaba.com>2020-10-21 16:05:29 +0800
commit56b223c1c8334e4255bf11aed1386a007822702a (patch)
tree3b3a2f0d3e0432f6585fc288ba7746527bb26499 /sysdeps
parent33e5907ee6be67f029a98c2d7df60561dd7186cc (diff)
downloadglibc-56b223c1c8334e4255bf11aed1386a007822702a.tar.gz
glibc-56b223c1c8334e4255bf11aed1386a007822702a.tar.xz
glibc-56b223c1c8334e4255bf11aed1386a007822702a.zip
C-SKY: Make dynamic linker's name compitable with the older gcc.
__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.

Reviewed-by: Mao Han  <han_mao@linux.alibaba.com>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/csky/preconfigure35
1 files changed, 26 insertions, 9 deletions
diff --git a/sysdeps/csky/preconfigure b/sysdeps/csky/preconfigure
index 16f3b60cf5..5f22416f95 100644
--- a/sysdeps/csky/preconfigure
+++ b/sysdeps/csky/preconfigure
@@ -2,8 +2,12 @@ case "$machine" in
 csky*)
     abi=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null |
       sed -n 's/^#define __CSKYABI__ \(.*\)/\1/p'`
-    float_abi=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null |
+    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'`
+    hard_float_abi=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null |
+      sed -n 's/^#define __CSKY_HARD_FLOAT_ABI__ \(.*\)/\1/p'`
 
     case "$abi" in
     1)
@@ -19,14 +23,27 @@ csky*)
         ;;
     esac
 
-    case "$float_abi" in
-    1)
-        with_fp_cond=1
-        ;;
-    *)
-        with_fp_cond=0
-        ;;
-    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
+	    if test -n "$hard_float_abi"; then
+		with_fp_cond=1
+	    else
+		with_fp_cond=0
+	    fi
+	fi
+    else
+	with_fp_cond=0
+    fi
 
     base_machine=csky
     machine=csky/$machine