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