Attachment #491348 for bug #629502

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

(-)a/libsanitizer/sanitizer_common/sanitizer_linux.cc (-2 / +1 lines)
599	return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);	599	return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);
600	}	600	}
601		601
602	uptr internal_sigaltstack(const struct sigaltstack *ss,	602	uptr internal_sigaltstack(const void ss, void oss) {
603	struct sigaltstack *oss) {
604	return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);	603	return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);
605	}	604	}
606		605

Lines 18-24 Link Here

(-)a/libsanitizer/sanitizer_common/sanitizer_linux.h (-3 / +1 lines)
18	#include "sanitizer_platform_limits_posix.h"	18	#include "sanitizer_platform_limits_posix.h"
19		19
20	struct link_map; // Opaque type returned by dlopen().	20	struct link_map; // Opaque type returned by dlopen().
21	struct sigaltstack;
22		21
23	namespace __sanitizer {	22	namespace __sanitizer {
24	// Dirent structure for getdents(). Note that this structure is different from	23	// Dirent structure for getdents(). Note that this structure is different from
Lines 28-35 struct linux_dirent; Link Here
28	// Syscall wrappers.	27	// Syscall wrappers.
29	uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);	28	uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
30	uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);	29	uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);
31	uptr internal_sigaltstack(const struct sigaltstack* ss,	30	uptr internal_sigaltstack(const void* ss, void* oss);
32	struct sigaltstack* oss);
33	uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,	31	uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,
34	__sanitizer_kernel_sigaction_t *oldact);	32	__sanitizer_kernel_sigaction_t *oldact);
35	uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,	33	uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,

Lines 238-244 static int TracerThread(void* argument) { Link Here

(-)a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc (-1 / +1 lines)
238		238
239	// Alternate stack for signal handling.	239	// Alternate stack for signal handling.
240	InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);	240	InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
241	struct sigaltstack handler_stack;	241	stack_t handler_stack;
242	internal_memset(&handler_stack, 0, sizeof(handler_stack));	242	internal_memset(&handler_stack, 0, sizeof(handler_stack));
243	handler_stack.ss_sp = handler_stack_memory.data();	243	handler_stack.ss_sp = handler_stack_memory.data();
244	handler_stack.ss_size = kHandlerStackSize;	244	handler_stack.ss_size = kHandlerStackSize;

Lines 351-357 bool IsGlobalVar(uptr addr) { Link Here

(-)a/libsanitizer/tsan/tsan_platform_linux.cc (-2 / +1 lines)
351	// closes within glibc. The code is a pure hack.	351	// closes within glibc. The code is a pure hack.
352	int ExtractResolvFDs(void state, int fds, int nfd) {	352	int ExtractResolvFDs(void state, int fds, int nfd) {
353	int cnt = 0;	353	int cnt = 0;
354	__res_state statp = (__res_state)state;	354	struct __res_state statp = (struct __res_state)state;
355	for (int i = 0; i < MAXNS && cnt < nfd; i++) {	355	for (int i = 0; i < MAXNS && cnt < nfd; i++) {
356	if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)	356	if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
357	fds[cnt++] = statp->_u._ext.nssocks[i];	357	fds[cnt++] = statp->_u._ext.nssocks[i];
358	-

Return to bug 629502