[Sanitizer] Kill the remainders of platform defines in favor of SANITIZER_ defines
llvm-svn: 178627
This commit is contained in:
parent
5188e6b295
commit
a0e28a7aaa
|
@ -20,11 +20,11 @@ extern "C" void *__libc_malloc(__sanitizer::uptr size);
|
|||
extern "C" void __libc_free(void *ptr);
|
||||
# define LIBC_MALLOC __libc_malloc
|
||||
# define LIBC_FREE __libc_free
|
||||
#else // __linux__ && !ANDROID
|
||||
#else // SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
# include <stdlib.h>
|
||||
# define LIBC_MALLOC malloc
|
||||
# define LIBC_FREE free
|
||||
#endif // __linux__ && !ANDROID
|
||||
#endif // SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
|
||||
namespace __sanitizer {
|
||||
|
||||
|
|
|
@ -767,4 +767,4 @@ void AdjustStackSizeLinux(void *attr_, int verbosity) {
|
|||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // __linux__
|
||||
#endif // SANITIZER_LINUX
|
||||
|
|
|
@ -341,4 +341,4 @@ void InitTlsSize() {
|
|||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // __APPLE__
|
||||
#endif // SANITIZER_MAC
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#if SANITIZER_LINUX
|
||||
#include <sys/vfs.h>
|
||||
#include <sys/epoll.h>
|
||||
#endif // __linux__
|
||||
#endif // SANITIZER_LINUX
|
||||
|
||||
namespace __sanitizer {
|
||||
unsigned struct_utsname_sz = sizeof(struct utsname);
|
||||
|
@ -53,13 +53,13 @@ namespace __sanitizer {
|
|||
unsigned struct_statfs_sz = sizeof(struct statfs);
|
||||
unsigned struct_epoll_event_sz = sizeof(struct epoll_event);
|
||||
unsigned struct_timespec_sz = sizeof(struct timespec);
|
||||
#endif // __linux__
|
||||
#endif // SANITIZER_LINUX
|
||||
|
||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
unsigned struct_dirent64_sz = sizeof(struct dirent64);
|
||||
unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
|
||||
unsigned struct_statfs64_sz = sizeof(struct statfs64);
|
||||
#endif // __linux__ && !__ANDROID__
|
||||
#endif // SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
|
||||
void* __sanitizer_get_msghdr_iov_iov_base(void* msg, int idx) {
|
||||
return ((struct msghdr *)msg)->msg_iov[idx].iov_base;
|
||||
|
@ -80,4 +80,4 @@ namespace __sanitizer {
|
|||
|
||||
COMPILER_CHECK(sizeof(__sanitizer_pthread_attr_t) >= sizeof(pthread_attr_t));
|
||||
|
||||
#endif // __linux__ || __APPLE__
|
||||
#endif // SANITIZER_LINUX || SANITIZER_MAC
|
||||
|
|
|
@ -34,13 +34,13 @@ namespace __sanitizer {
|
|||
extern unsigned struct_statfs_sz;
|
||||
extern unsigned struct_epoll_event_sz;
|
||||
extern unsigned struct_timespec_sz;
|
||||
#endif // __linux__
|
||||
#endif // SANITIZER_LINUX
|
||||
|
||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
extern unsigned struct_dirent64_sz;
|
||||
extern unsigned struct_rlimit64_sz;
|
||||
extern unsigned struct_statfs64_sz;
|
||||
#endif // __linux__ && !__ANDROID__
|
||||
#endif // SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
|
||||
void* __sanitizer_get_msghdr_iov_iov_base(void* msg, int idx);
|
||||
uptr __sanitizer_get_msghdr_iov_iov_len(void* msg, int idx);
|
||||
|
|
|
@ -230,4 +230,4 @@ int internal_isatty(fd_t fd) {
|
|||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // __linux__ || __APPLE_
|
||||
#endif // SANITIZER_LINUX || __APPLE_
|
||||
|
|
|
@ -98,14 +98,14 @@ class MemoryMappingLayout {
|
|||
return false;
|
||||
}
|
||||
|
||||
# if defined __linux__
|
||||
# if SANITIZER_LINUX
|
||||
ProcSelfMapsBuff proc_self_maps_;
|
||||
char *current_;
|
||||
|
||||
// Static mappings cache.
|
||||
static ProcSelfMapsBuff cached_proc_self_maps_;
|
||||
static StaticSpinMutex cache_lock_; // protects cached_proc_self_maps_.
|
||||
# elif defined __APPLE__
|
||||
# elif SANITIZER_MAC
|
||||
template<u32 kLCSegment, typename SegmentCommand>
|
||||
bool NextSegmentLoad(uptr *start, uptr *end, uptr *offset,
|
||||
char filename[], uptr filename_size,
|
||||
|
|
|
@ -382,4 +382,4 @@ uptr SuspendedThreadsList::RegisterCount() {
|
|||
}
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // __linux__
|
||||
#endif // SANITIZER_LINUX
|
||||
|
|
|
@ -41,4 +41,4 @@ const char *__sanitizer::Demangle(const char *MangledName) {
|
|||
return MangledName;
|
||||
}
|
||||
|
||||
#endif // __APPLE__ || __linux__
|
||||
#endif // SANITIZER_MAC || SANITIZER_LINUX
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#if !SANITIZER_ANDROID && !SANITIZER_ANDROID
|
||||
#if !SANITIZER_ANDROID
|
||||
#include <link.h>
|
||||
#endif
|
||||
|
||||
|
@ -123,11 +123,11 @@ bool StartSymbolizerSubprocess(const char *path_to_symbolizer,
|
|||
return true;
|
||||
}
|
||||
|
||||
#if SANITIZER_ANDROID || SANITIZER_ANDROID
|
||||
#if SANITIZER_ANDROID
|
||||
uptr GetListOfModules(LoadedModule *modules, uptr max_modules) {
|
||||
UNIMPLEMENTED();
|
||||
}
|
||||
#else // ANDROID
|
||||
#else // SANITIZER_ANDROID
|
||||
typedef ElfW(Phdr) Elf_Phdr;
|
||||
|
||||
struct DlIteratePhdrData {
|
||||
|
@ -177,8 +177,8 @@ uptr GetListOfModules(LoadedModule *modules, uptr max_modules) {
|
|||
dl_iterate_phdr(dl_iterate_phdr_cb, &data);
|
||||
return data.current_n;
|
||||
}
|
||||
#endif // ANDROID
|
||||
#endif // SANITIZER_ANDROID
|
||||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // __linux__
|
||||
#endif // SANITIZER_LINUX
|
||||
|
|
|
@ -25,10 +25,11 @@ bool StartSymbolizerSubprocess(const char *path_to_symbolizer,
|
|||
}
|
||||
|
||||
uptr GetListOfModules(LoadedModule *modules, uptr max_modules) {
|
||||
// FIXME: Actually implement this on Mac.
|
||||
// FIXME: Actually implement this on Mac. Just using MemoryMappingLayout
|
||||
// may be enough for this on Mac.
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace __sanitizer
|
||||
|
||||
#endif // __APPLE__
|
||||
#endif // SANITIZER_MAC
|
||||
|
|
Loading…
Reference in New Issue