[oe-commits] [openembedded-core] 09/11: perf: Fix to obey LD failure on qemux86-64

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 6ed6347fbfab1d0ac054aa0fefa444824ed6d8e1
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: Wed Sep 21 10:47:42 2016 +0530

    perf: Fix to obey LD failure on qemux86-64
    
    When built on an i686 host for qemux86-64 without the
    fix to obey LD and it fails:
    
    /scratch/dogwood/toolchains/x86_64/bin/i686-pc-linux-gnu-ld:
    Relocatable linking with relocations from format elf64-x86-64
    (/scratch/dogwood/perf-ld-test/build/tmp/work/qemux86_64-mel-linux/perf/1.0-r9/perf-1.0/fs/fs.o)
    to format elf32-i386 (/scratch/dogwood/perf-ld-test/build/tmp/work/qemux86_64-mel-linux/perf/1.0-r9/perf-1.0/fs/libapi-in.o)
    is not supported
    
    This is because LD includes HOST_LD_ARCH, which contains TUNE_LDARGS,
    which is -m elf32_x86_64 for x86_64. Without that, direct use of ld will fail.
    
    Signed-off-by: Christopher Larson <chris_larson at mentor.com>
    Signed-off-by: Sujith Haridasan <Sujith_Haridasan at mentor.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-kernel/perf/perf.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 88e3a0a..0d104d3 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -79,6 +79,7 @@ EXTRA_OEMAKE = '\
     ARCH=${ARCH} \
     CC="${CC}" \
     AR="${AR}" \
+    LD="${LD}" \
     EXTRA_CFLAGS="-ldw" \
     perfexecdir=${libexecdir} \
     NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \
@@ -98,7 +99,6 @@ EXTRA_OEMAKE += "\
     'infodir=${@os.path.relpath(infodir, prefix)}' \
 "
 
-
 do_compile() {
 	# Linux kernel build system is expected to do the right thing
 	unset CFLAGS
@@ -174,6 +174,7 @@ do_configure_prepend () {
     if [ -e "${S}/tools/lib/api/Makefile" ]; then
         sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile
         sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile
+        sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/lib/api/Makefile
     fi
     if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then
         sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.