mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
7a759cd8e8
With commit:0a943cb10c(tools build: Add HOSTARCH Makefile variable) when building for ARCH=x86_64, ARCH=x86_64 is passed to perf instead of ARCH=x86, so the perf build process searchs header files from tools/arch/x86_64/include, which doesn't exist. The following build failure is seen: In file included from util/event.c:2:0: tools/include/uapi/linux/mman.h:4:27: fatal error: uapi/asm/mman.h: No such file or directory compilation terminated. Fix this issue by using SRCARCH instead of ARCH in perf, just like the main kernel Makefile and tools/objtool's. Signed-off-by: Jiada Wang <jiada_wang@mentor.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Eugeniu Rosca <erosca@de.adit-jv.com> Cc: Jan Stancek <jstancek@redhat.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Cc: Rui Teng <rui.teng@linux.vnet.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Wang Nan <wangnan0@huawei.com> Fixes:0a943cb10c("tools build: Add HOSTARCH Makefile variable") Link: http://lkml.kernel.org/r/1491793357-14977-2-git-send-email-jiada_wang@mentor.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
84 lines
2.7 KiB
Text
84 lines
2.7 KiB
Text
perf-y += builtin-test.o
|
|
perf-y += parse-events.o
|
|
perf-y += dso-data.o
|
|
perf-y += attr.o
|
|
perf-y += vmlinux-kallsyms.o
|
|
perf-y += openat-syscall.o
|
|
perf-y += openat-syscall-all-cpus.o
|
|
perf-y += openat-syscall-tp-fields.o
|
|
perf-y += mmap-basic.o
|
|
perf-y += perf-record.o
|
|
perf-y += evsel-roundtrip-name.o
|
|
perf-y += evsel-tp-sched.o
|
|
perf-y += fdarray.o
|
|
perf-y += pmu.o
|
|
perf-y += hists_common.o
|
|
perf-y += hists_link.o
|
|
perf-y += hists_filter.o
|
|
perf-y += hists_output.o
|
|
perf-y += hists_cumulate.o
|
|
perf-y += python-use.o
|
|
perf-y += bp_signal.o
|
|
perf-y += bp_signal_overflow.o
|
|
perf-y += task-exit.o
|
|
perf-y += sw-clock.o
|
|
perf-y += mmap-thread-lookup.o
|
|
perf-y += thread-mg-share.o
|
|
perf-y += switch-tracking.o
|
|
perf-y += keep-tracking.o
|
|
perf-y += code-reading.o
|
|
perf-y += sample-parsing.o
|
|
perf-y += parse-no-sample-id-all.o
|
|
perf-y += kmod-path.o
|
|
perf-y += thread-map.o
|
|
perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o llvm-src-prologue.o llvm-src-relocation.o
|
|
perf-y += bpf.o
|
|
perf-y += topology.o
|
|
perf-y += cpumap.o
|
|
perf-y += stat.o
|
|
perf-y += event_update.o
|
|
perf-y += event-times.o
|
|
perf-y += expr.o
|
|
perf-y += backward-ring-buffer.o
|
|
perf-y += sdt.o
|
|
perf-y += is_printable_array.o
|
|
perf-y += bitmap.o
|
|
perf-y += perf-hooks.o
|
|
perf-y += clang.o
|
|
perf-y += unit_number__scnprintf.o
|
|
|
|
$(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
|
|
$(call rule_mkdir)
|
|
$(Q)echo '#include <tests/llvm.h>' > $@
|
|
$(Q)echo 'const char test_llvm__bpf_base_prog[] =' >> $@
|
|
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
|
|
$(Q)echo ';' >> $@
|
|
|
|
$(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c tests/Build
|
|
$(call rule_mkdir)
|
|
$(Q)echo '#include <tests/llvm.h>' > $@
|
|
$(Q)echo 'const char test_llvm__bpf_test_kbuild_prog[] =' >> $@
|
|
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
|
|
$(Q)echo ';' >> $@
|
|
|
|
$(OUTPUT)tests/llvm-src-prologue.c: tests/bpf-script-test-prologue.c tests/Build
|
|
$(call rule_mkdir)
|
|
$(Q)echo '#include <tests/llvm.h>' > $@
|
|
$(Q)echo 'const char test_llvm__bpf_test_prologue_prog[] =' >> $@
|
|
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
|
|
$(Q)echo ';' >> $@
|
|
|
|
$(OUTPUT)tests/llvm-src-relocation.c: tests/bpf-script-test-relocation.c tests/Build
|
|
$(call rule_mkdir)
|
|
$(Q)echo '#include <tests/llvm.h>' > $@
|
|
$(Q)echo 'const char test_llvm__bpf_test_relocation[] =' >> $@
|
|
$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@
|
|
$(Q)echo ';' >> $@
|
|
|
|
ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc))
|
|
perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
|
|
endif
|
|
|
|
CFLAGS_attr.o += -DBINDIR="BUILD_STR($(bindir_SQ))" -DPYTHON="BUILD_STR($(PYTHON_WORD))"
|
|
CFLAGS_python-use.o += -DPYTHONPATH="BUILD_STR($(OUTPUT)python)" -DPYTHON="BUILD_STR($(PYTHON_WORD))"
|
|
CFLAGS_dwarf-unwind.o += -fno-optimize-sibling-calls
|