summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-10-05 21:30:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-08 22:51:35 +0100
commitcf840f4e0cf2a8a11f2dec9bd73458f45e123841 (patch)
tree9049161d0fd2624e7a446d761711ef47fb309c94
parent2797993ea5d7c0fc6ee04fce8f970366284e29ff (diff)
downloadpoky-cf840f4e0cf2a8a11f2dec9bd73458f45e123841.tar.gz
qemu: fix build issue on new hosts with glibc 2.30
This fixes the following error: TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/linux-user/syscall.c:254:16: error: static declaration of ‘gettid’ follows non-static declaration 254 | _syscall0(int, gettid) | ^~~~~~ TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/linux-user/syscall.c:185:13: note: in definition of macro ‘_syscall0’ 185 | static type name (void) \ | ^~~~ In file included from /usr/include/unistd.h:1170, from TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/include/qemu/osdep.h:90, from TOPDIR/tmp/work/x86_64-linux/qemu-native/3.1.0-r0/qemu-3.1.0/linux-user/syscall.c:20: /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~ (From OE-Core rev: fbedc2d73ff472c89ba273a890408f93015e8f17) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch49
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch95
3 files changed, 146 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index e720ddf70f..40c3174903 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -33,6 +33,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
33 file://0014-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-w.patch \ 33 file://0014-linux-user-fix-to-handle-variably-sized-SIOCGSTAMP-w.patch \
34 file://CVE-2018-20815.patch \ 34 file://CVE-2018-20815.patch \
35 file://CVE-2019-8934.patch \ 35 file://CVE-2019-8934.patch \
36 file://0001-linux-user-assume-__NR_gettid-always-exists.patch \
37 file://0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch \
36 " 38 "
37UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 39UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
38 40
diff --git a/meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch b/meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch
new file mode 100644
index 0000000000..b09ddbe3c6
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-linux-user-assume-__NR_gettid-always-exists.patch
@@ -0,0 +1,49 @@
1From 184943d827ce09375284e6fbb9fd5eeb9e369529 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
3Date: Wed, 20 Mar 2019 16:18:41 +0000
4Subject: [PATCH] linux-user: assume __NR_gettid always exists
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9The gettid syscall was introduced in Linux 2.4.11. This is old enough
10that we can assume it always exists and thus not bother with the
11conditional backcompat logic.
12
13Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
14Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
15Reviewed-by: Laurent Vivier <laurent@vivier.eu>
16Message-Id: <20190320161842.13908-2-berrange@redhat.com>
17Signed-off-by: Laurent Vivier <laurent@vivier.eu>
18
19Upstream-Status: Backport
20dependancy patch for fix
21
22Signed-off-by: Armin Kuster <akuster808@gmail.com>
23
24---
25
26
27 linux-user/syscall.c | 8 --------
28 1 file changed, 8 deletions(-)
29
30Index: qemu-3.1.0/linux-user/syscall.c
31===================================================================
32--- qemu-3.1.0.orig/linux-user/syscall.c
33+++ qemu-3.1.0/linux-user/syscall.c
34@@ -250,15 +250,7 @@ static type name (type1 arg1,type2 arg2,
35 #define TARGET_NR__llseek TARGET_NR_llseek
36 #endif
37
38-#ifdef __NR_gettid
39 _syscall0(int, gettid)
40-#else
41-/* This is a replacement for the host gettid() and must return a host
42- errno. */
43-static int gettid(void) {
44- return -ENOSYS;
45-}
46-#endif
47
48 /* For the 64-bit guest on 32-bit host case we must emulate
49 * getdents using getdents64, because otherwise the host
diff --git a/meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch b/meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch
new file mode 100644
index 0000000000..86d7678cae
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch
@@ -0,0 +1,95 @@
1From 71ba74f67eaca21b0cc9d96f534ad3b9a7161400 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
3Date: Wed, 20 Mar 2019 16:18:42 +0000
4Subject: [PATCH] linux-user: rename gettid() to sys_gettid() to avoid clash
5 with glibc
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid()
11function as part of unistd.h when __USE_GNU is defined. This clashes
12with linux-user code which unconditionally defines this function name
13itself.
14
15/home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static declaration of ‘gettid’ follows non-static declaration
16 253 | _syscall0(int, gettid)
17 | ^~~~~~
18/home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definition of macro ‘_syscall0’
19 184 | static type name (void) \
20 | ^~~~
21In file included from /usr/include/unistd.h:1170,
22 from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107,
23 from /home/berrange/src/virt/qemu/linux-user/syscall.c:20:
24/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
25 34 | extern __pid_t gettid (void) __THROW;
26 | ^~~~~~
27 CC aarch64-linux-user/linux-user/signal.o
28make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall.o] Error 1
29make[1]: *** Waiting for unfinished jobs....
30make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2
31
32While we could make our definition conditional and rely on glibc's impl,
33this patch simply renames our definition to sys_gettid() which is a
34common pattern in this file.
35
36Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
37Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
38Reviewed-by: Laurent Vivier <laurent@vivier.eu>
39Message-Id: <20190320161842.13908-3-berrange@redhat.com>
40Signed-off-by: Laurent Vivier <laurent@vivier.eu>
41
42Upstream-status: Backport
43
44Fixes issue found on tumbleweed-ty-1
45Yocto bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13577
46Signed-off-by: Armin Kuster <akuster808@gmail.com>
47
48---
49 linux-user/syscall.c | 11 ++++++-----
50 1 file changed, 6 insertions(+), 5 deletions(-)
51
52Index: qemu-3.1.0/linux-user/syscall.c
53===================================================================
54--- qemu-3.1.0.orig/linux-user/syscall.c
55+++ qemu-3.1.0/linux-user/syscall.c
56@@ -250,7 +250,8 @@ static type name (type1 arg1,type2 arg2,
57 #define TARGET_NR__llseek TARGET_NR_llseek
58 #endif
59
60-_syscall0(int, gettid)
61+#define __NR_sys_gettid __NR_gettid
62+_syscall0(int, sys_gettid)
63
64 /* For the 64-bit guest on 32-bit host case we must emulate
65 * getdents using getdents64, because otherwise the host
66@@ -5483,7 +5484,7 @@ static void *clone_func(void *arg)
67 cpu = ENV_GET_CPU(env);
68 thread_cpu = cpu;
69 ts = (TaskState *)cpu->opaque;
70- info->tid = gettid();
71+ info->tid = sys_gettid();
72 task_settid(ts);
73 if (info->child_tidptr)
74 put_user_u32(info->tid, info->child_tidptr);
75@@ -5628,9 +5629,9 @@ static int do_fork(CPUArchState *env, un
76 mapping. We can't repeat the spinlock hack used above because
77 the child process gets its own copy of the lock. */
78 if (flags & CLONE_CHILD_SETTID)
79- put_user_u32(gettid(), child_tidptr);
80+ put_user_u32(sys_gettid(), child_tidptr);
81 if (flags & CLONE_PARENT_SETTID)
82- put_user_u32(gettid(), parent_tidptr);
83+ put_user_u32(sys_gettid(), parent_tidptr);
84 ts = (TaskState *)cpu->opaque;
85 if (flags & CLONE_SETTLS)
86 cpu_set_tls (env, newtls);
87@@ -10588,7 +10589,7 @@ static abi_long do_syscall1(void *cpu_en
88 return TARGET_PAGE_SIZE;
89 #endif
90 case TARGET_NR_gettid:
91- return get_errno(gettid());
92+ return get_errno(sys_gettid());
93 #ifdef TARGET_NR_readahead
94 case TARGET_NR_readahead:
95 #if TARGET_ABI_BITS == 32