From a1ff9c16602ea18f110dde1d39061e36951bc31f Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Fri, 1 Apr 2016 17:09:12 +0000
Subject: Fix warnings uncovered by building with clang-cl

Move ifdefs to avoid unused static helpers. Move alignment attribute so
that it is respected in GCC and MSVC.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@265153 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/asan/asan_interceptors.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/asan')

diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc
index 232044a0f..0f2ea5c8e 100644
--- a/lib/asan/asan_interceptors.cc
+++ b/lib/asan/asan_interceptors.cc
@@ -223,6 +223,7 @@ struct ThreadStartParam {
   atomic_uintptr_t is_registered;
 };
 
+#if ASAN_INTERCEPT_PTHREAD_CREATE
 static thread_return_t THREAD_CALLING_CONV asan_thread_start(void *arg) {
   ThreadStartParam *param = reinterpret_cast<ThreadStartParam *>(arg);
   AsanThread *t = nullptr;
@@ -233,7 +234,6 @@ static thread_return_t THREAD_CALLING_CONV asan_thread_start(void *arg) {
   return t->ThreadStart(GetTid(), &param->is_registered);
 }
 
-#if ASAN_INTERCEPT_PTHREAD_CREATE
 INTERCEPTOR(int, pthread_create, void *thread,
     void *attr, void *(*start_routine)(void*), void *arg) {
   EnsureMainThreadIDIsCorrect();
@@ -669,12 +669,12 @@ INTERCEPTOR(long long, atoll, const char *nptr) {  // NOLINT
 }
 #endif  // ASAN_INTERCEPT_ATOLL_AND_STRTOLL
 
+#if ASAN_INTERCEPT___CXA_ATEXIT
 static void AtCxaAtexit(void *unused) {
   (void)unused;
   StopInitOrderChecking();
 }
 
-#if ASAN_INTERCEPT___CXA_ATEXIT
 INTERCEPTOR(int, __cxa_atexit, void (*func)(void *), void *arg,
             void *dso_handle) {
 #if SANITIZER_MAC
-- 
cgit v1.2.3