From nobody Fri May 17 11:29:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553015320061296.5579061254506; Tue, 19 Mar 2019 10:08:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:60467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6IE9-0007ub-0T for importer@patchew.org; Tue, 19 Mar 2019 13:08:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6ICl-0007Ju-IO for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:07:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6ICj-0001ep-0x for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:07:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6ICi-0001e0-IG for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:07:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C468F74CF; Tue, 19 Mar 2019 17:07:07 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 325F75D77B; Tue, 19 Mar 2019 17:07:04 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 17:07:02 +0000 Message-Id: <20190319170702.24122-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 19 Mar 2019 17:07:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for 4.0] linux-user: conditionally define gettid as it is present in new glibc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid function as part of unistd.h when __USE_GNU is defined. This clashes with linux-user code which unconditionally defines this function itself. /home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static dec= laration of =E2=80=98gettid=E2=80=99 follows non-static declaration 253 | _syscall0(int, gettid) | ^~~~~~ /home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definiti= on of macro =E2=80=98_syscall0=E2=80=99 184 | static type name (void) \ | ^~~~ In file included from /usr/include/unistd.h:1170, from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107, from /home/berrange/src/virt/qemu/linux-user/syscall.c:20: /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of =E2=80= =98gettid=E2=80=99 was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~ CC aarch64-linux-user/linux-user/signal.o make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall= .o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2 We need to probe for its existance and conditionally define our own wrapper. Signed-off-by: Daniel P. Berrang=C3=A9 --- configure | 19 +++++++++++++++++++ linux-user/syscall.c | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7071f52584..fe980328b2 100755 --- a/configure +++ b/configure @@ -4270,6 +4270,22 @@ if compile_prog "" "" ; then splice=3Dyes fi =20 +# Check if glibc exposes gettid yet +gettid=3Dno +cat > $TMPC << EOF +#include + +int main(void) +{ + gettid(); + return 0; +} +EOF +if compile_prog "" "" ; then + gettid=3Dyes +fi + + ########################################## # libnuma probe =20 @@ -6651,6 +6667,9 @@ fi if test "$splice" =3D "yes" ; then echo "CONFIG_SPLICE=3Dy" >> $config_host_mak fi +if test "$gettid" =3D "yes" ; then + echo "CONFIG_GETTID=3Dy" >> $config_host_mak +fi if test "$eventfd" =3D "yes" ; then echo "CONFIG_EVENTFD=3Dy" >> $config_host_mak fi diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 208fd1813d..70eb0d64f4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -249,14 +249,16 @@ static type name (type1 arg1,type2 arg2,type3 arg3,ty= pe4 arg4,type5 arg5, \ #define TARGET_NR__llseek TARGET_NR_llseek #endif =20 -#ifdef __NR_gettid +#ifndef CONFIG_GETTID +# ifdef __NR_gettid _syscall0(int, gettid) -#else +# else /* This is a replacement for the host gettid() and must return a host errno. */ static int gettid(void) { return -ENOSYS; } +# endif #endif =20 /* For the 64-bit guest on 32-bit host case we must emulate --=20 2.20.1