summaryrefslogtreecommitdiff
path: root/package/strace/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-17 08:21:53 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-17 08:21:53 +0100
commit186c1bd82b6a6a1b0fcd64456088ca50e37784d5 (patch)
treec39034bcf0c05efef01803bfe564a3a113032c6a /package/strace/patches
parentb1e843d40eea9bc684436f4635018b7c19eb93ea (diff)
fixups for x86_64 x32 toolchain, x86_64 32 still problematic
- add a musl patch to recognize x86_64-foo-muslx32 - rework multilib configuration - remove explicit sjlj gcc configure, as suggested by the gcc docs - fix strace for x32
Diffstat (limited to 'package/strace/patches')
-rw-r--r--package/strace/patches/patch-desc_c14
1 files changed, 13 insertions, 1 deletions
diff --git a/package/strace/patches/patch-desc_c b/package/strace/patches/patch-desc_c
index 9cfb5f505..63a01023e 100644
--- a/package/strace/patches/patch-desc_c
+++ b/package/strace/patches/patch-desc_c
@@ -1,5 +1,5 @@
--- strace-4.8.orig/desc.c 2013-05-02 00:39:10.000000000 +0200
-+++ strace-4.8/desc.c 2014-02-25 15:16:36.000000000 +0100
++++ strace-4.8/desc.c 2014-03-01 19:44:21.000000000 +0100
@@ -223,7 +223,7 @@ static const struct xlat perf_event_open
{ 0, NULL },
};
@@ -9,3 +9,15 @@
/* fcntl/lockf */
static void
printflock64(struct tcb *tcp, long addr, int getlk)
+@@ -255,7 +255,11 @@ printflock(struct tcb *tcp, long addr, i
+ #if SUPPORTED_PERSONALITIES > 1
+ # ifdef X32
+ if (current_personality == 0) {
++#if defined(__GLIBC__)
+ printflock64(tcp, addr, getlk);
++#else
++ printflock(tcp, addr, getlk);
++#endif
+ return;
+ }
+ # endif