diff --git a/Makefile.rules b/Makefile.rules
index d39640ee29..7319a1a6bb 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -82,17 +82,21 @@ ifeq ($(CC),gcc)
 	endif
 endif
 
-ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_CODE_COVERAGE),no)
+ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(findstring CODE_COVERAGE,$(MENUSELECT_CFLAGS))$(findstring CODE_PROFILE,$(MENUSELECT_CFLAGS))$(AST_CODE_COVERAGE),no)
     _ASTCFLAGS+=$(OPTIMIZE)
 else
     _ASTCFLAGS+=-O0
 endif
 
-ifeq ($(AST_CODE_COVERAGE),yes)
+ifeq ($(findstring CODE_COVERAGE,$(MENUSELECT_CFLAGS))$(AST_CODE_COVERAGE),no)
+    _ASTCFLAGS_COVERAGE=
+else
     _ASTCFLAGS_COVERAGE=-ftest-coverage -fprofile-arcs
     _ASTLDFLAGS+=-ftest-coverage -fprofile-arcs
-else
-    _ASTCFLAGS_COVERAGE=
+endif
+
+ifneq ($(findstring KEEP_FRAME_POINTERS,$(MENUSELECT_CFLAGS)),)
+    _ASTCFLAGS+=-fno-omit-frame-pointer
 endif
 
 ifeq ($(findstring $(CONFIG_CFLAGS),$(_ASTCFLAGS)),)
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 38a2683f96..41d35e7757 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -5,6 +5,8 @@
 		</member>
 		<member name="COMPILE_DOUBLE" displayname="Pre-compile with optimizations to detect errors, then discard and recompile with DONT_OPTIMIZE.  Creates intermediate .i files">
 			<depend>DONT_OPTIMIZE</depend>
+			<conflict>KEEP_FRAME_POINTERS</conflict>
+			<conflict>CODE_COVERAGE</conflict>
 			<support_level>core</support_level>
 		</member>
 		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
@@ -132,4 +134,13 @@
 			<support_level>core</support_level>
 			<defaultenabled>no</defaultenabled>
 		</member>
+		<member name="KEEP_FRAME_POINTERS" displayname="Set -fno-omit-frame-pointers to Facilitate Debugging and Tracing with 'perf'">
+			<conflict>COMPILE_DOUBLE</conflict>
+			<support_level>core</support_level>
+		</member>
+		<member name="CODE_COVERAGE" displayname="Set -ftest-coverage -fprofile-arcs to Enable gcov Code Coverage">
+			<support_level>extended</support_level>
+			<depend>DONT_OPTIMIZE</depend>
+		</member>
+
 	</category>