Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d8262c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gcc-plugins-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull gcc plugins updates from Kees Cook:
 "Minor changes to the gcc plugins:

   - add the gcc plugins Makefile to MAINTAINERS to route things
     correctly

   - hide cyc_complexity behind !CONFIG_TEST for the future unhiding of
     plugins generally"

* tag 'gcc-plugins-v4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  gcc-plugins: Adjust Kconfig to avoid cyc_complexity
  MAINTAINERS: add GCC plugins Makefile
parents 52281b38 215e2aa6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5239,6 +5239,7 @@ L: kernel-hardening@lists.openwall.com
S:	Maintained
F:	scripts/gcc-plugins/
F:	scripts/gcc-plugin.sh
F:	scripts/Makefile.gcc-plugins
F:	Documentation/gcc-plugins.txt

GCOV BASED KERNEL PROFILING
+6 −1
Original line number Diff line number Diff line
@@ -364,8 +364,9 @@ menuconfig GCC_PLUGINS
	  See Documentation/gcc-plugins.txt for details.

config GCC_PLUGIN_CYC_COMPLEXITY
	bool "Compute the cyclomatic complexity of a function"
	bool "Compute the cyclomatic complexity of a function" if EXPERT
	depends on GCC_PLUGINS
	depends on !COMPILE_TEST
	help
	  The complexity M of a function's control flow graph is defined as:
	   M = E - N + 2P
@@ -375,6 +376,10 @@ config GCC_PLUGIN_CYC_COMPLEXITY
	  N = the number of nodes
	  P = the number of connected components (exit nodes).

	  Enabling this plugin reports the complexity to stderr during the
	  build. It mainly serves as a simple example of how to create a
	  gcc plugin for the kernel.

config GCC_PLUGIN_SANCOV
	bool
	depends on GCC_PLUGINS