Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From 0a2877400a086e9d6ddd32a80462b7a931921dc2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chunrong Guo <B40290@freescale.com> |
| 3 | Date: Sun, 8 Sep 2013 23:21:49 -0500 |
| 4 | Subject: [PATCH] libhugetlbfs: avoid search host library path for cross |
| 5 | compilation |
| 6 | |
| 7 | Upstream-Status: Inappropriate [oe-core specific] |
| 8 | |
| 9 | Signed-off-by: Chunrong Guo <B40290@freescale.com> |
| 10 | --- |
| 11 | ldscripts/elf32ppclinux.xB | 2 +- |
| 12 | ldscripts/elf32ppclinux.xBDT | 2 +- |
| 13 | ldscripts/elf64ppc.xB | 2 +- |
| 14 | ldscripts/elf64ppc.xBDT | 2 +- |
| 15 | ldscripts/elf_x86_64.xB | 2 +- |
| 16 | ldscripts/elf_x86_64.xBDT | 2 +- |
| 17 | 6 files changed, 6 insertions(+), 6 deletions(-) |
| 18 | |
| 19 | diff --git a/ldscripts/elf32ppclinux.xB b/ldscripts/elf32ppclinux.xB |
| 20 | index 28ad88d..33d482d 100644 |
| 21 | --- a/ldscripts/elf32ppclinux.xB |
| 22 | +++ b/ldscripts/elf32ppclinux.xB |
| 23 | @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", |
| 24 | "elf32-powerpc") |
| 25 | OUTPUT_ARCH(powerpc:common) |
| 26 | ENTRY(_start) |
| 27 | -SEARCH_DIR("/usr/powerpc-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); |
| 28 | +/*SEARCH_DIR("/usr/powerpc-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");*/ |
| 29 | INPUT(-lhugetlbfs); |
| 30 | PHDRS |
| 31 | { |
| 32 | diff --git a/ldscripts/elf32ppclinux.xBDT b/ldscripts/elf32ppclinux.xBDT |
| 33 | index 497882b..823475e 100644 |
| 34 | --- a/ldscripts/elf32ppclinux.xBDT |
| 35 | +++ b/ldscripts/elf32ppclinux.xBDT |
| 36 | @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", |
| 37 | "elf32-powerpc") |
| 38 | OUTPUT_ARCH(powerpc:common) |
| 39 | ENTRY(_start) |
| 40 | -SEARCH_DIR("/usr/powerpc-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); |
| 41 | +/*SEARCH_DIR("/usr/powerpc-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");*/ |
| 42 | INPUT(-lhugetlbfs); |
| 43 | PHDRS |
| 44 | { |
| 45 | diff --git a/ldscripts/elf64ppc.xB b/ldscripts/elf64ppc.xB |
| 46 | index 1a9c1ab..8cc557d 100644 |
| 47 | --- a/ldscripts/elf64ppc.xB |
| 48 | +++ b/ldscripts/elf64ppc.xB |
| 49 | @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-powerpc", "elf64-powerpc", |
| 50 | "elf64-powerpc") |
| 51 | OUTPUT_ARCH(powerpc:common64) |
| 52 | ENTRY(_start) |
| 53 | -SEARCH_DIR("/usr/powerpc64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/powerpc64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); |
| 54 | +/*SEARCH_DIR("/usr/powerpc64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/powerpc64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");*/ |
| 55 | INPUT(-lhugetlbfs); |
| 56 | PHDRS |
| 57 | { |
| 58 | diff --git a/ldscripts/elf64ppc.xBDT b/ldscripts/elf64ppc.xBDT |
| 59 | index 5477294..53e0749 100644 |
| 60 | --- a/ldscripts/elf64ppc.xBDT |
| 61 | +++ b/ldscripts/elf64ppc.xBDT |
| 62 | @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-powerpc", "elf64-powerpc", |
| 63 | "elf64-powerpc") |
| 64 | OUTPUT_ARCH(powerpc:common64) |
| 65 | ENTRY(_start) |
| 66 | -SEARCH_DIR("/usr/powerpc64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/powerpc64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); |
| 67 | +/*SEARCH_DIR("/usr/powerpc64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/powerpc64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");*/ |
| 68 | INPUT( -lhugetlbfs ); |
| 69 | PHDRS |
| 70 | { |
| 71 | diff --git a/ldscripts/elf_x86_64.xB b/ldscripts/elf_x86_64.xB |
| 72 | index ed21a2c..ba50e9f 100644 |
| 73 | --- a/ldscripts/elf_x86_64.xB |
| 74 | +++ b/ldscripts/elf_x86_64.xB |
| 75 | @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", |
| 76 | "elf64-x86-64") |
| 77 | OUTPUT_ARCH(i386:x86-64) |
| 78 | ENTRY(_start) |
| 79 | -SEARCH_DIR("/usr/x86_64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/x86_64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); |
| 80 | +/*SEARCH_DIR("/usr/x86_64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/x86_64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");*/ |
| 81 | INPUT(-lhugetlbfs); |
| 82 | /* Do we need any of these for elf? |
| 83 | __DYNAMIC = 0; */ |
| 84 | diff --git a/ldscripts/elf_x86_64.xBDT b/ldscripts/elf_x86_64.xBDT |
| 85 | index 1855202..c62d245 100644 |
| 86 | --- a/ldscripts/elf_x86_64.xBDT |
| 87 | +++ b/ldscripts/elf_x86_64.xBDT |
| 88 | @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", |
| 89 | "elf64-x86-64") |
| 90 | OUTPUT_ARCH(i386:x86-64) |
| 91 | ENTRY(_start) |
| 92 | -SEARCH_DIR("/usr/x86_64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/x86_64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); |
| 93 | +/*SEARCH_DIR("/usr/x86_64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/x86_64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");*/ |
| 94 | INPUT(-lhugetlbfs); |
| 95 | /* Do we need any of these for elf? |
| 96 | __DYNAMIC = 0; */ |
| 97 | -- |
| 98 | 1.7.9.7 |
| 99 | |