blob: 40ee894143efe60658e30185717422bc27f3eb26 [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05001From 94557fb7e1293c61145c959b8c5ffecf4a2b1069 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 8 Jan 2016 07:24:44 +0000
4Subject: [PATCH 28/32] rt_sigaction.h: Use sighandler_t instead of
5 __sighandler_t
6
7When _GNU_SOURCE is used then both typedefs are same and using
8sighandler_t makes it work on musl too
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050011
12Upstream-Status: Pending
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050013---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080014 include/lapi/rt_sigaction.h | 4 ++--
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050015 testcases/kernel/syscalls/rt_sigsuspend/Makefile | 3 +++
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016 2 files changed, 5 insertions(+), 2 deletions(-)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050017
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018diff --git a/include/lapi/rt_sigaction.h b/include/lapi/rt_sigaction.h
19index 18236db..15facda 100644
20--- a/include/lapi/rt_sigaction.h
21+++ b/include/lapi/rt_sigaction.h
Brad Bishop6e60e8b2018-02-01 10:27:11 -050022@@ -36,12 +36,12 @@
23 #if defined(__mips__)
24 struct kernel_sigaction {
25 unsigned int sa_flags;
26- __sighandler_t k_sa_handler;
27+ sighandler_t k_sa_handler;
28 sigset_t sa_mask;
29 };
30 #else
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050031 struct kernel_sigaction {
32- __sighandler_t k_sa_handler;
33+ sighandler_t k_sa_handler;
34 unsigned long sa_flags;
35 void (*sa_restorer) (void);
36 sigset_t sa_mask;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080037diff --git a/testcases/kernel/syscalls/rt_sigsuspend/Makefile b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
38index 37bc3a9..2ca7f7c 100644
39--- a/testcases/kernel/syscalls/rt_sigsuspend/Makefile
40+++ b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050041@@ -19,4 +19,7 @@
42 top_srcdir ?= ../../../..
43
44 include $(top_srcdir)/include/mk/testcases.mk
45+
46+CFLAGS += -D_GNU_SOURCE
47+
48 include $(top_srcdir)/include/mk/generic_leaf_target.mk