[oe] [PATCH 02/11] binutils: add?binutils-x86_64_i386_biarch.patch

Khem Raj raj.khem at gmail.com
Fri Apr 17 22:37:35 UTC 2009


On (16/04/09 12:47), Roman I Khimov wrote:
> On Thursday 16 April 2009 11:14:29 Khem Raj wrote:
> > On Wednesday 15 April 2009 10:28:57 pm Roman I Khimov wrote:
> > > On Wednesday 15 April 2009 23:25:12 Khem Raj wrote:
> > > > On (15/04/09 16:35), Roman I Khimov wrote:
> > > > > ---
> > > > >  .../binutils-x86_64_i386_biarch.patch              |   25
> > > > > ++++++++++++++++++++ recipes/binutils/binutils_2.18.bb               
> > > > >   | 2 +-
> > > > >  2 files changed, 26 insertions(+), 1 deletions(-)
> > > > >  create mode 100644
> > > > > recipes/binutils/binutils-2.18/binutils-x86_64_i386_biarch.patch
> > > >
> > > > Looks ok. Could you also make this on later versions of toolchains.
> > > > I am not worried about the older ones.
> > >
> > > Works good with 2.19 and 2.19.1, but not 2.18.50.0.7.
> >
> > FWIW 2.18.50.0.7 is default binutils for some distros (angstrom)
> 
> True, didn't check initially its usage, so it's going to be something like 
> attached.
> 
> Do I need to bump PR's for all binutils touched?

yes.


> From 39ead7fd8b9d8b3687b8564828fad4e9d52b128a Mon Sep 17 00:00:00 2001
> From: Roman I Khimov <khimov at altell.ru>
> Date: Wed, 15 Apr 2009 15:48:22 +0400
> Subject: [PATCH 02/11] binutils: add binutils-x86_64_i386_biarch.patch
> 
> Adds 'lib32' directories to binutils search paths on x86_64.
> ---
>  .../binutils-x86_64_i386_biarch.patch              |   26 ++++++++++++++++++++
>  .../binutils-x86_64_i386_biarch.patch              |   25 +++++++++++++++++++
>  .../binutils-x86_64_i386_biarch.patch              |   25 +++++++++++++++++++
>  .../binutils-x86_64_i386_biarch.patch              |   25 +++++++++++++++++++
>  recipes/binutils/binutils_2.18.50.0.7.bb           |    1 +
>  recipes/binutils/binutils_2.18.bb                  |    2 +-
>  recipes/binutils/binutils_2.19.1.bb                |    1 +
>  recipes/binutils/binutils_2.19.bb                  |    1 +
>  8 files changed, 105 insertions(+), 1 deletions(-)
>  create mode 100644 recipes/binutils/binutils-2.18.50.0.7/binutils-x86_64_i386_biarch.patch
>  create mode 100644 recipes/binutils/binutils-2.18/binutils-x86_64_i386_biarch.patch
>  create mode 100644 recipes/binutils/binutils-2.19.1/binutils-x86_64_i386_biarch.patch
>  create mode 100644 recipes/binutils/binutils-2.19/binutils-x86_64_i386_biarch.patch
> 
> diff --git a/recipes/binutils/binutils-2.18.50.0.7/binutils-x86_64_i386_biarch.patch b/recipes/binutils/binutils-2.18.50.0.7/binutils-x86_64_i386_biarch.patch
> new file mode 100644
> index 0000000..6054434
> --- /dev/null
> +++ b/recipes/binutils/binutils-2.18.50.0.7/binutils-x86_64_i386_biarch.patch
> @@ -0,0 +1,26 @@
> +#!/bin/sh -e
> +## 127_x86_64_i386_biarch.dpatch
> +##
> +## DP: Description: Add (/usr)/lib32 to the search paths on x86_64.
> +## DP: Author: Aurelien Jarno <aurel32.debian.org>
> +## DP: Upstream status: Debian specific
> +#
> +# Hacked to apply with quilt
> +# Adapted to binutils 2.18.50.0.7
> +
> +--- binutils/ld/emulparams/elf_i386.sh
> ++++ binutils/ld/emulparams/elf_i386.sh
> +@@ -12,3 +12,13 @@
> + NO_SMALL_DATA=yes
> + SEPARATE_GOTPLT=12
> + SHARABLE_SECTIONS=yes
> ++
> ++# Linux modify the default library search path to first include
> ++# a 32-bit specific directory.
> ++case "$target" in
> ++  x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu)
> ++    case "$EMULATION_NAME" in
> ++      *i386*) LIBPATH_SUFFIX=32 ;;
> ++    esac
> ++    ;;
> ++esac
> diff --git a/recipes/binutils/binutils-2.18/binutils-x86_64_i386_biarch.patch b/recipes/binutils/binutils-2.18/binutils-x86_64_i386_biarch.patch
> new file mode 100644
> index 0000000..b79a76a
> --- /dev/null
> +++ b/recipes/binutils/binutils-2.18/binutils-x86_64_i386_biarch.patch
> @@ -0,0 +1,25 @@
> +#!/bin/sh -e
> +## 127_x86_64_i386_biarch.dpatch
> +##
> +## DP: Description: Add (/usr)/lib32 to the search paths on x86_64.
> +## DP: Author: Aurelien Jarno <aurel32.debian.org>
> +## DP: Upstream status: Debian specific
> +#
> +# Hacked to apply with quilt
> +
> +--- binutils/ld/emulparams/elf_i386.sh
> ++++ binutils/ld/emulparams/elf_i386.sh
> +@@ -12,3 +12,13 @@
> + GENERATE_PIE_SCRIPT=yes
> + NO_SMALL_DATA=yes
> + SEPARATE_GOTPLT=12
> ++
> ++# Linux modify the default library search path to first include
> ++# a 32-bit specific directory.
> ++case "$target" in
> ++  x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu)
> ++    case "$EMULATION_NAME" in
> ++      *i386*) LIBPATH_SUFFIX=32 ;;
> ++    esac
> ++    ;;
> ++esac
> diff --git a/recipes/binutils/binutils-2.19.1/binutils-x86_64_i386_biarch.patch b/recipes/binutils/binutils-2.19.1/binutils-x86_64_i386_biarch.patch
> new file mode 100644
> index 0000000..b79a76a
> --- /dev/null
> +++ b/recipes/binutils/binutils-2.19.1/binutils-x86_64_i386_biarch.patch
> @@ -0,0 +1,25 @@
> +#!/bin/sh -e
> +## 127_x86_64_i386_biarch.dpatch
> +##
> +## DP: Description: Add (/usr)/lib32 to the search paths on x86_64.
> +## DP: Author: Aurelien Jarno <aurel32.debian.org>
> +## DP: Upstream status: Debian specific
> +#
> +# Hacked to apply with quilt
> +
> +--- binutils/ld/emulparams/elf_i386.sh
> ++++ binutils/ld/emulparams/elf_i386.sh
> +@@ -12,3 +12,13 @@
> + GENERATE_PIE_SCRIPT=yes
> + NO_SMALL_DATA=yes
> + SEPARATE_GOTPLT=12
> ++
> ++# Linux modify the default library search path to first include
> ++# a 32-bit specific directory.
> ++case "$target" in
> ++  x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu)
> ++    case "$EMULATION_NAME" in
> ++      *i386*) LIBPATH_SUFFIX=32 ;;
> ++    esac
> ++    ;;
> ++esac
> diff --git a/recipes/binutils/binutils-2.19/binutils-x86_64_i386_biarch.patch b/recipes/binutils/binutils-2.19/binutils-x86_64_i386_biarch.patch
> new file mode 100644
> index 0000000..b79a76a
> --- /dev/null
> +++ b/recipes/binutils/binutils-2.19/binutils-x86_64_i386_biarch.patch
> @@ -0,0 +1,25 @@
> +#!/bin/sh -e
> +## 127_x86_64_i386_biarch.dpatch
> +##
> +## DP: Description: Add (/usr)/lib32 to the search paths on x86_64.
> +## DP: Author: Aurelien Jarno <aurel32.debian.org>
> +## DP: Upstream status: Debian specific
> +#
> +# Hacked to apply with quilt
> +
> +--- binutils/ld/emulparams/elf_i386.sh
> ++++ binutils/ld/emulparams/elf_i386.sh
> +@@ -12,3 +12,13 @@
> + GENERATE_PIE_SCRIPT=yes
> + NO_SMALL_DATA=yes
> + SEPARATE_GOTPLT=12
> ++
> ++# Linux modify the default library search path to first include
> ++# a 32-bit specific directory.
> ++case "$target" in
> ++  x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu)
> ++    case "$EMULATION_NAME" in
> ++      *i386*) LIBPATH_SUFFIX=32 ;;
> ++    esac
> ++    ;;
> ++esac
> diff --git a/recipes/binutils/binutils_2.18.50.0.7.bb b/recipes/binutils/binutils_2.18.50.0.7.bb
> index a89431e..fbd9189 100644
> --- a/recipes/binutils/binutils_2.18.50.0.7.bb
> +++ b/recipes/binutils/binutils_2.18.50.0.7.bb
> @@ -12,6 +12,7 @@ SRC_URI = "\
>       file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
>       file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
>       file://binutils-arm-pr7093.patch;patch=1 \
> +     file://binutils-x86_64_i386_biarch.patch;patch=1 \
>       "
>  
>  # powerpc patches
> diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb
> index 9367196..562c8ba 100644
> --- a/recipes/binutils/binutils_2.18.bb
> +++ b/recipes/binutils/binutils_2.18.bb
> @@ -12,8 +12,8 @@ SRC_URI = "\
>       file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
>       file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
>       file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
> +     file://binutils-x86_64_i386_biarch.patch;patch=1 \
>       "
>  
>  # powerpc patches
>  SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
> -
> diff --git a/recipes/binutils/binutils_2.19.1.bb b/recipes/binutils/binutils_2.19.1.bb
> index c399ab8..1802dfb 100644
> --- a/recipes/binutils/binutils_2.19.1.bb
> +++ b/recipes/binutils/binutils_2.19.1.bb
> @@ -12,6 +12,7 @@ SRC_URI = "\
>       file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
>       file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
>       file://binutils-arm-pr7093.patch;patch=1 \
> +     file://binutils-x86_64_i386_biarch.patch;patch=1 \
>       "
>  
>  # powerpc patches
> diff --git a/recipes/binutils/binutils_2.19.bb b/recipes/binutils/binutils_2.19.bb
> index aee5840..782d5c7 100644
> --- a/recipes/binutils/binutils_2.19.bb
> +++ b/recipes/binutils/binutils_2.19.bb
> @@ -12,6 +12,7 @@ SRC_URI = "\
>       file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
>       file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
>       file://binutils-arm-pr7093.patch;patch=1 \
> +     file://binutils-x86_64_i386_biarch.patch;patch=1 \
>       "
>  
>  # powerpc patches
> -- 
> 1.6.2.1
> 

> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel





More information about the Openembedded-devel mailing list