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