summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch79
1 files changed, 0 insertions, 79 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch b/meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch
deleted file mode 100644
index 9407a34584..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-Fix-compilation-for-gcc-5.x.patch
+++ /dev/null
@@ -1,79 +0,0 @@
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
5
6The gcc-5.x defaults to -std=gnu11 instead of -std=gnu89 which causes
7semantics for inline functions changes.
8
9GNU89 inline: Same as C99 extern inline.
10
11So the standalone 'inline' causes error such as:
12
13git/testcases/kernel/syscalls/kill/kill10.c:355: undefined reference to `k_sigaction'
14
15Replace inline with static inline to fix this issue.
16
17Ref:
18https://gcc.gnu.org/gcc-5/porting_to.html
19
20Upstream-Status: Backport
21Signed-off-by: Kai Kang <kai.kang@windriver.com>
22Acked-by: Cyril Hrubis <chrubis@suse.cz>
23---
24 testcases/kernel/controllers/libcontrollers/libcontrollers.c | 2 +-
25 testcases/kernel/controllers/libcontrollers/libcontrollers.h | 2 +-
26 testcases/kernel/syscalls/kill/kill10.c | 4 ++--
27 3 files changed, 4 insertions(+), 4 deletions(-)
28
29diff --git a/testcases/kernel/controllers/libcontrollers/libcontrollers.c b/testcases/kernel/controllers/libcontrollers/libcontrollers.c
30index 844c5bc..75766fc 100644
31--- a/testcases/kernel/controllers/libcontrollers/libcontrollers.c
32+++ b/testcases/kernel/controllers/libcontrollers/libcontrollers.c
33@@ -158,7 +158,7 @@ int read_file(char *filepath, int action, unsigned int *value)
34 * Prints error message and returns -1
35 */
36
37-inline void error_function(char *msg1, char *msg2)
38+static inline void error_function(char *msg1, char *msg2)
39 {
40 fprintf(stdout, "ERROR: %s ", msg1);
41 fprintf(stdout, "%s\n", msg2);
42diff --git a/testcases/kernel/controllers/libcontrollers/libcontrollers.h b/testcases/kernel/controllers/libcontrollers/libcontrollers.h
43index bd8e2d8..cdde9f9 100644
44--- a/testcases/kernel/controllers/libcontrollers/libcontrollers.h
45+++ b/testcases/kernel/controllers/libcontrollers/libcontrollers.h
46@@ -70,7 +70,7 @@ enum{
47 GET_TASKS
48 };
49
50-inline void error_function(char *msg1, char *msg2);
51+static inline void error_function(char *msg1, char *msg2);
52
53 int read_shares_file(char *filepath);
54
55diff --git a/testcases/kernel/syscalls/kill/kill10.c b/testcases/kernel/syscalls/kill/kill10.c
56index 982d9da..33dbcd3 100644
57--- a/testcases/kernel/syscalls/kill/kill10.c
58+++ b/testcases/kernel/syscalls/kill/kill10.c
59@@ -185,7 +185,7 @@ int child_checklist_total = 0;
60 int checklist_cmp(const void *a, const void *b);
61 void checklist_reset(int bit);
62
63-inline int k_sigaction(int sig, struct sigaction *sa, struct sigaction *osa);
64+static inline int k_sigaction(int sig, struct sigaction *sa, struct sigaction *osa);
65
66 char *TCID = "kill10";
67 int TST_TOTAL = 1;
68@@ -756,7 +756,7 @@ void checklist_reset(int bit)
69
70 }
71
72-inline int k_sigaction(int sig, struct sigaction *sa, struct sigaction *osa)
73+static inline int k_sigaction(int sig, struct sigaction *sa, struct sigaction *osa)
74 {
75 int ret;
76 if ((ret = sigaction(sig, sa, osa)) == -1) {
77--
781.9.1
79