diff mbox series

[3/3] gcc: Drop mips default ABI patch

Message ID 20211125152234.129463-3-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit e0010af733825ed1050fd3342cf3ef1c478df1a0
Headers show
Series [1/3] nativesdk: Handle chown/chgrp calls in nativesdk do_install tasks | expand

Commit Message

Richard Purdie Nov. 25, 2021, 3:22 p.m. UTC 
gcc-configure-common.inc already sets --with-abi=64 for our mips64
targets so this patch is no longer needed.

[YOCTO #14639]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/gcc/gcc-11.2.inc        |  1 -
 .../gcc/0010-MIPS64-Default-to-N64-ABI.patch  | 54 -------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch

Comments

Khem Raj Nov. 25, 2021, 5:51 p.m. UTC | #1 
On 11/25/21 7:22 AM, Richard Purdie wrote:
> gcc-configure-common.inc already sets --with-abi=64 for our mips64
> targets so this patch is no longer needed.

sounds good. Long time ago, IIRC it did not work for compiling the 
target gcc so it has to be enforced but I agree one less patch is better 
now.

> 
> [YOCTO #14639]
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>   meta/recipes-devtools/gcc/gcc-11.2.inc        |  1 -
>   .../gcc/0010-MIPS64-Default-to-N64-ABI.patch  | 54 -------------------
>   2 files changed, 55 deletions(-)
>   delete mode 100644 meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
> index b4e4300c66b..afb8f2df5c2 100644
> --- a/meta/recipes-devtools/gcc/gcc-11.2.inc
> +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
> @@ -36,7 +36,6 @@ SRC_URI = "\
>              file://0005-optional-libstdc.patch \
>              file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
>              file://0009-cpp-honor-sysroot.patch \
> -           file://0010-MIPS64-Default-to-N64-ABI.patch \
>              file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
>              file://0012-gcc-Fix-argument-list-too-long-error.patch \
>              file://0014-libtool.patch \
> diff --git a/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
> deleted file mode 100644
> index f385f8c5a20..00000000000
> --- a/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From a2dc2fa4cc7e5d54544d4a7b6601eef79bc26cad Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 29 Mar 2013 09:23:08 +0400
> -Subject: [PATCH] MIPS64: Default to N64 ABI
> -
> -MIPS64 defaults to n32 ABI, this patch makes it
> -so that it defaults to N64 ABI
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Upstream-Status: Inappropriate [OE config specific]
> ----
> - gcc/config.gcc | 10 +++++-----
> - 1 file changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/gcc/config.gcc b/gcc/config.gcc
> -index 3ec7582f5dd..a046fa6945c 100644
> ---- a/gcc/config.gcc
> -+++ b/gcc/config.gcc
> -@@ -2543,29 +2543,29 @@ mips*-*-linux*)				# Linux MIPS, either endian.
> - 			default_mips_arch=mips32
> - 			;;
> - 		mips64el-st-linux-gnu)
> --			default_mips_abi=n32
> -+			default_mips_abi=64
> - 			tm_file="${tm_file} mips/st.h"
> - 			tmake_file="${tmake_file} mips/t-st"
> - 			enable_mips_multilibs="yes"
> - 			;;
> - 		mips64octeon*-*-linux*)
> --			default_mips_abi=n32
> -+			default_mips_abi=64
> - 			tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
> - 			target_cpu_default=MASK_SOFT_FLOAT_ABI
> - 			enable_mips_multilibs="yes"
> - 			;;
> - 		mipsisa64r6*-*-linux*)
> --			default_mips_abi=n32
> -+			default_mips_abi=64
> - 			default_mips_arch=mips64r6
> - 			enable_mips_multilibs="yes"
> - 			;;
> - 		mipsisa64r2*-*-linux*)
> --			default_mips_abi=n32
> -+			default_mips_abi=64
> - 			default_mips_arch=mips64r2
> - 			enable_mips_multilibs="yes"
> - 			;;
> - 		mips64*-*-linux* | mipsisa64*-*-linux*)
> --			default_mips_abi=n32
> -+			default_mips_abi=64
> - 			enable_mips_multilibs="yes"
> - 			;;
> - 	esac
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#158783): https://lists.openembedded.org/g/openembedded-core/message/158783
> Mute This Topic: https://lists.openembedded.org/mt/87304170/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc
index b4e4300c66b..afb8f2df5c2 100644
--- a/meta/recipes-devtools/gcc/gcc-11.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
@@ -36,7 +36,6 @@  SRC_URI = "\
            file://0005-optional-libstdc.patch \
            file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
            file://0009-cpp-honor-sysroot.patch \
-           file://0010-MIPS64-Default-to-N64-ABI.patch \
            file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
            file://0012-gcc-Fix-argument-list-too-long-error.patch \
            file://0014-libtool.patch \
diff --git a/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
deleted file mode 100644
index f385f8c5a20..00000000000
--- a/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
+++ /dev/null
@@ -1,54 +0,0 @@ 
-From a2dc2fa4cc7e5d54544d4a7b6601eef79bc26cad Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 09:23:08 +0400
-Subject: [PATCH] MIPS64: Default to N64 ABI
-
-MIPS64 defaults to n32 ABI, this patch makes it
-so that it defaults to N64 ABI
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Inappropriate [OE config specific]
----
- gcc/config.gcc | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 3ec7582f5dd..a046fa6945c 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2543,29 +2543,29 @@ mips*-*-linux*)				# Linux MIPS, either endian.
- 			default_mips_arch=mips32
- 			;;
- 		mips64el-st-linux-gnu)
--			default_mips_abi=n32
-+			default_mips_abi=64
- 			tm_file="${tm_file} mips/st.h"
- 			tmake_file="${tmake_file} mips/t-st"
- 			enable_mips_multilibs="yes"
- 			;;
- 		mips64octeon*-*-linux*)
--			default_mips_abi=n32
-+			default_mips_abi=64
- 			tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
- 			target_cpu_default=MASK_SOFT_FLOAT_ABI
- 			enable_mips_multilibs="yes"
- 			;;
- 		mipsisa64r6*-*-linux*)
--			default_mips_abi=n32
-+			default_mips_abi=64
- 			default_mips_arch=mips64r6
- 			enable_mips_multilibs="yes"
- 			;;
- 		mipsisa64r2*-*-linux*)
--			default_mips_abi=n32
-+			default_mips_abi=64
- 			default_mips_arch=mips64r2
- 			enable_mips_multilibs="yes"
- 			;;
- 		mips64*-*-linux* | mipsisa64*-*-linux*)
--			default_mips_abi=n32
-+			default_mips_abi=64
- 			enable_mips_multilibs="yes"
- 			;;
- 	esac