Message ID | 20201020150938.35160-1-cooper.qu@linux.alibaba.com |
---|---|
State | New |
Headers | show |
Series | C-SKY: Make dynamic linker's name compitable with the older gcc. | expand |
On 20/10/2020 12:09, Cooper Qu wrote: > __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. > > * sysdeps/csky/preconfigure : Make it compitable with the older gcc. Ok, just to summarize if I got this correctly: __CSKY_HARD_FLOAT__ | __CSKY_HARD_FLOAT_FPU_SF__ | __CSKY_HARD_FLOAT_ABI__ | fp_cond 1. gcc9/10 | X | | | 1 2. gcc9/10 | | | | 0 3. gcc11 | X | X | | 0 4. gcc11 | X | | X | 1 5. gcc11 | | | | 0 6. gcc11 | | | | 0 LGTM. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > sysdeps/csky/preconfigure | 35 ++++++++++++++++++++++++++--------- > 1 file changed, 26 insertions(+), 9 deletions(-) > > diff --git a/sysdeps/csky/preconfigure b/sysdeps/csky/preconfigure > index 11b887f..5f22416 100644 > --- a/sysdeps/csky/preconfigure > +++ b/sysdeps/csky/preconfigure > @@ -2,7 +2,11 @@ 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 > @@ -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 Ok, this is the 1. on the table I compiled. > + else > + if test -n "$hard_float_abi"; then > + with_fp_cond=1 Ok, this is the 4. > + else > + with_fp_cond=0 Ok, this is the 3. > + fi > + fi > + else > + with_fp_cond=0 Ok, this handles 2., 5., and 6. > + fi > > base_machine=csky > machine=csky/$machine >
diff --git a/sysdeps/csky/preconfigure b/sysdeps/csky/preconfigure index 11b887f..5f22416 100644 --- a/sysdeps/csky/preconfigure +++ b/sysdeps/csky/preconfigure @@ -2,7 +2,11 @@ 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 @@ -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