Skip to content

Commit d49063b

Browse files
authored
[compiler-rt][sanitizer][NFC] update endif markers for Haiku (#135475)
1 parent 6bea80e commit d49063b

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

compiler-rt/lib/asan/asan_linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,4 +288,4 @@ bool HandleDlopenInit() {
288288
} // namespace __asan
289289

290290
#endif // SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ||
291-
// SANITIZER_SOLARIS
291+
// SANITIZER_SOLARIS || SANITIZER_HAIKU

compiler-rt/lib/asan/asan_malloc_linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,4 @@ void ReplaceSystemMalloc() {
217217
#endif // SANITIZER_ANDROID
218218

219219
#endif // SANITIZER_FREEBSD || SANITIZER_FUCHSIA || SANITIZER_LINUX ||
220-
// SANITIZER_NETBSD || SANITIZER_SOLARIS
220+
// SANITIZER_NETBSD || SANITIZER_SOLARIS || SANITIZER_HAIKU

compiler-rt/lib/interception/interception_linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ bool InterceptFunction(const char *name, const char *ver, uptr *ptr_to_real,
8080
} // namespace __interception
8181

8282
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD ||
83-
// SANITIZER_SOLARIS
83+
// SANITIZER_SOLARIS || SANITIZER_HAIKU

compiler-rt/lib/interception/interception_linux.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ bool InterceptFunction(const char *name, const char *ver, uptr *ptr_to_real,
5252

5353
#endif // INTERCEPTION_LINUX_H
5454
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD ||
55-
// SANITIZER_SOLARIS
55+
// SANITIZER_SOLARIS || SANITIZER_HAIKU

compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ uptr internal_execve(const char *filename, char *const argv[],
606606
return internal_syscall(SYSCALL(execve), (uptr)filename, (uptr)argv,
607607
(uptr)envp);
608608
}
609-
# endif // !SANITIZER_SOLARIS && !SANITIZER_NETBSD
609+
# endif // !SANITIZER_SOLARIS && !SANITIZER_NETBSD && !SANITIZER_HAIKU
610610

611611
# if !SANITIZER_NETBSD && !SANITIZER_HAIKU
612612
void internal__exit(int exitcode) {
@@ -617,7 +617,7 @@ void internal__exit(int exitcode) {
617617
# endif
618618
Die(); // Unreachable.
619619
}
620-
# endif // !SANITIZER_NETBSD
620+
# endif // !SANITIZER_NETBSD && !SANITIZER_HAIKU
621621

622622
// ----------------- sanitizer_common.h
623623
bool FileExists(const char *filename) {
@@ -807,7 +807,7 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
807807
# if !SANITIZER_GO
808808
}
809809
# endif // !SANITIZER_GO
810-
# endif // SANITIZER_FREEBSD
810+
# endif // SANITIZER_HAIKU
811811
}
812812

813813
char **GetArgv() {

compiler-rt/lib/sanitizer_common/sanitizer_linux.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct MemoryMappingLayoutData {
4848
};
4949

5050
void ReadProcMaps(ProcSelfMapsBuff *proc_maps);
51-
# endif
51+
# endif // SANITIZER_HAIKU
5252

5353
// Syscall wrappers.
5454
uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
367367

368368
# if !SANITIZER_ANDROID && !SANITIZER_HAIKU
369369
const int wordexp_wrde_dooffs = WRDE_DOOFFS;
370-
# endif // !SANITIZER_ANDROID
370+
# endif // !SANITIZER_ANDROID && !SANITIZER_HAIKU
371371

372372
# if SANITIZER_LINUX && !SANITIZER_ANDROID && \
373373
(defined(__i386) || defined(__x86_64) || defined(__mips64) || \

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1567,6 +1567,6 @@ extern const int si_SEGV_ACCERR;
15671567
typedef void *__sanitizer_timer_t;
15681568
# endif
15691569

1570-
#endif // SANITIZER_LINUX || SANITIZER_APPLE
1570+
#endif // SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
15711571

15721572
#endif

0 commit comments

Comments
 (0)