diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2018-07-31 20:08:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-07-31 20:08:13 +0200 |
| commit | 8ec9fd8936b20ca2d18160f8b18acb4b732c2771 (patch) | |
| tree | a339057501d8e92500ff6e7854b09fe0c39f3430 /scripts/Kbuild.include | |
| parent | 8ddb600e033f69a1316e65d6af21eb3dc11501f2 (diff) | |
| parent | ecb99897516f0bb433f3e79df3b1958c80ac4810 (diff) | |
Merge 4.4.142 into android-4.4
Changes in 4.4.142
Kbuild: fix # escaping in .cmd files for future Make
x86/cpu: Probe CPUID leaf 6 even when cpuid_level == 6
perf tools: Move syscall number fallbacks from perf-sys.h to tools/arch/x86/include/asm/
Linux 4.4.142
Change-Id: If45535d0aeb1ad6f7239d3bc15aa4d3d60754da7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'scripts/Kbuild.include')
| -rw-r--r-- | scripts/Kbuild.include | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 8a1bb64f1dcd..0924291ef059 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -7,6 +7,7 @@ quote := " squote := ' empty := space := $(empty) $(empty) +pound := \# ### # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o @@ -250,11 +251,11 @@ endif # Replace >$< with >$$< to preserve $ when reloading the .cmd file # (needed for make) -# Replace >#< with >\#< to avoid starting a comment in the .cmd file +# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file # (needed for make) # Replace >'< with >'\''< to be able to enclose the whole string in '...' # (needed for the shell) -make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1))))) +make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1))))) # Find any prerequisites that is newer than target or that does not exist. # PHONY targets skipped in both cases. |