summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de>2016-11-09 08:36:45 +0000
committerJonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de>2016-11-09 08:36:45 +0000
commitf5352b09a5105a0acfc32f813e729777fd80f983 (patch)
treef22d30357bb61675c951e87fc246503ad4adbce2
parentee2aeb73b7d7c0ab8e1dd0610a2b7ca2e71dc64d (diff)
Pacify lint check
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@286346 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/asan_win.cc4
-rw-r--r--lib/asan/asan_win_dll_thunk.cc4
-rw-r--r--lib/asan/asan_win_dynamic_runtime_thunk.cc7
3 files changed, 8 insertions, 7 deletions
diff --git a/lib/asan/asan_win.cc b/lib/asan/asan_win.cc
index 54f622fb2..236647ac9 100644
--- a/lib/asan/asan_win.cc
+++ b/lib/asan/asan_win.cc
@@ -355,8 +355,8 @@ static void NTAPI asan_thread_init(void *module, DWORD reason, void *reserved) {
}
#pragma section(".CRT$XLAB", long, read) // NOLINT
-__declspec(allocate(".CRT$XLAB")) void (NTAPI *__asan_tls_init)(
- void *, unsigned long, void *) = asan_thread_init;
+__declspec(allocate(".CRT$XLAB")) void (NTAPI *__asan_tls_init)(void *,
+ unsigned long, void *) = asan_thread_init;
#endif
diff --git a/lib/asan/asan_win_dll_thunk.cc b/lib/asan/asan_win_dll_thunk.cc
index 297a91aeb..3550306cf 100644
--- a/lib/asan/asan_win_dll_thunk.cc
+++ b/lib/asan/asan_win_dll_thunk.cc
@@ -468,7 +468,7 @@ static void NTAPI asan_thread_init(void *mod, unsigned long reason,
}
#pragma section(".CRT$XLAB", long, read) // NOLINT
-__declspec(allocate(".CRT$XLAB")) void (NTAPI *__asan_tls_init)(
- void *, unsigned long, void *) = asan_thread_init;
+__declspec(allocate(".CRT$XLAB")) void (NTAPI *__asan_tls_init)(void *,
+ unsigned long, void *) = asan_thread_init;
#endif // ASAN_DLL_THUNK
diff --git a/lib/asan/asan_win_dynamic_runtime_thunk.cc b/lib/asan/asan_win_dynamic_runtime_thunk.cc
index 96ca47e57..f38f4cd1f 100644
--- a/lib/asan/asan_win_dynamic_runtime_thunk.cc
+++ b/lib/asan/asan_win_dynamic_runtime_thunk.cc
@@ -62,7 +62,8 @@ static int InitializeClonedVariables() {
return 0;
}
-static void NTAPI asan_thread_init(void *mod, unsigned long reason, void *reserved) {
+static void NTAPI asan_thread_init(void *mod, unsigned long reason,
+ void *reserved) {
if (reason == DLL_PROCESS_ATTACH) InitializeClonedVariables();
}
@@ -71,8 +72,8 @@ static void NTAPI asan_thread_init(void *mod, unsigned long reason, void *reserv
// initializer is needed as a backup.
__declspec(allocate(".CRT$XIB")) int (*__asan_initialize_cloned_variables)() =
InitializeClonedVariables;
-__declspec(allocate(".CRT$XLAB")) void (NTAPI *__asan_tls_init)(
- void *, unsigned long, void *) = asan_thread_init;
+__declspec(allocate(".CRT$XLAB")) void (NTAPI *__asan_tls_init)(void *,
+ unsigned long, void *) = asan_thread_init;
////////////////////////////////////////////////////////////////////////////////
// For some reason, the MD CRT doesn't call the C/C++ terminators during on DLL