summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 09:22:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 09:22:21 -0800
commit22d8262c33e52b10a4c442b04a2388b4bc589ee4 (patch)
tree8dc69572f222d67dc023eca42e48323842058c55
parent52281b38bc28e188a8aad17c3bf200e670a37aba (diff)
parent215e2aa6c024d27cdbe88e2ea88cb59dcab588eb (diff)
downloadlinux-22d8262c33e52b10a4c442b04a2388b4bc589ee4.tar.bz2
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
-rw-r--r--MAINTAINERS1
-rw-r--r--arch/Kconfig7
2 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c97a29527a21..fde08b1b5b7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/arch/Kconfig b/arch/Kconfig
index 835d55d52104..19483aea4bbc 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -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