diff options
| author | Tony Lindgren | 2015-07-06 14:33:17 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2015-07-06 14:33:17 +0200 |
| commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
| tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /tools/perf/config/Makefile | |
| parent | ARM: OMAP2+: Remove unnessary return statement from the void function, omap2_... (diff) | |
| parent | ARM: dts: am4372.dtsi: disable rfbi (diff) | |
| download | kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.gz kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.xz kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.zip | |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'tools/perf/config/Makefile')
| -rw-r--r-- | tools/perf/config/Makefile | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 59a98c643240..094ddaee104c 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -11,9 +11,9 @@ ifneq ($(obj-perf),) obj-perf := $(abspath $(obj-perf))/ endif -$(shell echo -n > .config-detected) -detected = $(shell echo "$(1)=y" >> .config-detected) -detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected) +$(shell echo -n > $(OUTPUT).config-detected) +detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected) +detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) @@ -32,7 +32,7 @@ ifeq ($(ARCH),x86) LIBUNWIND_LIBS = -lunwind -lunwind-x86_64 $(call detected,CONFIG_X86_64) else - LIBUNWIND_LIBS = -lunwind -lunwind-x86 + LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind endif NO_PERF_REGS := 0 endif @@ -130,6 +130,8 @@ endif ifeq ($(DEBUG),0) CFLAGS += -O6 +else + CFLAGS += $(call cc-option,-Og,-O0) endif ifdef PARSER_DEBUG @@ -268,6 +270,10 @@ else endif # libelf support endif # NO_LIBELF +ifdef NO_DWARF + NO_LIBDW_DWARF_UNWIND := 1 +endif + ifndef NO_LIBELF CFLAGS += -DHAVE_LIBELF_SUPPORT EXTLIBS += -lelf @@ -610,6 +616,11 @@ ifdef LIBBABELTRACE endif endif +ifndef NO_AUXTRACE + $(call detected,CONFIG_AUXTRACE) + CFLAGS += -DHAVE_AUXTRACE_SUPPORT +endif + # Among the variables below, these: # perfexecdir # template_dir |