On Mon, Oct 16, 2017 at 02:24:37PM +0100, Mark Rutland wrote: > Currently, we have a number of compiler instrumentation features, each > with its own overrides to disable instrumentation of a file or > directory. > > In a few cases, there are files with special ABI requirements, for which > we need to avoid all instrumentation. Having to apply each override > manually is tedious, and error-prone as new instrumentation features are > introduced. > > To make matters easier, this patch adds a new CC_INSTRUMENT override, > allowing instrumentation to be avoided for certain files or directories. > This can also be overridden on a per-file or per-directory basis, to > allow opting in to some instrumentation. > > Signed-off-by: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Andrey Konovalov <adech.fo@xxxxxxxxx> > Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> > Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx> > Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > Cc: Michal Marek <mmarek@xxxxxxxx> > Cc: Will Deacon <will.deacon@xxxxxxx> > Cc: linux-kbuild@xxxxxxxxxxxxxxx > --- > scripts/Makefile.lib | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 5e975fee0f5b..c7d71f482b57 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -109,6 +109,15 @@ orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ > _a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) > _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) > > +# Each of the compiler instrumentation features below can be selectively > +# enabled or disable for files or directoies. In decreasing order of Should be "disabled". Also, typo: "directoies". > +# predence, each option foo is controlled by: Typo: "predence" > +# FOO_obj.o := [yn] > +# CC_INSTRUMENT_obj.o := [yn] > +# FOO := [yn] > +# CC_INSTRUMENT := [yn] > +# FOO_all := [yn] I'm not sure it's worth mentioning FOO_all here: for KASAN it's just 'y' and for the others it's driven by a CONFIG option that would be better controlled using Kconfig rather than in Makefiles. Otherwise, Acked-by: Will Deacon <will.deacon@xxxxxxx> Will -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
