Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 5e3dea669e5b0b769f322d54a3bb9f320b5327da Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 22 Mar 2016 15:47:14 +0000 |
| 4 | Subject: [PATCH 26/26] shmat1: Cover GNU specific code under __USE_GNU |
| 5 | |
| 6 | on x86, we use uc_mcontext element from sigcontext |
| 7 | which is marked gnu-specific in glibc, this patch |
| 8 | adds this condition around the code |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | testcases/kernel/mem/mtest06/shmat1.c | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/testcases/kernel/mem/mtest06/shmat1.c b/testcases/kernel/mem/mtest06/shmat1.c |
| 18 | index 0d6d7a4..bee69f6 100644 |
| 19 | --- a/testcases/kernel/mem/mtest06/shmat1.c |
| 20 | +++ b/testcases/kernel/mem/mtest06/shmat1.c |
| 21 | @@ -111,7 +111,7 @@ int done_shmat = 0; /* disallow read and writes before shmat */ |
| 22 | static void sig_handler(int signal, /* signal number, set to handle SIGALRM */ |
| 23 | int code, struct ucontext *ut) |
| 24 | { /* contains pointer to sigcontext structure */ |
| 25 | -#ifdef __i386__ |
| 26 | +#if defined(__i386__) && defined(__USE_GNU) |
| 27 | unsigned long except; /* exception type. */ |
| 28 | int ret = 0; /* exit code from signal handler. */ |
| 29 | struct sigcontext *scp = /* pointer to sigcontext structure */ |
| 30 | @@ -122,7 +122,7 @@ static void sig_handler(int signal, /* signal number, set to handle SIGALRM |
| 31 | fprintf(stdout, "Test ended, success\n"); |
| 32 | exit(0); |
| 33 | } |
| 34 | -#ifdef __i386__ |
| 35 | +#if defined(__i386__) && defined(__USE_GNU) |
| 36 | else { |
| 37 | except = scp->trapno; |
| 38 | fprintf(stderr, "signal caught - [%d] ", signal); |
| 39 | -- |
| 40 | 1.9.1 |
| 41 | |