Skip to contentSkip to conversation

package/qemu: fix qemu 3.1.1.1 to build with >glib-2.29

PATCH New Paulo Matos 4 participants 5 messages Oct 25, 2019 – Oct 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qemu: fix qemu 3.1.1.1 to build with >glib-2.29

These patches are already in qemu upstream under:
- 184943d827ce09375284e6fbb9fd5eeb9e369529
- 71ba74f67eaca21b0cc9d96f534ad3b9a7161400

They rename gettid() to sys_gettid() to avoid clash with glibc

---
 ...ser-assume-__NR_gettid-always-exists.patch | 44 +++++++++
 ...e-gettid-to-sys_gettid-to-avoid-clas.patch | 91 +++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 package/qemu/3.1.1.1/0004-linux-user-assume-__NR_gettid-always-exists.patch
 create mode 100644 package/qemu/3.1.1.1/0005-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch
package/qemu/3.1.1.1/0004-linux-user-assume-__NR_gettid-always-exists.patch new file +44 -0
new file mode 100644
index 0000000000..3475ad5b13
@@ -0,0 +1,44 @@
+From 184943d827ce09375284e6fbb9fd5eeb9e369529 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Wed, 20 Mar 2019 16:18:41 +0000
+Subject: [PATCH] linux-user: assume __NR_gettid always exists
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The gettid syscall was introduced in Linux 2.4.11. This is old enough
+that we can assume it always exists and thus not bother with the
+conditional backcompat logic.
+
+Signed-off-by: Daniel P. Berrang? <[email protected]>
+Reviewed-by: Richard Henderson <[email protected]>
+Reviewed-by: Laurent Vivier <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+---
+ linux-user/syscall.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 208fd1813d..11729f382c 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -249,15 +249,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,	\
+ #define TARGET_NR__llseek TARGET_NR_llseek
+ #endif
+ 
+-#ifdef __NR_gettid
+ _syscall0(int, gettid)
+-#else
+-/* This is a replacement for the host gettid() and must return a host
+-   errno. */
+-static int gettid(void) {
+-    return -ENOSYS;
+-}
+-#endif
+ 
+ /* For the 64-bit guest on 32-bit host case we must emulate
+  * getdents using getdents64, because otherwise the host
+-- 
+2.23.0
+
package/qemu/3.1.1.1/0005-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch new file +91 -0

91 lines not on this page · raw message

Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/qemu: fix qemu 3.1.1.1 to build with >glib-2.29

s/glib-2.29/glibc-2.29/ in the subject.

Signature · 1 line
Carlos Santos <[email protected]>
#3 lore raw

PATCH 1/1 package/qemu: fix qemu 3.1.1.1 to build with >glib-2.29

In reply to Paulo Matos
Quoted 6 lines · On Fri, 25 Oct 2019 12:42:57 +0200 Paulo Matos <[email protected]> wrote:

These patches are already in qemu upstream under:
- 184943d827ce09375284e6fbb9fd5eeb9e369529
- 71ba74f67eaca21b0cc9d96f534ad3b9a7161400

They rename gettid() to sys_gettid() to avoid clash with glibc

Quoted 7 lines
---
 ...ser-assume-__NR_gettid-always-exists.patch | 44 +++++++++
 ...e-gettid-to-sys_gettid-to-avoid-clas.patch | 91 +++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 package/qemu/3.1.1.1/0004-linux-user-assume-__NR_gettid-always-exists.patch
 create mode 100644 package/qemu/3.1.1.1/0005-linux-user-rename-gettid-to-sys_gettid-to-avoid-clas.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 package/qemu: fix qemu 3.1.1.1 to build with >glib-2.29

In reply to Paulo Matos
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paulo" == Paulo Matos <[email protected]> writes:

These patches are already in qemu upstream under:
- 184943d827ce09375284e6fbb9fd5eeb9e369529
- 71ba74f67eaca21b0cc9d96f534ad3b9a7161400

They rename gettid() to sys_gettid() to avoid clash with glibc

Committed to 2019.02.x and 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard