summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-09-21 10:47:42 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-22 11:13:24 +0100
commitef942d6025e1a339642b10ec1e29055f4ee6bd46 (patch)
tree11550666a8a279436d49d161c72bbbc9ca507703 /meta
parent0f09354396ec71d5a6486df96aae9bdf8bcad927 (diff)
downloadpoky-ef942d6025e1a339642b10ec1e29055f4ee6bd46.tar.gz
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. (From OE-Core rev: 0ce06611068e74e6ea2e226e3f967aaa91fecd25) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/perf/perf.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 88e3a0a78c..0d104d36fa 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -79,6 +79,7 @@ EXTRA_OEMAKE = '\
79 ARCH=${ARCH} \ 79 ARCH=${ARCH} \
80 CC="${CC}" \ 80 CC="${CC}" \
81 AR="${AR}" \ 81 AR="${AR}" \
82 LD="${LD}" \
82 EXTRA_CFLAGS="-ldw" \ 83 EXTRA_CFLAGS="-ldw" \
83 perfexecdir=${libexecdir} \ 84 perfexecdir=${libexecdir} \
84 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \ 85 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \
@@ -98,7 +99,6 @@ EXTRA_OEMAKE += "\
98 'infodir=${@os.path.relpath(infodir, prefix)}' \ 99 'infodir=${@os.path.relpath(infodir, prefix)}' \
99" 100"
100 101
101
102do_compile() { 102do_compile() {
103 # Linux kernel build system is expected to do the right thing 103 # Linux kernel build system is expected to do the right thing
104 unset CFLAGS 104 unset CFLAGS
@@ -174,6 +174,7 @@ do_configure_prepend () {
174 if [ -e "${S}/tools/lib/api/Makefile" ]; then 174 if [ -e "${S}/tools/lib/api/Makefile" ]; then
175 sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile 175 sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile
176 sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile 176 sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile
177 sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/lib/api/Makefile
177 fi 178 fi
178 if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then 179 if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then
179 sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile 180 sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile