X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=debian%2Fpatches%2F127_x86_64_i386_biarch.dpatch;fp=debian%2Fpatches%2F127_x86_64_i386_biarch.dpatch;h=0000000000000000000000000000000000000000;hp=f08223a909f1723690b1331e6d71e467e18f3933;hb=d2b7d31e6dbe72ae2f2ca39f680e74b2a4ad908d;hpb=d5da4f291af551c0b8b79e1d4a9b173d60e5c10e diff --git a/debian/patches/127_x86_64_i386_biarch.dpatch b/debian/patches/127_x86_64_i386_biarch.dpatch deleted file mode 100755 index f08223a..0000000 --- a/debian/patches/127_x86_64_i386_biarch.dpatch +++ /dev/null @@ -1,42 +0,0 @@ -#!/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 -## DP: Upstream status: Debian specific - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- 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*) -+ case "$EMULATION_NAME" in -+ *i386*) LIBPATH_SUFFIX=32 ;; -+ esac -+ ;; -+esac