diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-06-28 14:18:10 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-06-28 14:18:10 +0000 |
| commit | a1270392581727ac1f59f9ec3bd0c82803d14ba1 (patch) | |
| tree | 957d9966d667b189e0cf59ec85b817a0bfbecb0b | |
| parent | 1e80887d6314e3d34b0f1c4aa6ffef9999fba8ec (diff) | |
| download | bcm5719-llvm-a1270392581727ac1f59f9ec3bd0c82803d14ba1.tar.gz bcm5719-llvm-a1270392581727ac1f59f9ec3bd0c82803d14ba1.zip | |
[sanitizer] Disable all ptrace-related definitions on Android.
llvm-svn: 185150
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index f17f76a327f..97ce9791333 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -43,7 +43,6 @@ #include <sys/mount.h> #include <sys/ptrace.h> #include <sys/sysinfo.h> -#include <sys/user.h> #include <sys/vt.h> #include <linux/cdrom.h> #include <linux/fd.h> @@ -66,6 +65,7 @@ #include <scsi/scsi.h> #include <sys/mtio.h> #include <sys/kd.h> +#include <sys/user.h> #include <linux/cyclades.h> #include <linux/if_eql.h> #include <linux/if_plip.h> @@ -162,7 +162,7 @@ namespace __sanitizer { return 0; } -#if SANITIZER_LINUX +#if SANITIZER_LINUX && !SANITIZER_ANDROID unsigned struct_user_regs_struct_sz = sizeof(struct user_regs_struct); unsigned struct_user_fpregs_struct_sz = sizeof(struct user_fpregs_struct); #if __WORDSIZE == 64 diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 07ccf91045a..96e3477032a 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -180,7 +180,7 @@ namespace __sanitizer { char **h_addr_list; }; -#if SANITIZER_LINUX +#if SANITIZER_LINUX && !SANITIZER_ANDROID extern unsigned struct_user_regs_struct_sz; extern unsigned struct_user_fpregs_struct_sz; extern unsigned struct_user_fpxregs_struct_sz; |
