]> code.ossystems Code Review - openembedded-core.git/commitdiff
gcc: Drop mips default ABI patch
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 25 Nov 2021 15:18:48 +0000 (15:18 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 26 Nov 2021 16:58:55 +0000 (16:58 +0000)
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
meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch [deleted file]

index b4e4300c66b0db7fc51117241721591b44c35d6c..afb8f2df5c2f32feeddd4567ade3b1f7b6cfaff5 100644 (file)
@@ -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 (file)
index f385f8c..0000000
+++ /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