other than one small patch to build (below and attached, since gmail mangles these things), lgtm on Android.
If we build strace against the untouched Linux kernel uapi headers (as used by bionic), the key fields are called 'key', not '__key'. * ipc_msgctl.c, ipc_shmctl.c: Add #define workaround. --- ipc_msgctl.c | 1 + ipc_shmctl.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ipc_msgctl.c b/ipc_msgctl.c index e46f6e2..c37e9da 100644 --- a/ipc_msgctl.c +++ b/ipc_msgctl.c @@ -44,6 +44,7 @@ typedef struct msqid_ds msqid_ds_t; /* The linux header might provide the right struct. */ # include <linux/msg.h> typedef struct msqid64_ds msqid_ds_t; +#define __key key #endif #include MPERS_DEFS diff --git a/ipc_shmctl.c b/ipc_shmctl.c index 3498455..feb5634 100644 --- a/ipc_shmctl.c +++ b/ipc_shmctl.c @@ -44,6 +44,7 @@ typedef struct shmid_ds shmid_ds_t; /* The linux header might provide the right struct. */ # include <linux/shm.h> typedef struct shmid64_ds shmid_ds_t; +#define __key key #endif #include MPERS_DEFS -- 2.6.0.rc2.230.g3dd15c0 On Wed, Dec 9, 2015 at 9:26 PM, Dmitry V. Levin <l...@altlinux.org> wrote: > Hi, > > There is quite enough good stuff accumulated in strace.git > since v4.10 so I think it's time to cut a new release. > > If you have pending patches to include before the release, > please submit them now. > > There have been quite a few changes since v4.10 that could have caused > regressions, so please test HEAD on all configurations you can. > > Judging by the test results I have, current HEAD (v4.10-566-gbab4ef4) > is expected to pass "make check" at least on the following architectures: > x86_64, x86, x32, aarch64, arm eabi, alpha, hppa, ia64, mips o32, > ppc, ppc64, s390, s390x, and sparc. > > Assuming that toolchain is recent enough, current HEAD is also expected > to pass "make check" when configured with --enable-gcc-Werror option. > > > -- > ldv > > ------------------------------------------------------------------------------ > > _______________________________________________ > Strace-devel mailing list > Strace-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/strace-devel > -- Elliott Hughes - http://who/enh - http://jessies.org/~enh/ Android native code/tools questions? Mail me/drop by/add me as a reviewer.
From bb4b0918387e38830529657f704682967ca280a3 Mon Sep 17 00:00:00 2001 From: Elliott Hughes <e...@google.com> Date: Thu, 10 Dec 2015 10:46:49 -0800 Subject: [PATCH] Fix bionic build. If we build strace against the untouched Linux kernel uapi headers (as used by bionic), the key fields are called 'key', not '__key'. * ipc_msgctl.c, ipc_shmctl.c: Add #define workaround. --- ipc_msgctl.c | 1 + ipc_shmctl.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ipc_msgctl.c b/ipc_msgctl.c index e46f6e2..c37e9da 100644 --- a/ipc_msgctl.c +++ b/ipc_msgctl.c @@ -44,6 +44,7 @@ typedef struct msqid_ds msqid_ds_t; /* The linux header might provide the right struct. */ # include <linux/msg.h> typedef struct msqid64_ds msqid_ds_t; +#define __key key #endif #include MPERS_DEFS diff --git a/ipc_shmctl.c b/ipc_shmctl.c index 3498455..feb5634 100644 --- a/ipc_shmctl.c +++ b/ipc_shmctl.c @@ -44,6 +44,7 @@ typedef struct shmid_ds shmid_ds_t; /* The linux header might provide the right struct. */ # include <linux/shm.h> typedef struct shmid64_ds shmid_ds_t; +#define __key key #endif #include MPERS_DEFS -- 2.6.0.rc2.230.g3dd15c0
------------------------------------------------------------------------------
_______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
