travis: add x86 musl

[strace] / print_sigevent.c

diff --git a/print_sigevent.c b/print_sigevent.c
index 5454486b6cf2592f615fe3982c16da8cd75d7733..caf1fdfe29843973b35468bd1fdbc2c2dc47de80 100644 (file)
--- a/print_sigevent.c
+++ b/print_sigevent.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003, 2004 Ulrich Drepper <drepper@redhat.com>
- * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2005-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,17 +29,13 @@
 #include "defs.h"
 
 #include DEF_MPERS_TYPE(struct_sigevent)
-
-#include <signal.h>
-typedef struct sigevent struct_sigevent;
-
+#include "sigevent.h"
 #include MPERS_DEFS
 
-#ifndef IN_MPERS
-# include "xlat/sigev_value.h"
-#endif
+#include <signal.h>
+#include "xlat/sigev_value.h"
 
-MPERS_PRINTER_DECL(void, print_sigevent)(struct tcb *tcp, const long addr)
+MPERS_PRINTER_DECL(void, print_sigevent, struct tcb *tcp, const long addr)
 {
        struct_sigevent sev;
 
@@ -47,10 +43,12 @@ MPERS_PRINTER_DECL(void, print_sigevent)(struct tcb *tcp, const long addr)
                return;
 
        tprints("{");
-       if (sev.sigev_value.sival_ptr)
-               tprintf("sigev_value={int=%d, ptr=%#lx}, ",
-                       sev.sigev_value.sival_int,
-                       (unsigned long) sev.sigev_value.sival_ptr);
+       if (sev.sigev_value.sival_ptr) {
+               tprintf("sigev_value={int=%d, ptr=",
+                       sev.sigev_value.sival_int);
+               printaddr((unsigned long) sev.sigev_value.sival_ptr);
+               tprints("}, ");
+       }
 
        tprints("sigev_signo=");
        switch (sev.sigev_notify) {
@@ -68,30 +66,13 @@ MPERS_PRINTER_DECL(void, print_sigevent)(struct tcb *tcp, const long addr)
 
        switch (sev.sigev_notify) {
        case SIGEV_THREAD_ID:
-#ifndef sigev_notify_thread_id
-               /*
-                * _pad[0] is the _tid field which might not be
-                * present in the userlevel definition of the struct.
-                */
-# if defined HAVE_STRUCT_SIGEVENT__SIGEV_UN__PAD
-#  define sigev_notify_thread_id _sigev_un._pad[0]
-# elif defined HAVE_STRUCT_SIGEVENT___PAD
-#  define sigev_notify_thread_id __pad[0]
-# endif
-#endif
-
-#ifdef sigev_notify_thread_id
-               tprintf(", sigev_notify_thread_id=%d",
-                       sev.sigev_notify_thread_id);
-#else
-# warning unfamiliar struct sigevent => incomplete SIGEV_THREAD_ID decoding
-#endif
+               tprintf(", sigev_notify_thread_id=%d", sev.sigev_un.tid);
                break;
        case SIGEV_THREAD:
                tprints(", sigev_notify_function=");
-               printaddr((unsigned long) sev.sigev_notify_function);
+               printaddr(sev.sigev_un.sigev_thread.function);
                tprints(", sigev_notify_attributes=");
-               printaddr((unsigned long) sev.sigev_notify_attributes);
+               printaddr(sev.sigev_un.sigev_thread.attribute);
                break;
        }
        tprints("}");