diff mbox series

C-SKY: Support multilib for mfloat-abi=.

Message ID 1600241358-31114-1-git-send-email-jiejie_rong@c-sky.com
State New
Headers show
Series C-SKY: Support multilib for mfloat-abi=. | expand

Commit Message

Jojo R Sept. 16, 2020, 7:29 a.m. UTC 
gcc/ChangeLog:

	* config/csky/t-csky-linux (CSKY_MULTILIB_OSDIRNAMES): Use mfloat-abi.
	(MULTILIB_OPTIONS): Likewise.
	* config/csky/t-csky-elf (MULTILIB_OPTIONS): Likewise.
	(MULTILIB_EXCEPTIONS): Likewise.

---
 gcc/config/csky/t-csky-elf   | 13 ++++++++-----
 gcc/config/csky/t-csky-linux |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

Comments

Xianmiao Qu Sept. 16, 2020, 8:59 a.m. UTC | #1 
Approved.


Thanks,

Cooper

On 9/16/20 3:29 PM, Jojo R wrote:
> gcc/ChangeLog:
>
> 	* config/csky/t-csky-linux (CSKY_MULTILIB_OSDIRNAMES): Use mfloat-abi.
> 	(MULTILIB_OPTIONS): Likewise.
> 	* config/csky/t-csky-elf (MULTILIB_OPTIONS): Likewise.
> 	(MULTILIB_EXCEPTIONS): Likewise.
>
> ---
>   gcc/config/csky/t-csky-elf   | 13 ++++++++-----
>   gcc/config/csky/t-csky-linux |  8 ++++----
>   2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/gcc/config/csky/t-csky-elf b/gcc/config/csky/t-csky-elf
> index cd690bc..62a2d83 100644
> --- a/gcc/config/csky/t-csky-elf
> +++ b/gcc/config/csky/t-csky-elf
> @@ -100,8 +100,11 @@ MULTILIB_MATCHES     += mcpu?ck807f=march?ck807ef
>   MULTILIB_MATCHES     += mcpu?ck807f=march?ck807
>   MULTILIB_MATCHES     += mcpu?ck807f=mcpu?ck807
>   
> -# For option -msoft-float/-mhard-float.
> -MULTILIB_OPTIONS     += msoft-float/mhard-float
> -MULTILIB_DIRNAMES    += soft-fp hard-fp
> -MULTILIB_EXCEPTIONS  += *mcpu=ck801/*mhard-float*
> -MULTILIB_EXCEPTIONS  += *mcpu=ck802/*mhard-float*
> +# For option -mfloat-abi=
> +MULTILIB_OPTIONS     += mfloat-abi=soft/mfloat-abi=softfp/mfloat-abi=hard
> +MULTILIB_DIRNAMES    += soft soft-fp hard-fp
> +
> +MULTILIB_EXCEPTIONS  += *mcpu=ck801/*mfloat-abi=softfp*
> +MULTILIB_EXCEPTIONS  += *mcpu=ck802/*mfloat-abi=softfp*
> +MULTILIB_EXCEPTIONS  += *mcpu=ck801/*mfloat-abi=hard*
> +MULTILIB_EXCEPTIONS  += *mcpu=ck802/*mfloat-abi=hard*
> diff --git a/gcc/config/csky/t-csky-linux b/gcc/config/csky/t-csky-linux
> index df471ed..f4d656a 100644
> --- a/gcc/config/csky/t-csky-linux
> +++ b/gcc/config/csky/t-csky-linux
> @@ -21,7 +21,7 @@
>   
>   
>   MULTILIB_EXCEPTIONS  =
> -CSKY_MULTILIB_OSDIRNAMES = mhard-float=/hard-fp msoft-float=/. mcpu.ck810f=/. mcpu.ck807f=/ck807
> +CSKY_MULTILIB_OSDIRNAMES = mfloat-abi.softfp=/soft-fp mfloat-abi.hard=/hard-fp mfloat-abi.soft=/. mcpu.ck810f=/. mcpu.ck807f=/ck807
>   
>   # Arch variants.
>   MULTILIB_OPTIONS     += mcpu=ck810f/mcpu=ck807f
> @@ -41,6 +41,6 @@ MULTILIB_MATCHES     += mcpu?ck810f=mcpu?ck810vf
>   MULTILIB_MATCHES     += mcpu?ck810f=mcpu?ck810ft
>   MULTILIB_MATCHES     += mcpu?ck810f=mcpu?ck810vft
>   
> -# For option -msoft-float/-mhard-float.
> -MULTILIB_OPTIONS    += msoft-float/mhard-float
> -MULTILIB_DIRNAMES   += soft-fp hard-fp
> +# For option -mfloat-abi=
> +MULTILIB_OPTIONS     += mfloat-abi=soft/mfloat-abi=softfp/mfloat-abi=hard
> +MULTILIB_DIRNAMES    += soft soft-fp hard-fp
diff mbox series

Patch

diff --git a/gcc/config/csky/t-csky-elf b/gcc/config/csky/t-csky-elf
index cd690bc..62a2d83 100644
--- a/gcc/config/csky/t-csky-elf
+++ b/gcc/config/csky/t-csky-elf
@@ -100,8 +100,11 @@  MULTILIB_MATCHES     += mcpu?ck807f=march?ck807ef
 MULTILIB_MATCHES     += mcpu?ck807f=march?ck807
 MULTILIB_MATCHES     += mcpu?ck807f=mcpu?ck807
 
-# For option -msoft-float/-mhard-float.
-MULTILIB_OPTIONS     += msoft-float/mhard-float
-MULTILIB_DIRNAMES    += soft-fp hard-fp
-MULTILIB_EXCEPTIONS  += *mcpu=ck801/*mhard-float*
-MULTILIB_EXCEPTIONS  += *mcpu=ck802/*mhard-float*
+# For option -mfloat-abi=
+MULTILIB_OPTIONS     += mfloat-abi=soft/mfloat-abi=softfp/mfloat-abi=hard
+MULTILIB_DIRNAMES    += soft soft-fp hard-fp
+
+MULTILIB_EXCEPTIONS  += *mcpu=ck801/*mfloat-abi=softfp*
+MULTILIB_EXCEPTIONS  += *mcpu=ck802/*mfloat-abi=softfp*
+MULTILIB_EXCEPTIONS  += *mcpu=ck801/*mfloat-abi=hard*
+MULTILIB_EXCEPTIONS  += *mcpu=ck802/*mfloat-abi=hard*
diff --git a/gcc/config/csky/t-csky-linux b/gcc/config/csky/t-csky-linux
index df471ed..f4d656a 100644
--- a/gcc/config/csky/t-csky-linux
+++ b/gcc/config/csky/t-csky-linux
@@ -21,7 +21,7 @@ 
 
 
 MULTILIB_EXCEPTIONS  =
-CSKY_MULTILIB_OSDIRNAMES = mhard-float=/hard-fp msoft-float=/. mcpu.ck810f=/. mcpu.ck807f=/ck807
+CSKY_MULTILIB_OSDIRNAMES = mfloat-abi.softfp=/soft-fp mfloat-abi.hard=/hard-fp mfloat-abi.soft=/. mcpu.ck810f=/. mcpu.ck807f=/ck807
 
 # Arch variants.
 MULTILIB_OPTIONS     += mcpu=ck810f/mcpu=ck807f
@@ -41,6 +41,6 @@  MULTILIB_MATCHES     += mcpu?ck810f=mcpu?ck810vf
 MULTILIB_MATCHES     += mcpu?ck810f=mcpu?ck810ft
 MULTILIB_MATCHES     += mcpu?ck810f=mcpu?ck810vft
 
-# For option -msoft-float/-mhard-float.
-MULTILIB_OPTIONS    += msoft-float/mhard-float
-MULTILIB_DIRNAMES   += soft-fp hard-fp
+# For option -mfloat-abi=
+MULTILIB_OPTIONS     += mfloat-abi=soft/mfloat-abi=softfp/mfloat-abi=hard
+MULTILIB_DIRNAMES    += soft soft-fp hard-fp