patches/binutils/2.20.1a/160-amd64-32bit-path.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
yann@2088
     1
yann@2088
     2
yann@2088
     3
diff -durN binutils-2.20.1.orig/ld/emulparams/elf_i386.sh binutils-2.20.1/ld/emulparams/elf_i386.sh
yann@2088
     4
--- binutils-2.20.1.orig/ld/emulparams/elf_i386.sh	2009-07-29 16:59:23.000000000 +0200
yann@2088
     5
+++ binutils-2.20.1/ld/emulparams/elf_i386.sh	2010-08-17 19:32:12.000000000 +0200
yann@1614
     6
@@ -13,3 +13,13 @@
yann@1614
     7
 NO_SMALL_DATA=yes
yann@1614
     8
 SEPARATE_GOTPLT=12
yann@1614
     9
 IREL_IN_PLT=
yann@1614
    10
+
yann@1614
    11
+# In Gentoo, we install 32bit libs into /lib32 in an
yann@1614
    12
+# ABI setup with amd64/x86
yann@1614
    13
+case "$target" in
yann@1614
    14
+  x86_64*-linux*)
yann@1614
    15
+    case "$EMULATION_NAME" in
yann@1614
    16
+      *i386*) LIBPATH_SUFFIX=32  ;;
yann@1614
    17
+    esac
yann@1614
    18
+  ;;
yann@1614
    19
+esac