summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAlp Mestanogullari <alpmestan@gmail.com>2019-06-06 00:40:32 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-11 18:42:30 -0400
commit457fe7897d42e4359b6da6b359fd7ea8ae0f1d75 (patch)
treec9f1649a56e90b45210ab655db697e22fd0c2a75 /includes
parent762098bf2cfac657c0320249f62dc49bad77f7bf (diff)
downloadhaskell-457fe7897d42e4359b6da6b359fd7ea8ae0f1d75.tar.gz
Hadrian: teach the RTS that PROFILING implies TRACING
As discussed in #16744, both the Make and Hadrian build systems have special code to always pass -eventlog whenever -prof or -debug are passed. However, there is some similar logic in the RTS itself only for defining TRACING when the DEBUG macro is defined, but no such logic is implemented to define TRACING when the PROFILING macro is defined. This patch adds such a logic and therefore fixes #16744.
Diffstat (limited to 'includes')
-rw-r--r--includes/rts/Config.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/includes/rts/Config.h b/includes/rts/Config.h
index 5161dce945..be264592ff 100644
--- a/includes/rts/Config.h
+++ b/includes/rts/Config.h
@@ -26,11 +26,15 @@
#define USING_LIBBFD 1
#endif
-/* DEBUG implies TRACING and TICKY_TICKY */
-#if defined(DEBUG)
+/* DEBUG and PROFILING both imply TRACING */
+#if defined(DEBUG) || defined(PROFILING)
#if !defined(TRACING)
#define TRACING
#endif
+#endif
+
+/* DEBUG implies TICKY_TICKY */
+#if defined(DEBUG)
#if !defined(TICKY_TICKY)
#define TICKY_TICKY
#endif