This is an archive of the discontinued LLVM Phabricator instance.

[tsan] Fix aarch64 build issue
ClosedPublic

Authored by zatrazz on Aug 5 2015, 10:26 AM.

Download Raw Diff

Details

Reviewers

kcc
rengolin
dvyukov
eugenis

Summary

This patch fixes tsan broke build for aarch64 since GLIBC 2.20+, sys/user.h
does not include asm/ptrace.h (which defined struct user_pt_regs). This patch
fixes by including it instead of sys/user.h.

Diff Detail

Event Timeline

zatrazz updated this revision to Diff 31367.Aug 5 2015, 10:26 AM

zatrazz retitled this revision from to [tsan] Fix aarch64 build issue.

zatrazz updated this object.

zatrazz added reviewers: rengolin, kcc, eugenis, dvyukov.

zatrazz added a subscriber: llvm-commits.

Herald added subscribers: rengolin, aemerson. · View Herald TranscriptAug 5 2015, 10:26 AM

Fixes the problem with the bots.

This revision is now accepted and ready to land.Aug 5 2015, 11:33 AM

244088

Revision Contents

Path

Size

lib/

sanitizer_common/

sanitizer_stoptheworld_linux_libcdep.cc

4 lines

Diff 31367

lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc

	Show All 27 Lines
	#include <sys/prctl.h> // for PR_* definitions			#include <sys/prctl.h> // for PR_* definitions
	#include <sys/ptrace.h> // for PTRACE_* definitions			#include <sys/ptrace.h> // for PTRACE_* definitions
	#include <sys/types.h> // for pid_t			#include <sys/types.h> // for pid_t
	#include <sys/uio.h> // for iovec			#include <sys/uio.h> // for iovec
	#include <elf.h> // for NT_PRSTATUS			#include <elf.h> // for NT_PRSTATUS
	#if SANITIZER_ANDROID && defined(__arm__)			#if SANITIZER_ANDROID && defined(__arm__)
	# include <linux/user.h> // for pt_regs			# include <linux/user.h> // for pt_regs
	#else			#else
				# ifdef __aarch64__
				// GLIBC 2.20+ sys/user does not include asm/ptrace.h
				# include <asm/ptrace.h>
				# endif
	# include <sys/user.h> // for user_regs_struct			# include <sys/user.h> // for user_regs_struct
	#endif			#endif
	#include <sys/wait.h> // for signal-related stuff			#include <sys/wait.h> // for signal-related stuff

	#ifdef sa_handler			#ifdef sa_handler
	# undef sa_handler			# undef sa_handler
	#endif			#endif

	▲ Show 20 Lines • Show All 475 Lines • Show Last 20 Lines