projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Have the mangler keep .note.GNU-stack
[ghc-hetmet.git]
/
rts
/
RtsFlags.c
diff --git
a/rts/RtsFlags.c
b/rts/RtsFlags.c
index
b2bb9e7
..
ddc1928
100644
(file)
--- a/
rts/RtsFlags.c
+++ b/
rts/RtsFlags.c
@@
-303,7
+303,8
@@
void initRtsFlagsDefaults(void)
RtsFlags.TraceFlags.sched = rtsFalse;
#ifdef USE_PAPI
RtsFlags.TraceFlags.sched = rtsFalse;
#ifdef USE_PAPI
- RtsFlags.PapiFlags.eventType = PAPI_FLAG_BRANCH;
+ /* By default no special measurements taken */
+ RtsFlags.PapiFlags.eventType = 0;
#endif
}
#endif
}
@@
-454,8
+455,8
@@
usage_text[] = {
" -b... All GranSim options start with -b; see GranSim User's Guide for details",
#endif
#if defined(USE_PAPI)
" -b... All GranSim options start with -b; see GranSim User's Guide for details",
#endif
#if defined(USE_PAPI)
-" -aX Perform measurements using PAPI, it should be used with the -s<file> option.",
-" Where X is one of:",
+" -aX CPU performance counter measurements using PAPI",
+" (use with the -s<file> option). X is one of:",
"",
/* " y - cycles", */
" 1 - level 1 cache misses",
"",
/* " y - cycles", */
" 1 - level 1 cache misses",