Attachment #491346 for bug #629502

Lines 546-553 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)
546	}	546	}
547	#endif	547	#endif
548		548
549	uptr internal_sigaltstack(const struct sigaltstack *ss,	549	uptr internal_sigaltstack(const void ss, void oss) {
550	struct sigaltstack *oss) {
551	return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);	550	return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
552	}	551	}
553		552

Lines 19-25 Link Here

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

Lines 267-273 static int TracerThread(void* argument) { Link Here

(-)a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc (-1 / +1 lines)
267		267
268	// Alternate stack for signal handling.	268	// Alternate stack for signal handling.
269	InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);	269	InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
270	struct sigaltstack handler_stack;	270	stack_t handler_stack;
271	internal_memset(&handler_stack, 0, sizeof(handler_stack));	271	internal_memset(&handler_stack, 0, sizeof(handler_stack));
272	handler_stack.ss_sp = handler_stack_memory.data();	272	handler_stack.ss_sp = handler_stack_memory.data();
273	handler_stack.ss_size = kHandlerStackSize;	273	handler_stack.ss_size = kHandlerStackSize;

Lines 291-297 bool IsGlobalVar(uptr addr) { Link Here

(-)a/libsanitizer/tsan/tsan_platform_linux.cc (-2 / +1 lines)
291	int ExtractResolvFDs(void state, int fds, int nfd) {	291	int ExtractResolvFDs(void state, int fds, int nfd) {
292	#if SANITIZER_LINUX	292	#if SANITIZER_LINUX
293	int cnt = 0;	293	int cnt = 0;
294	__res_state statp = (__res_state)state;	294	struct __res_state statp = (struct __res_state)state;
295	for (int i = 0; i < MAXNS && cnt < nfd; i++) {	295	for (int i = 0; i < MAXNS && cnt < nfd; i++) {
296	if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)	296	if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
297	fds[cnt++] = statp->_u._ext.nssocks[i];	297	fds[cnt++] = statp->_u._ext.nssocks[i];
298	-

Return to bug 629502