Attachment #490346 for bug #628756

Lines 629-636 uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { Link Here

(-)a/lib/sanitizer_common/sanitizer_linux.cc (-2 / +1 lines)
629	}	629	}
630	#endif	630	#endif
631		631
632	uptr internal_sigaltstack(const struct sigaltstack *ss,	632	uptr internal_sigaltstack(const void ss, void oss) {
633	struct sigaltstack *oss) {
634	return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);	633	return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
635	}	634	}
636		635

Lines 21-27 Link Here

(-)a/lib/sanitizer_common/sanitizer_linux.h (-3 / +1 lines)
21	#include "sanitizer_platform_limits_posix.h"	21	#include "sanitizer_platform_limits_posix.h"
22		22
23	struct link_map; // Opaque type returned by dlopen().	23	struct link_map; // Opaque type returned by dlopen().
24	struct sigaltstack;
25		24
26	namespace __sanitizer {	25	namespace __sanitizer {
27	// Dirent structure for getdents(). Note that this structure is different from	26	// Dirent structure for getdents(). Note that this structure is different from
Lines 30-37 struct linux_dirent; Link Here
30		29
31	// Syscall wrappers.	30	// Syscall wrappers.
32	uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);	31	uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
33	uptr internal_sigaltstack(const struct sigaltstack* ss,	32	uptr internal_sigaltstack(const void* ss, void* oss);
34	struct sigaltstack* oss);
35	uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,	33	uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
36	__sanitizer_sigset_t *oldset);	34	__sanitizer_sigset_t *oldset);
37		35

Lines 287-293 static int TracerThread(void* argument) { Link Here

(-)a/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc (-1 / +1 lines)
287		287
288	// Alternate stack for signal handling.	288	// Alternate stack for signal handling.
289	InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);	289	InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
290	struct sigaltstack handler_stack;	290	stack_t handler_stack;
291	internal_memset(&handler_stack, 0, sizeof(handler_stack));	291	internal_memset(&handler_stack, 0, sizeof(handler_stack));
292	handler_stack.ss_sp = handler_stack_memory.data();	292	handler_stack.ss_sp = handler_stack_memory.data();
293	handler_stack.ss_size = kHandlerStackSize;	293	handler_stack.ss_size = kHandlerStackSize;

Lines 286-292 void InitializePlatform() { Link Here

(-)a/lib/tsan/rtl/tsan_platform_linux.cc (-2 / +1 lines)
286	int ExtractResolvFDs(void state, int fds, int nfd) {	286	int ExtractResolvFDs(void state, int fds, int nfd) {
287	#if SANITIZER_LINUX && !SANITIZER_ANDROID	287	#if SANITIZER_LINUX && !SANITIZER_ANDROID
288	int cnt = 0;	288	int cnt = 0;
289	__res_state statp = (__res_state)state;	289	struct __res_state statp = (struct __res_state)state;
290	for (int i = 0; i < MAXNS && cnt < nfd; i++) {	290	for (int i = 0; i < MAXNS && cnt < nfd; i++) {
291	if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)	291	if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
292	fds[cnt++] = statp->_u._ext.nssocks[i];	292	fds[cnt++] = statp->_u._ext.nssocks[i];
293	-

Return to bug 628756