diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-09 02:08:02 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-09 02:08:02 +0300 |
| commit | 4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15 (patch) | |
| tree | 7f162d0612f7048dc52a3ba320a6685593100729 /scripts/Makefile.lib | |
| parent | b318556479cc923970a79d6c2311138581c0db83 (diff) | |
| parent | 6c9d9c81924b4b63c7a487e90fddb3b2d0f7d458 (diff) | |
| download | linux-4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15.tar.xz | |
Merge branch 'pm-cpufreq-sched' into pm-cpufreq
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 2edbcadb3d7f..ddf83d0181e7 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -136,6 +136,12 @@ _c_flags += $(if $(patsubst n%,, \ $(CFLAGS_UBSAN)) endif +ifeq ($(CONFIG_KCOV),y) +_c_flags += $(if $(patsubst n%,, \ + $(KCOV_INSTRUMENT_$(basetarget).o)$(KCOV_INSTRUMENT)y), \ + $(CFLAGS_KCOV)) +endif + # If building the kernel in a separate objtree expand all occurrences # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/'). @@ -269,6 +275,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ # DTC # --------------------------------------------------------------------------- +DTC ?= $(objtree)/scripts/dtc/dtc # Generate an assembly file to wrap the output of the device tree compiler quiet_cmd_dt_S_dtb= DTB $@ @@ -291,7 +298,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ - $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \ + $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) |