Commit fe1072ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clang-lto-v5.12-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull clang LTO fixes from Kees Cook:
 "This gets parisc building again and moves LTO artifact caching cleanup
  from the 'distclean' build target to 'clean'.

  Summary:

   - Fix parisc build for ftrace vs mcount (Sami Tolvanen)

   - Move .thinlto-cache remove to "clean" from "distclean" (Masahiro Yamada)"

* tag 'clang-lto-v5.12-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  kbuild: Move .thinlto-cache removal to 'make clean'
  parisc: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
parents 5c2e7a0a 4c7858b9

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ endif # CONFIG_MODULES 
# Directories & files removed with 'make clean'

CLEAN_FILES += include/ksym vmlinux.symvers \

	       modules.builtin modules.builtin.modinfo modules.nsdeps \

	       compile_commands.json

	       compile_commands.json .thinlto-cache



# Directories & files removed with 'make mrproper'

MRPROPER_FILES += include/config include/generated          \
@@ -1524,7 +1524,7 @@ MRPROPER_FILES += include/config include/generated \ 
		  *.spec



# Directories & files removed with 'make distclean'

DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS .thinlto-cache

DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS



# clean - Delete most, but leave enough to build external modules

#

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config PARISC 
	select HAVE_KRETPROBES

	select HAVE_DYNAMIC_FTRACE if $(cc-option,-fpatchable-function-entry=1,1)

	select HAVE_FTRACE_MCOUNT_RECORD if HAVE_DYNAMIC_FTRACE

	select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_SOFTIRQ_ON_OWN_STACK if IRQSTACKS