[3/4] binutils: Drop mips default target patch

Message ID 20211209172537.641755-3-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 259bcfdac3ad87d269dd18617c784fe14c50b0ad
Headers show
Series [1/4] binutils: Drop mips gold patch | expand

Commit Message

Richard Purdie Dec. 9, 2021, 5:25 p.m. UTC
Similarly to the recent gcc change, we make gcc default to the 64 bit target
through configuration now so we don't need to patch this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../binutils/binutils-2.37.inc                |  1 -
 ...e-default-emulation-for-mips64-linux.patch | 57 -------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch

Comments

Khem Raj Dec. 9, 2021, 5:28 p.m. UTC | #1
On Thu, Dec 9, 2021 at 9:25 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Similarly to the recent gcc change, we make gcc default to the 64 bit target
> through configuration now so we don't need to patch this.
>

LGTM

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../binutils/binutils-2.37.inc                |  1 -
>  ...e-default-emulation-for-mips64-linux.patch | 57 -------------------
>  2 files changed, 58 deletions(-)
>  delete mode 100644 meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc b/meta/recipes-devtools/binutils/binutils-2.37.inc
> index a3e0fbc769d..8c6e659e73d 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.37.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
> @@ -26,7 +26,6 @@ SRC_URI = "\
>       file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
>       file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
>       file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
> -     file://0009-Change-default-emulation-for-mips64-linux.patch \
>       file://0010-Add-support-for-Netlogic-XLP.patch \
>       file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
>       file://0013-Use-libtool-2.4.patch \
> diff --git a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
> deleted file mode 100644
> index fab92d52e68..00000000000
> --- a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -From fb6d52dda9c230baf869ed5f981581a7b5094b70 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Mon, 2 Mar 2015 01:44:14 +0000
> -Subject: [PATCH] Change default emulation for mips64*-*-linux
> -
> -we change the default emulations to be N64 instead of N32
> -
> -Upstream-Status: Inappropriate [ OE configuration Specific]
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - bfd/config.bfd   | 8 ++++----
> - ld/configure.tgt | 8 ++++----
> - 2 files changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/bfd/config.bfd b/bfd/config.bfd
> -index 30087e3b8f8..1896e11790c 100644
> ---- a/bfd/config.bfd
> -+++ b/bfd/config.bfd
> -@@ -891,12 +891,12 @@ case "${targ}" in
> -     targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
> -     ;;
> -   mips64*el-*-linux*)
> --    targ_defvec=mips_elf32_ntrad_le_vec
> --    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
> -+    targ_defvec=mips_elf64_trad_le_vec
> -+    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
> -     ;;
> -   mips64*-*-linux*)
> --    targ_defvec=mips_elf32_ntrad_be_vec
> --    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
> -+    targ_defvec=mips_elf64_trad_be_vec
> -+    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
> -     ;;
> -   mips*el-*-linux*)
> -     targ_defvec=mips_elf32_trad_le_vec
> -diff --git a/ld/configure.tgt b/ld/configure.tgt
> -index 6205d7c9872..c08533658e5 100644
> ---- a/ld/configure.tgt
> -+++ b/ld/configure.tgt
> -@@ -530,12 +530,12 @@ mips*-*-vxworks*)        targ_emul=elf32ebmipvxworks
> -                       ;;
> - mips*-*-windiss)      targ_emul=elf32mipswindiss
> -                       ;;
> --mips64*el-*-linux-*)  targ_emul=elf32ltsmipn32
> --                      targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
> -+mips64*el-*-linux-*)  targ_emul=elf64ltsmip
> -+                      targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
> -                       targ_extra_libpath=$targ_extra_emuls
> -                       ;;
> --mips64*-*-linux-*)    targ_emul=elf32btsmipn32
> --                      targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
> -+mips64*-*-linux-*)    targ_emul=elf64btsmip
> -+                      targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
> -                       targ_extra_libpath=$targ_extra_emuls
> -                       ;;
> - mips*el-*-linux-*)    targ_emul=elf32ltsmip
> --
> 2.32.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159465): https://lists.openembedded.org/g/openembedded-core/message/159465
> Mute This Topic: https://lists.openembedded.org/mt/87616748/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc b/meta/recipes-devtools/binutils/binutils-2.37.inc
index a3e0fbc769d..8c6e659e73d 100644
--- a/meta/recipes-devtools/binutils/binutils-2.37.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
@@ -26,7 +26,6 @@  SRC_URI = "\
      file://0006-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
      file://0007-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
      file://0008-warn-for-uses-of-system-directories-when-cross-linki.patch \
-     file://0009-Change-default-emulation-for-mips64-linux.patch \
      file://0010-Add-support-for-Netlogic-XLP.patch \
      file://0011-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch \
      file://0013-Use-libtool-2.4.patch \
diff --git a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch b/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
deleted file mode 100644
index fab92d52e68..00000000000
--- a/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
+++ /dev/null
@@ -1,57 +0,0 @@ 
-From fb6d52dda9c230baf869ed5f981581a7b5094b70 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 2 Mar 2015 01:44:14 +0000
-Subject: [PATCH] Change default emulation for mips64*-*-linux
-
-we change the default emulations to be N64 instead of N32
-
-Upstream-Status: Inappropriate [ OE configuration Specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- bfd/config.bfd   | 8 ++++----
- ld/configure.tgt | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/bfd/config.bfd b/bfd/config.bfd
-index 30087e3b8f8..1896e11790c 100644
---- a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -891,12 +891,12 @@ case "${targ}" in
-     targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
-     ;;
-   mips64*el-*-linux*)
--    targ_defvec=mips_elf32_ntrad_le_vec
--    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
-+    targ_defvec=mips_elf64_trad_le_vec
-+    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
-     ;;
-   mips64*-*-linux*)
--    targ_defvec=mips_elf32_ntrad_be_vec
--    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
-+    targ_defvec=mips_elf64_trad_be_vec
-+    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_be_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
-     ;;
-   mips*el-*-linux*)
-     targ_defvec=mips_elf32_trad_le_vec
-diff --git a/ld/configure.tgt b/ld/configure.tgt
-index 6205d7c9872..c08533658e5 100644
---- a/ld/configure.tgt
-+++ b/ld/configure.tgt
-@@ -530,12 +530,12 @@ mips*-*-vxworks*)	targ_emul=elf32ebmipvxworks
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip