diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-05-28 00:17:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-28 00:17:42 +0000 |
| commit | c7307c6cf60615c01e443ff198a74988659bfa05 (patch) | |
| tree | 0d0afb22f82d967699d2d9ddee8b2f1a6840c7c3 | |
| parent | 370b486d36b36ddba85bc1483c5fe01acce07ce0 (diff) | |
| parent | 94a2a589cf39f8957d6ea465aefcc4634ad8a2f4 (diff) | |
| download | valgrind-c7307c6cf60615c01e443ff198a74988659bfa05.tar.gz | |
Merge changes I2b4b211f,I5b48491d
* changes:
Update LOCAL_PATCHES.txt
Fix x86_64 target build
| -rw-r--r-- | LOCAL_PATCHES.txt | 1 | ||||
| -rw-r--r-- | coregrind/m_initimg/initimg-linux.c | 5 | ||||
| -rw-r--r-- | coregrind/vg_preloaded.c | 5 | ||||
| -rw-r--r-- | coregrind/vgdb.c | 5 |
4 files changed, 4 insertions, 12 deletions
diff --git a/LOCAL_PATCHES.txt b/LOCAL_PATCHES.txt index f3d27837b..d32862deb 100644 --- a/LOCAL_PATCHES.txt +++ b/LOCAL_PATCHES.txt @@ -8,3 +8,4 @@ Please add following information for every local patch: -----------------------------+-------------+----------------------------------------- https://bugs.kde.org/339861 | n/a | c3be269612b500f1f590482165d2ba5d5966f23f https://bugs.kde.org/342780 | 18949144 | d07e25f39ce01de1ae33f4fa151c2cbeb2385223 + https://bugs.kde.org/348342 | n/a | 22bcca76a224404fa81fff26437d15f17be56fd4 diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c index d8ff159cc..140eb780e 100644 --- a/coregrind/m_initimg/initimg-linux.c +++ b/coregrind/m_initimg/initimg-linux.c @@ -646,10 +646,7 @@ Addr setup_client_stack( void* init_sp, case AT_GID: case AT_EGID: case AT_CLKTCK: -# if !defined(VGPV_arm_linux_android) \ - && !defined(VGPV_x86_linux_android) \ - && !defined(VGPV_mips32_linux_android) \ - && !defined(VGPV_arm64_linux_android) +# if !defined(__ANDROID__) case AT_FPUCW: /* missing on android */ # endif /* All these are pointerless, so we don't need to do diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c index fbb2e285f..dec2ac5f2 100644 --- a/coregrind/vg_preloaded.c +++ b/coregrind/vg_preloaded.c @@ -57,10 +57,7 @@ void VG_NOTIFY_ON_LOAD(freeres)( void ); void VG_NOTIFY_ON_LOAD(freeres)( void ) { # if !defined(__UCLIBC__) \ - && !defined(VGPV_arm_linux_android) \ - && !defined(VGPV_x86_linux_android) \ - && !defined(VGPV_mips32_linux_android) \ - && !defined(VGPV_arm64_linux_android) + && !defined(__ANDROID__) extern void __libc_freeres(void); __libc_freeres(); # endif diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c index 9057e468d..bcfb6c3dc 100644 --- a/coregrind/vgdb.c +++ b/coregrind/vgdb.c @@ -687,10 +687,7 @@ void received_signal (int signum) sigpipe++; } else if (signum == SIGALRM) { sigalrm++; -#if defined(VGPV_arm_linux_android) \ - || defined(VGPV_x86_linux_android) \ - || defined(VGPV_mips32_linux_android) \ - || defined(VGPV_arm64_linux_android) +#if defined(__ANDROID__) /* Android has no pthread_cancel. As it also does not have an invoker implementation, there is no need for cleanup action. So, we just do nothing. */ |