diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-03-22 15:54:23 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-24 21:44:26 +0000 |
| commit | 04cbc4834076fef6b46af4c5c66046862de7634d (patch) | |
| tree | 2d8e861353203cf8dca5a095d7b03fb597e9c53d /meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch | |
| parent | d14bc2667575bc0e29b9e90d80c01703639b76f1 (diff) | |
| download | openembedded-core-contrib-04cbc4834076fef6b46af4c5c66046862de7634d.tar.gz | |
ltp: Fix build on x86/musl
In last patch it covered out the non-glibc case well
but did not define else case, when __GLIBC__ is not
defined, as a result errors like
| getcpu01.c:107:41: error: use of undeclared identifier 'sys_support'
| if (((tst_kvercmp(2, 6, 20)) < 0) || !(sys_support)) {
appeared, fixed it with this updated patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch')
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch b/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch new file mode 100644 index 0000000000..868e1cf1fa --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch @@ -0,0 +1,41 @@ +From 5e3dea669e5b0b769f322d54a3bb9f320b5327da Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Mar 2016 15:47:14 +0000 +Subject: [PATCH 26/26] shmat1: Cover GNU specific code under __USE_GNU + +on x86, we use uc_mcontext element from sigcontext +which is marked gnu-specific in glibc, this patch +adds this condition around the code + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + testcases/kernel/mem/mtest06/shmat1.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testcases/kernel/mem/mtest06/shmat1.c b/testcases/kernel/mem/mtest06/shmat1.c +index 0d6d7a4..bee69f6 100644 +--- a/testcases/kernel/mem/mtest06/shmat1.c ++++ b/testcases/kernel/mem/mtest06/shmat1.c +@@ -111,7 +111,7 @@ int done_shmat = 0; /* disallow read and writes before shmat */ + static void sig_handler(int signal, /* signal number, set to handle SIGALRM */ + int code, struct ucontext *ut) + { /* contains pointer to sigcontext structure */ +-#ifdef __i386__ ++#if defined(__i386__) && defined(__USE_GNU) + unsigned long except; /* exception type. */ + int ret = 0; /* exit code from signal handler. */ + struct sigcontext *scp = /* pointer to sigcontext structure */ +@@ -122,7 +122,7 @@ static void sig_handler(int signal, /* signal number, set to handle SIGALRM + fprintf(stdout, "Test ended, success\n"); + exit(0); + } +-#ifdef __i386__ ++#if defined(__i386__) && defined(__USE_GNU) + else { + except = scp->trapno; + fprintf(stderr, "signal caught - [%d] ", signal); +-- +1.9.1 + |