diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
| commit | f8ca070d3aeee9332d1843f5aa44945374b51b8e (patch) | |
| tree | 4efb8604227ede935238eb1c67b626da1265d459 /contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h | |
| parent | 752d00608cb24d3c902d6890efe6964247c2532c (diff) | |
| parent | 807551b099338b7cc4f66ee567aae20a529dd27e (diff) | |
Merge compiler-rt release_38 branch r258968.
Note that there is still a problem on amd64, causing SIGBUS in the early
startup of Address Sanitizer. This is being investigated.
Notes
Notes:
svn path=/projects/clang380-import/; revision=295349
Diffstat (limited to 'contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h')
| -rw-r--r-- | contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h b/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h index fda6d710757e..33c3c4512725 100644 --- a/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h +++ b/contrib/compiler-rt/lib/sanitizer_common/sanitizer_flags.h @@ -49,7 +49,7 @@ inline void OverrideCommonFlags(const CommonFlags &cf) { class FlagParser; void RegisterCommonFlags(FlagParser *parser, CommonFlags *cf = &common_flags_dont_use); -void RegisterIncludeFlag(FlagParser *parser, CommonFlags *cf); +void RegisterIncludeFlags(FlagParser *parser, CommonFlags *cf); } // namespace __sanitizer #endif // SANITIZER_FLAGS_H |