summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch (renamed from meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch)40
-rw-r--r--meta/recipes-extended/ltp/ltp_20150903.bb (renamed from meta/recipes-extended/ltp/ltp_20150420.bb)4
2 files changed, 27 insertions, 17 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch b/meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch
index 0b594dc550..9407a34584 100644
--- a/meta/recipes-extended/ltp/ltp/0001-replace-inline-with-static-inline-for-gcc-5.x.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch
@@ -1,15 +1,25 @@
1Upstream-Status: Backport [From https://github.com/linux-test-project/ltp/commit/40a2457cb8ec42a05a2f96b0810057efdb2a55f5] 1From 40a2457cb8ec42a05a2f96b0810057efdb2a55f5 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 16 Sep 2015 13:23:43 +0200
4Subject: [PATCH] Fix compilation for gcc-5.x
2 5
3gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which causes 6The gcc-5.x defaults to -std=gnu11 instead of -std=gnu89 which causes
4semantics for inline functions changes. 7semantics for inline functions changes.
5 8
6The standalone 'inline' causes error with gcc 5 such as: 9GNU89 inline: Same as C99 extern inline.
10
11So the standalone 'inline' causes error such as:
7 12
8git/testcases/kernel/syscalls/kill/kill10.c:355: undefined reference to `k_sigaction' 13git/testcases/kernel/syscalls/kill/kill10.c:355: undefined reference to `k_sigaction'
9 14
10Replace inline with static inline to be compatible with both gcc 4 and 5. 15Replace inline with static inline to fix this issue.
16
17Ref:
18https://gcc.gnu.org/gcc-5/porting_to.html
11 19
20Upstream-Status: Backport
12Signed-off-by: Kai Kang <kai.kang@windriver.com> 21Signed-off-by: Kai Kang <kai.kang@windriver.com>
22Acked-by: Cyril Hrubis <chrubis@suse.cz>
13--- 23---
14 testcases/kernel/controllers/libcontrollers/libcontrollers.c | 2 +- 24 testcases/kernel/controllers/libcontrollers/libcontrollers.c | 2 +-
15 testcases/kernel/controllers/libcontrollers/libcontrollers.h | 2 +- 25 testcases/kernel/controllers/libcontrollers/libcontrollers.h | 2 +-
@@ -17,30 +27,30 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
17 3 files changed, 4 insertions(+), 4 deletions(-) 27 3 files changed, 4 insertions(+), 4 deletions(-)
18 28
19diff --git a/testcases/kernel/controllers/libcontrollers/libcontrollers.c b/testcases/kernel/controllers/libcontrollers/libcontrollers.c 29diff --git a/testcases/kernel/controllers/libcontrollers/libcontrollers.c b/testcases/kernel/controllers/libcontrollers/libcontrollers.c
20index b01e1b8..8857bc9 100644 30index 844c5bc..75766fc 100644
21--- a/testcases/kernel/controllers/libcontrollers/libcontrollers.c 31--- a/testcases/kernel/controllers/libcontrollers/libcontrollers.c
22+++ b/testcases/kernel/controllers/libcontrollers/libcontrollers.c 32+++ b/testcases/kernel/controllers/libcontrollers/libcontrollers.c
23@@ -146,7 +146,7 @@ int read_file(char *filepath, int action, unsigned int *value) 33@@ -158,7 +158,7 @@ int read_file(char *filepath, int action, unsigned int *value)
24 * Prints error message and returns -1 34 * Prints error message and returns -1
25 */ 35 */
26 36
27-inline int error_function(char *msg1, char *msg2) 37-inline void error_function(char *msg1, char *msg2)
28+static inline int error_function(char *msg1, char *msg2) 38+static inline void error_function(char *msg1, char *msg2)
29 { 39 {
30 fprintf(stdout, "ERROR: %s ", msg1); 40 fprintf(stdout, "ERROR: %s ", msg1);
31 fprintf(stdout, "%s\n", msg2); 41 fprintf(stdout, "%s\n", msg2);
32diff --git a/testcases/kernel/controllers/libcontrollers/libcontrollers.h b/testcases/kernel/controllers/libcontrollers/libcontrollers.h 42diff --git a/testcases/kernel/controllers/libcontrollers/libcontrollers.h b/testcases/kernel/controllers/libcontrollers/libcontrollers.h
33index 4001555..a1a0dfa 100644 43index bd8e2d8..cdde9f9 100644
34--- a/testcases/kernel/controllers/libcontrollers/libcontrollers.h 44--- a/testcases/kernel/controllers/libcontrollers/libcontrollers.h
35+++ b/testcases/kernel/controllers/libcontrollers/libcontrollers.h 45+++ b/testcases/kernel/controllers/libcontrollers/libcontrollers.h
36@@ -70,7 +70,7 @@ enum{ 46@@ -70,7 +70,7 @@ enum{
37 GET_TASKS 47 GET_TASKS
38 }; 48 };
39 49
40-inline int error_function(char *msg1, char *msg2); 50-inline void error_function(char *msg1, char *msg2);
41+static inline int error_function(char *msg1, char *msg2); 51+static inline void error_function(char *msg1, char *msg2);
42 52
43 unsigned int read_shares_file (char *filepath); 53 int read_shares_file(char *filepath);
44 54
45diff --git a/testcases/kernel/syscalls/kill/kill10.c b/testcases/kernel/syscalls/kill/kill10.c 55diff --git a/testcases/kernel/syscalls/kill/kill10.c b/testcases/kernel/syscalls/kill/kill10.c
46index 982d9da..33dbcd3 100644 56index 982d9da..33dbcd3 100644
@@ -64,6 +74,6 @@ index 982d9da..33dbcd3 100644
64 { 74 {
65 int ret; 75 int ret;
66 if ((ret = sigaction(sig, sa, osa)) == -1) { 76 if ((ret = sigaction(sig, sa, osa)) == -1) {
67--- 77--
68-1.9.1 781.9.1
69- 79
diff --git a/meta/recipes-extended/ltp/ltp_20150420.bb b/meta/recipes-extended/ltp/ltp_20150903.bb
index 1117c11e0d..a15c704134 100644
--- a/meta/recipes-extended/ltp/ltp_20150420.bb
+++ b/meta/recipes-extended/ltp/ltp_20150903.bb
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "\
20" 20"
21 21
22DEPENDS = "attr libaio libcap acl openssl zip-native" 22DEPENDS = "attr libaio libcap acl openssl zip-native"
23SRCREV = "77d0b7fd0148ce657c5a25060667e978c07662a0" 23SRCREV = "d19755a1deddd0268d7c29991afddab497da1823"
24 24
25SRC_URI = "git://github.com/linux-test-project/ltp.git \ 25SRC_URI = "git://github.com/linux-test-project/ltp.git \
26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ 26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
@@ -29,7 +29,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
29 file://add-knob-for-numa.patch \ 29 file://add-knob-for-numa.patch \
30 file://add-knob-for-tirpc.patch \ 30 file://add-knob-for-tirpc.patch \
31 file://0001-ltp-vma03-fix-the-alginment-of-page-size.patch \ 31 file://0001-ltp-vma03-fix-the-alginment-of-page-size.patch \
32 file://0001-replace-inline-with-static-inline-for-gcc-5.x.patch \ 32 file://0001-Fix-compilation-for-gcc-5.x.patch \
33" 33"
34 34
35S = "${WORKDIR}/git" 35S = "${WORKDIR}/git"