From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639644857; cv=none; d=zohomail.com; s=zohoarc; b=QNeReZzlso9TKC20RoHx5ybRS1H8a6ARQfJzsRMR1Wieu8KDnqdx4wRBQtMdkfRLQ/eTDYw6lnAGc/ddVt7e44NUJrFOU4LofhbP3el5nG7DBjvdv0PQrVyWH22MQZxABPwuBp930qd9fMF6yearfLwGp7UaISXv3LMpc5shmVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639644857; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0DXohqXswgTBqzM99CvS1dZO31xqFN4j0wc4obLrF/I=; b=BkVvKunB2Y1Nk6eVMFip1r6ZSURSgNft8V4mawdb/EV16IRGeQLp+8P0Zwm0Y7TZBdM37CTQUDpWudlUQCNRDo6BN8C6HVT+wKo9NAOsZWA8bQ/+L+xtAEaA/sDLdHIPqiGFsrhgKEStX1OOknKtJLfg03qHHvIhKC8fRXxRdt8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639644857109689.6963865071756; Thu, 16 Dec 2021 00:54:17 -0800 (PST) Received: from localhost ([::1]:58364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmWm-0004TV-2o for importer@patchew.org; Thu, 16 Dec 2021 03:54:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUN-0000Za-3T for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUK-00048f-PI for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:46 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-50zSkA6HP0KX1ykUbmpjKg-1; Thu, 16 Dec 2021 03:51:42 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCE62100D841 for ; Thu, 16 Dec 2021 08:51:41 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F65C2C1AB for ; Thu, 16 Dec 2021 08:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0DXohqXswgTBqzM99CvS1dZO31xqFN4j0wc4obLrF/I=; b=H3Zk541bMaSa+ZnkglDMPmd60zIU+KCBbQtK8WKntEBN4588heteAPGOUtnkEdybjCwtvJ ExcCjIWbT48Cvdga8+4B95agYrq4yL8nf1URAzXDltF4cNw5/WYljntgvXlTSUiSJ+KqWf TEu6O9O4l1RSfOC4kz9gRIGPyOBNnCU= X-MC-Unique: 50zSkA6HP0KX1ykUbmpjKg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/10] configure: simplify creation of plugin symbol list Date: Thu, 16 Dec 2021 09:51:30 +0100 Message-Id: <20211216085139.99682-2-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639644858623100001 Content-Type: text/plain; charset="utf-8" --dynamic-list is present on all supported ELF (not Windows or Darwin) platforms, since it dates back to 2006; -exported_symbols_list is likewise present on all supported versions of macOS. Do not bother doing a functional test in configure. Since stuff is being moved to meson, move the creation of the Darwin-formatted symbols list there, reducing the transform to a single sed command. This also requires using -Xlinker instead of -Wl, in order to support weird paths that include a comma. Signed-off-by: Paolo Bonzini --- configure | 16 ---------------- plugins/meson.build | 13 +++++++++---- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/configure b/configure index d3aac031a5..ba7ab435a6 100755 --- a/configure +++ b/configure @@ -3689,22 +3689,6 @@ fi =20 if test "$plugins" =3D "yes" ; then echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak - # Copy the export object list to the build dir - if test "$ld_dynamic_list" =3D "yes" ; then - echo "CONFIG_HAS_LD_DYNAMIC_LIST=3Dyes" >> $config_host_mak - ld_symbols=3Dqemu-plugins-ld.symbols - cp "$source_path/plugins/qemu-plugins.symbols" $ld_symbols - elif test "$ld_exported_symbols_list" =3D "yes" ; then - echo "CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST=3Dyes" >> $config_host_mak - ld64_symbols=3Dqemu-plugins-ld64.symbols - echo "# Automatically generated by configure - do not modify" > $ld64_sym= bols - grep 'qemu_' "$source_path/plugins/qemu-plugins.symbols" | sed 's/;//g' |= \ - sed -E 's/^[[:space:]]*(.*)/_\1/' >> $ld64_symbols - else - error_exit \ - "If \$plugins=3Dyes, either \$ld_dynamic_list or " \ - "\$ld_exported_symbols_list should have been set to 'yes'." - fi fi =20 if test -n "$gdb_bin"; then diff --git a/plugins/meson.build b/plugins/meson.build index b3de57853b..eec10283c5 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,10 +1,15 @@ plugin_ldflags =3D [] # Modules need more symbols than just those in plugins/qemu-plugins.symbols if not enable_modules - if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags =3D ['-Wl,--dynamic-list=3Dqemu-plugins-ld.symbols'] - elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host - plugin_ldflags =3D ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symb= ols'] + if targetos =3D=3D 'darwin' + qemu_plugins_symbols_list =3D configure_file( + input: files('qemu-plugins.symbols'), + output: 'qemu-plugins-ld64.symbols', + capture: true, + command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@IN= PUT@']) + plugin_ldflags =3D ['-Xlinker', '-exported_symbols_list', '-Xlinker', = qemu_plugins_symbols_list] + else + plugin_ldflags =3D ['-Xlinker', '--dynamic-list=3D' + (meson.project_s= ource_root() / 'plugins/qemu-plugins.symbols')] endif endif =20 --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639644822; cv=none; d=zohomail.com; s=zohoarc; b=mjWiTIttRAg7+4gdHAcGN5OWZe9DJETlpFk7aqkU8WypKeOXoyiSNrJfxlU2mmQTO9spaiu2SXytGS/xSG96wYLZMEJMFT9NCsdxlV/RRK6hOfixfyCfEmunyUv7GnjM2+QwRIQHBcEs0E4LvS50Dsv6xLvAPbnjbeW4qI3/0HU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639644822; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HYlD6TOFjvCShzjuklplaU9V9dCleRW8qoPWy0G46K4=; b=aIKlRR2mo7IMWtbO9FHFEx8FWjGbFycRsBR3oxvXA4IjgtWB4BjkqVDEu/m4Tg0LhmyjeceWOdNFEdE6sfo44c74Zq5+2O6zVjwfGSdg9o1J2Wium2uAdiyG65Q/FtR2pPo2F3nV8MZk3f5BM1X9i2EtnwdEN4iPbUvGblXZ1RQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639644822259494.7170860528696; Thu, 16 Dec 2021 00:53:42 -0800 (PST) Received: from localhost ([::1]:56614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmWD-0003JH-7k for importer@patchew.org; Thu, 16 Dec 2021 03:53:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUN-0000Zc-R6 for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUL-000494-Rm for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:47 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-424-FFlEGU90PA2jUOF_vl-vHA-1; Thu, 16 Dec 2021 03:51:43 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B804B19253C5 for ; Thu, 16 Dec 2021 08:51:42 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A2592C1AB for ; Thu, 16 Dec 2021 08:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYlD6TOFjvCShzjuklplaU9V9dCleRW8qoPWy0G46K4=; b=bgVRthDzoq3VRMSzKsBe+A0KhTN3uAioQidsnfnes30anh/yBYMT09k5jKh4fsONcTwzew SbLNz8uISGr8/GLP93lx+/kpr3TsnkwZctXYmw67XuKnTGq2jzg1Acft1p907Sq1Zoo7wN xHAhctYymqIsHIv5wdrLoMiV8vlNA+4= X-MC-Unique: FFlEGU90PA2jUOF_vl-vHA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/10] configure: make $targetos lowercase, use windows instead of MINGW32 Date: Thu, 16 Dec 2021 09:51:31 +0100 Message-Id: <20211216085139.99682-3-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639644824016100001 Content-Type: text/plain; charset="utf-8" targetos is already mostly the same as Meson host_machine.system(), just in CamelCase. Adjust Windows, which is different, and switch to lowercase to match Meson. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 58 ++++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/configure b/configure index ba7ab435a6..63438c1900 100755 --- a/configure +++ b/configure @@ -502,30 +502,30 @@ EOF } =20 if check_define __linux__ ; then - targetos=3D"Linux" + targetos=3Dlinux elif check_define _WIN32 ; then - targetos=3D'MINGW32' + targetos=3Dwindows elif check_define __OpenBSD__ ; then - targetos=3D'OpenBSD' + targetos=3Dopenbsd elif check_define __sun__ ; then - targetos=3D'SunOS' + targetos=3Dsunos elif check_define __HAIKU__ ; then - targetos=3D'Haiku' + targetos=3Dhaiku elif check_define __FreeBSD__ ; then - targetos=3D'FreeBSD' + targetos=3Dfreebsd elif check_define __FreeBSD_kernel__ && check_define __GLIBC__; then - targetos=3D'GNU/kFreeBSD' + targetos=3Dgnu/kfreebsd elif check_define __DragonFly__ ; then - targetos=3D'DragonFly' + targetos=3Ddragonfly elif check_define __NetBSD__; then - targetos=3D'NetBSD' + targetos=3Dnetbsd elif check_define __APPLE__; then - targetos=3D'Darwin' + targetos=3Ddarwin else # This is a fatal error, but don't report it yet, because we # might be going to just print the --help text, or it might # be the result of a missing compiler. - targetos=3D'bogus' + targetos=3Dbogus fi =20 # Some host OSes need non-standard checks for which CPU to use. @@ -533,7 +533,7 @@ fi # cross-compiling to one of these OSes then you'll need to specify # the correct CPU with the --cpu option. case $targetos in -SunOS) +sunos) # $(uname -m) returns i86pc even on an x86_64 box, so default based on i= sainfo if test -z "$cpu" && test "$(isainfo -k)" =3D "amd64"; then cpu=3D"x86_64" @@ -624,40 +624,40 @@ fi # OS specific =20 case $targetos in -MINGW32*) +windows) mingw32=3D"yes" plugins=3D"no" pie=3D"no" ;; -GNU/kFreeBSD) +gnu/kfreebsd) bsd=3D"yes" ;; -FreeBSD) +freebsd) bsd=3D"yes" bsd_user=3D"yes" make=3D"${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; -DragonFly) +dragonfly) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -NetBSD) +netbsd) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -OpenBSD) +openbsd) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -Darwin) +darwin) bsd=3D"yes" darwin=3D"yes" # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" ;; -SunOS) +sunos) solaris=3D"yes" make=3D"${MAKE-gmake}" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" @@ -666,11 +666,11 @@ SunOS) # needed for TIOCWIN* defines in termios.h QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" ;; -Haiku) +haiku) pie=3D"no" QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" ;; -Linux) +linux) linux=3D"yes" linux_user=3D"yes" vhost_user=3D${default_feature:-yes} @@ -3355,8 +3355,8 @@ QEMU_GA_MSI_MINGW_DLL_PATH=3D"$($pkg_config --variabl= e=3Dprefix glib-2.0)/bin" # Mac OS X ships with a broken assembler roms=3D if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86_64"; } && \ - test "$targetos" !=3D "Darwin" && test "$targetos" !=3D "SunOS" &&= \ - test "$targetos" !=3D "Haiku" && test "$softmmu" =3D yes ; then + test "$targetos" !=3D "darwin" && test "$targetos" !=3D "sunos" &&= \ + test "$targetos" !=3D "haiku" && test "$softmmu" =3D yes ; then # Different host OS linkers have different ideas about the name of the= ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the = _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386p= e. @@ -3914,15 +3914,7 @@ if test "$skip_meson" =3D no; then if test "$cross_compile" =3D "yes"; then cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross - if test "$mingw32" =3D "yes" ; then - echo "system =3D 'windows'" >> $cross - fi - if test "$linux" =3D "yes" ; then - echo "system =3D 'linux'" >> $cross - fi - if test "$darwin" =3D "yes" ; then - echo "system =3D 'darwin'" >> $cross - fi + echo "system =3D '$targetos'" >> $cross case "$ARCH" in i386) echo "cpu_family =3D 'x86'" >> $cross --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645012; cv=none; d=zohomail.com; s=zohoarc; b=USnN57NOvTKsd/NKPPqDSTn9f1cf1vgD5On4EQecG1u25EAr4TVJ7ItoX/vJnMamDW0riigD/NrgIX2Wn9B2UvnZ6Qwqanuv+aMf2Z9mkRB6E1C8rykYIf9Nfh636YYpepDaRch0wWGe7y+ZOVHbGnhEP5JnTc7oUA9CCG5aGaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645012; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MbZGrWDN/p1LbliR2t3XnuEn9XWqFhWjhYi4mSJsbLU=; b=CxxXooVzFP3S3sEzm5JAjgtn3DEMs9Y2oxgHXhJbULikI8hPMpdpqzH2Cbr3jJxRRSDGx3WlA94MHhjx9RZ+VrwCpxyhTYoGto2GXcr/PsIDytAPNXscjkFNya5lZ4ol/RS4Ia/M7KZF5375tHhmvTqG3uCvyq+r9PqkfKX5XKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639645012094418.5722609096049; Thu, 16 Dec 2021 00:56:52 -0800 (PST) Received: from localhost ([::1]:36774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmZH-0000Vb-3I for importer@patchew.org; Thu, 16 Dec 2021 03:56:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUO-0000Zf-PT for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUM-00049Q-HR for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-121-tU7HJXzoNiC3bWljjmNq4A-1; Thu, 16 Dec 2021 03:51:44 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9564E5F9EB for ; Thu, 16 Dec 2021 08:51:43 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13C8B2C1AB for ; Thu, 16 Dec 2021 08:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MbZGrWDN/p1LbliR2t3XnuEn9XWqFhWjhYi4mSJsbLU=; b=JANobeeNSmSn0YtdcZiD2CU8btskNDW75TvG+wu9yKpoWYA5MJhMZGEILmHn83cOEz/ttv iFv7yM/KDpalMkad3TECoW4Oyn4jqljoA2Md7fjp643aHWiDGHqWpTt5zqsEsb1G79kq4z xTIdUhvlMw2h3n2A/fRnuMMfLDB3+1k= X-MC-Unique: tU7HJXzoNiC3bWljjmNq4A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/10] configure: move target detection before CPU detection Date: Thu, 16 Dec 2021 09:51:32 +0100 Message-Id: <20211216085139.99682-4-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645012573100001 Content-Type: text/plain; charset="utf-8" This makes more sense, since target detection can affect CPU detection on Solaris. Signed-off-by: Paolo Bonzini --- configure | 115 ++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 60 deletions(-) diff --git a/configure b/configure index 63438c1900..157691d99e 100755 --- a/configure +++ b/configure @@ -528,16 +528,67 @@ else targetos=3Dbogus fi =20 -# Some host OSes need non-standard checks for which CPU to use. -# Note that these checks are broken for cross-compilation: if you're -# cross-compiling to one of these OSes then you'll need to specify -# the correct CPU with the --cpu option. +# OS specific + case $targetos in +windows) + mingw32=3D"yes" + plugins=3D"no" + pie=3D"no" +;; +gnu/kfreebsd) + bsd=3D"yes" +;; +freebsd) + bsd=3D"yes" + bsd_user=3D"yes" + make=3D"${MAKE-gmake}" + # needed for kinfo_getvmmap(3) in libutil.h +;; +dragonfly) + bsd=3D"yes" + make=3D"${MAKE-gmake}" +;; +netbsd) + bsd=3D"yes" + make=3D"${MAKE-gmake}" +;; +openbsd) + bsd=3D"yes" + make=3D"${MAKE-gmake}" +;; +darwin) + bsd=3D"yes" + darwin=3D"yes" + # Disable attempts to use ObjectiveC features in os/object.h since they + # won't work when we're compiling with gcc as a C compiler. + QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" +;; sunos) + solaris=3D"yes" + make=3D"${MAKE-gmake}" + smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" +# needed for CMSG_ macros in sys/socket.h + QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" +# needed for TIOCWIN* defines in termios.h + QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" # $(uname -m) returns i86pc even on an x86_64 box, so default based on i= sainfo + # Note that this check is broken for cross-compilation: if you're + # cross-compiling to one of these OSes then you'll need to specify + # the correct CPU with the --cpu option. if test -z "$cpu" && test "$(isainfo -k)" =3D "amd64"; then cpu=3D"x86_64" fi +;; +haiku) + pie=3D"no" + QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" +;; +linux) + linux=3D"yes" + linux_user=3D"yes" + vhost_user=3D${default_feature:-yes} +;; esac =20 if test ! -z "$cpu" ; then @@ -621,62 +672,6 @@ if test -z "$ARCH"; then ARCH=3D"$cpu" fi =20 -# OS specific - -case $targetos in -windows) - mingw32=3D"yes" - plugins=3D"no" - pie=3D"no" -;; -gnu/kfreebsd) - bsd=3D"yes" -;; -freebsd) - bsd=3D"yes" - bsd_user=3D"yes" - make=3D"${MAKE-gmake}" - # needed for kinfo_getvmmap(3) in libutil.h -;; -dragonfly) - bsd=3D"yes" - make=3D"${MAKE-gmake}" -;; -netbsd) - bsd=3D"yes" - make=3D"${MAKE-gmake}" -;; -openbsd) - bsd=3D"yes" - make=3D"${MAKE-gmake}" -;; -darwin) - bsd=3D"yes" - darwin=3D"yes" - # Disable attempts to use ObjectiveC features in os/object.h since they - # won't work when we're compiling with gcc as a C compiler. - QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" -;; -sunos) - solaris=3D"yes" - make=3D"${MAKE-gmake}" - smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" -# needed for CMSG_ macros in sys/socket.h - QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" -# needed for TIOCWIN* defines in termios.h - QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" -;; -haiku) - pie=3D"no" - QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" -;; -linux) - linux=3D"yes" - linux_user=3D"yes" - vhost_user=3D${default_feature:-yes} -;; -esac - : ${make=3D${MAKE-make}} =20 # We prefer python 3.x. A bare 'python' is traditionally --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645157; cv=none; d=zohomail.com; s=zohoarc; b=JZMeSL93b1/Zmn8uQV+Nz7KVEF9jzvSsI7E57j2HB5M56+rdV81N2p/7gVBDvRynTQ4Je+ELXBHTgoQFy39uOhPdqtCgbmQt4AlKFJkdhpgEb/kvaVTrDo6FogkH/L8YjIVSK3jJhgz1kwjsr/d4D6Lii9G6RSYbrDrwMIcbE/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645157; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ko7yDuy6KoAvLgHZ93uKWo0PSnLIVZJ7746abDOnL/I=; b=jPErc1dVVzZoX1VRa4hA/7C7nl51/wvECp6DvRpiNFiwZPEuULEymLqpbeZoPgjPP7pI3LklPbXWpG7c7DbyoFE0rNArxucYn69AxyW6CHfR+upA0zW2Vz5YMNbjsiKqWnDHRaNS7+hfwoogFt7wXAppi7O4DdNmoKfy6/+reqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163964515715660.510685680619645; Thu, 16 Dec 2021 00:59:17 -0800 (PST) Received: from localhost ([::1]:43276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmbc-0004zz-52 for importer@patchew.org; Thu, 16 Dec 2021 03:59:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUP-0000aO-DH for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUN-0004A4-29 for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-412-_h8d9WDSP_mHCX9A_DizwQ-1; Thu, 16 Dec 2021 03:51:45 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70EC1801AAB for ; Thu, 16 Dec 2021 08:51:44 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2E3B2C1AB for ; Thu, 16 Dec 2021 08:51:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ko7yDuy6KoAvLgHZ93uKWo0PSnLIVZJ7746abDOnL/I=; b=CtzZWevvJ07jVdJS8SKRduXzN8EdqYX2ZUlQkS77mBiFbqi9fQRIxkOPVSR/Z0oLEu7BET LWNmxH4zhKQhAT73sIKnxmtryaoFlIwRf1+NTqRBUcGiemzu4L58q6+7p9mIl+x73ow/BO eo84kOMJ97paUHXRYRewzEI5O42/fIc= X-MC-Unique: _h8d9WDSP_mHCX9A_DizwQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/10] configure: do not set bsd_user/linux_user early Date: Thu, 16 Dec 2021 09:51:33 +0100 Message-Id: <20211216085139.99682-5-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645159292100001 Content-Type: text/plain; charset="utf-8" Similar to other optional features, leave the variables empty and compute the actual value later. Use the existence of include or source directories to detect whether an OS or CPU supports respectively bsd-user and linux-use= r. For now, BSD user-mode emulation is buildable even on TCI-only architectures. This probably will change once safe signals are brought over from linux-user. Signed-off-by: Paolo Bonzini --- configure | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 157691d99e..a774086891 100755 --- a/configure +++ b/configure @@ -322,8 +322,8 @@ linux=3D"no" solaris=3D"no" profiler=3D"no" softmmu=3D"yes" -linux_user=3D"no" -bsd_user=3D"no" +linux_user=3D"" +bsd_user=3D"" pkgversion=3D"" pie=3D"" qom_cast_debug=3D"yes" @@ -541,7 +541,6 @@ gnu/kfreebsd) ;; freebsd) bsd=3D"yes" - bsd_user=3D"yes" make=3D"${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; @@ -586,7 +585,6 @@ haiku) ;; linux) linux=3D"yes" - linux_user=3D"yes" vhost_user=3D${default_feature:-yes} ;; esac @@ -1280,18 +1278,25 @@ if eval test -z "\${cross_cc_$cpu}"; then cross_cc_vars=3D"$cross_cc_vars cross_cc_${cpu}" fi =20 -# For user-mode emulation the host arch has to be one we explicitly -# support, even if we're using TCI. -if [ "$ARCH" =3D "unknown" ]; then - bsd_user=3D"no" - linux_user=3D"no" -fi - default_target_list=3D"" deprecated_targets_list=3Dppc64abi32-linux-user deprecated_features=3D"" mak_wilds=3D"" =20 +if [ "$linux_user" !=3D no ]; then + if [ "$targetos" =3D linux ] && [ -d $source_path/linux-user/host/$cpu= ]; then + linux_user=3Dyes + elif [ "$linux_user" =3D yes ]; then + error_exit "linux-user not supported on this architecture" + fi +fi +if [ "$bsd_user" !=3D no ]; then + if [ -d $source_path/bsd-user/$targetos ]; then + bsd_user=3Dyes + elif [ "$bsd_user" =3D yes ]; then + error_exit "bsd-user not supported on this host OS" + fi +fi if [ "$softmmu" =3D "yes" ]; then mak_wilds=3D"${mak_wilds} $source_path/configs/targets/*-softmmu.mak" fi --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645192; cv=none; d=zohomail.com; s=zohoarc; b=K8Q8tnH9geuMaaTS2Wc+9C5PEox75+8nOAnq5PA3EDDiVkr8PTN6h59ydB6g/Zk76RmOvPqcOiaIj8z8m84FzOCp3HU/hsANMgiQCIbiRPrzQIDvGGIbXu8mxk1pXo5q5OQKBdFKMl/ckqusvAtzvzejY9hqHZGOHcFVGEtVUFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645192; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=twiUCk0v22AusBPtAVZ2Kfzu31gmOTTHEElXCa/XEew=; b=R4yF2+M0ZJ+G+GX7FNxztcIiq7ME+zB0b9LbKbNBMF7H6UUJ933ng+oQU88yX/+lnTh+5VwhnB3wTAyacv93xNtXQMF3eBTYhUuQG5dxOJnzbeWL8v0KsNTZ1zbPDxwObBt0WMTeC+YhRp6e16NtL8szZePOw9LLdMsJ4m9xv84= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639645192115868.3127627896803; Thu, 16 Dec 2021 00:59:52 -0800 (PST) Received: from localhost ([::1]:44276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmcB-0005gt-1n for importer@patchew.org; Thu, 16 Dec 2021 03:59:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUX-0000lP-01 for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUT-0004CW-4k for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:56 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-27-1R22rfwSMTCP_eNgO47-8w-1; Thu, 16 Dec 2021 03:51:46 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4EA6F100D682 for ; Thu, 16 Dec 2021 08:51:45 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFF9C2C1AB for ; Thu, 16 Dec 2021 08:51:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=twiUCk0v22AusBPtAVZ2Kfzu31gmOTTHEElXCa/XEew=; b=DiCC5oENzaGgPPKrXDH/K9R0IA1JcV0u8ut7HBhQLcsBeaQHlyqkYZjQjWUavvpxYYfVHc rBA12gyySTV6nK9vHUHHJyi1cS+ZeT/ztGcxoFkDVteuFc9z6UAGjFQmMmqDwQw+dnFuxZ P0qRdLJJ0CjmrG3knbYYri/b/IcKfmQ= X-MC-Unique: 1R22rfwSMTCP_eNgO47-8w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/10] configure: unify two case statements on $cpu Date: Thu, 16 Dec 2021 09:51:34 +0100 Message-Id: <20211216085139.99682-6-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645192491100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 67 ++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/configure b/configure index a774086891..65df8d02d9 100755 --- a/configure +++ b/configure @@ -635,32 +635,47 @@ else fi =20 ARCH=3D -# Normalise host CPU name and set ARCH. +# Normalise host CPU name, set ARCH and multilib cflags # Note that this case should only have supported host CPUs, not guests. case "$cpu" in - ppc|ppc64|s390x|sparc64|x32|riscv) - ;; - ppc64le) - ARCH=3D"ppc64" - ;; + aarch64|riscv) ;; + armv*b|armv*l|arm) + cpu=3D"arm" ;; + i386|i486|i586|i686|i86pc|BePC) cpu=3D"i386" - ;; + CPU_CFLAGS=3D"-m32" ;; + x32) + CPU_CFLAGS=3D"-mx32" ;; x86_64|amd64) cpu=3D"x86_64" - ;; - armv*b|armv*l|arm) - cpu=3D"arm" - ;; - aarch64) - cpu=3D"aarch64" - ;; + # ??? Only extremely old AMD cpus do not have cmpxchg16b. + # If we truly care, we should simply detect this case at + # runtime and generate the fallback to serial emulation. + CPU_CFLAGS=3D"-m64 -mcx16" ;; + mips*) - cpu=3D"mips" - ;; + cpu=3D"mips" ;; + + ppc) + CPU_CFLAGS=3D"-m32" ;; + ppc64) + CPU_CFLAGS=3D"-m64" ;; + ppc64le) + ARCH=3D"ppc64" ;; + + s390) + CPU_CFLAGS=3D"-m31" + ARCH=3Dunknown ;; + s390x) + CPU_CFLAGS=3D"-m64" ;; + sparc|sun4[cdmuv]) cpu=3D"sparc" - ;; + CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" ;; + sparc64) + CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; + *) # This will result in either an error or falling back to TCI later ARCH=3Dunknown @@ -1255,24 +1270,6 @@ local_statedir=3D"${local_statedir:-$prefix/var}" firmwarepath=3D"${firmwarepath:-$datadir/qemu-firmware}" localedir=3D"${localedir:-$datadir/locale}" =20 -case "$cpu" in - ppc) CPU_CFLAGS=3D"-m32" ;; - ppc64) CPU_CFLAGS=3D"-m64" ;; - sparc) CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" ;; - sparc64) CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; - s390) CPU_CFLAGS=3D"-m31" ;; - s390x) CPU_CFLAGS=3D"-m64" ;; - i386) CPU_CFLAGS=3D"-m32" ;; - x32) CPU_CFLAGS=3D"-mx32" ;; - - # ??? Only extremely old AMD cpus do not have cmpxchg16b. - # If we truly care, we should simply detect this case at - # runtime and generate the fallback to serial emulation. - x86_64) CPU_CFLAGS=3D"-m64 -mcx16" ;; - - # No special flags required for other host CPUs -esac - if eval test -z "\${cross_cc_$cpu}"; then eval "cross_cc_${cpu}=3D\$cc" cross_cc_vars=3D"$cross_cc_vars cross_cc_${cpu}" --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645395; cv=none; d=zohomail.com; s=zohoarc; b=QYfCH6VOK38fecyh4zfykuj/6OJ4IZvidWIVkgzxSymlUdCVrO4Y5QdGFMnsDP7fMGJAyfwo9K1+IN4VV+13eBK545qIzngOMzVLFn+xoi+UFo/7VB2FDo9E9Yi0xTD+pyvsfyt9xSly7UUj8vTdw+YNameW4cvYMW8jl2aRnYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645395; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=my0xZH1OyhR9sJGDqQWYbETpzZlQgeLL8kevRMBdtgo=; b=YGEVneAslv9kHsUqogPEZWF0n2acaPst0vOHvk+xbwH6CROExpGW8NCa7lSV0xNWxuAU8fxPzEn4hIvXBfT/Y5+IbeNh/2UYB3LYN6kIDrOu5X8vGuTiWi68f7JlUpIz9EZ28rgm5XKOtX8bahQ6/eRMsyf2AwmiH/OJIJtFxSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639645395263624.934198219745; Thu, 16 Dec 2021 01:03:15 -0800 (PST) Received: from localhost ([::1]:49200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmfS-0000mH-8L for importer@patchew.org; Thu, 16 Dec 2021 04:03:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUQ-0000aU-Fy for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUO-0004Bb-Mm for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:50 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-472-pvIRLCoxOWifZtkY6HdG1w-1; Thu, 16 Dec 2021 03:51:46 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2516719253C7 for ; Thu, 16 Dec 2021 08:51:46 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9862E2C1AB for ; Thu, 16 Dec 2021 08:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=my0xZH1OyhR9sJGDqQWYbETpzZlQgeLL8kevRMBdtgo=; b=PCYHUPlvXiYxKbJlu8APWvkYCX/souhbS76YysXV/aHraI+LGyQiG+tG/jOzvieEumprEl S96F/INn2GX5L2L/VsetaVpCdO9HrhtQT0RAHUkvwcfBp5qKPwfkHrVd6aK4lFgn0fJqdW c0mftAVuonlJsNBToxLLnYBym4E1+qQ= X-MC-Unique: pvIRLCoxOWifZtkY6HdG1w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/10] configure: unify ppc64 and ppc64le Date: Thu, 16 Dec 2021 09:51:35 +0100 Message-Id: <20211216085139.99682-7-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645396149100001 Content-Type: text/plain; charset="utf-8" The only difference between the two, as far as either configure or Meson are concerned, is the default endianness of the compiler. For tests/tcg, specify the endianness explicitly on the command line; for configure, do the same so that it is possible to have --cpu=3Dppc64le on a bigendian system or vice versa. Apart from this, cpu=3Dppc64le can be normalized to ppc64 also in configure and not just in the meson cross file. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- configure | 10 ++++------ tests/tcg/configure.sh | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 65df8d02d9..741ff99f4f 100755 --- a/configure +++ b/configure @@ -660,9 +660,10 @@ case "$cpu" in ppc) CPU_CFLAGS=3D"-m32" ;; ppc64) - CPU_CFLAGS=3D"-m64" ;; + CPU_CFLAGS=3D"-m64 -mbig" ;; ppc64le) - ARCH=3D"ppc64" ;; + cpu=3D"ppc64" + CPU_CFLAGS=3D"-m64 -mlittle" ;; =20 s390) CPU_CFLAGS=3D"-m31" @@ -3737,7 +3738,7 @@ if test "$linux" =3D "yes" ; then i386|x86_64|x32) linux_arch=3Dx86 ;; - ppc|ppc64|ppc64le) + ppc|ppc64) linux_arch=3Dpowerpc ;; s390x) @@ -3919,9 +3920,6 @@ if test "$skip_meson" =3D no; then x86_64|x32) echo "cpu_family =3D 'x86_64'" >> $cross ;; - ppc64le) - echo "cpu_family =3D 'ppc64'" >> $cross - ;; *) echo "cpu_family =3D '$ARCH'" >> $cross ;; diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 9b76f58258..9ef913df5b 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -64,7 +64,9 @@ fi : ${cross_cc_ppc=3D"powerpc-linux-gnu-gcc"} : ${cross_cc_cflags_ppc=3D"-m32"} : ${cross_cc_ppc64=3D"powerpc64-linux-gnu-gcc"} -: ${cross_cc_ppc64le=3D"powerpc64le-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc64=3D"-m64 -mbig"} +: ${cross_cc_ppc64le=3D"$cross_cc_ppc64"} +: ${cross_cc_cflags_ppc64le=3D"-m64 -mlittle"} : ${cross_cc_riscv64=3D"riscv64-linux-gnu-gcc"} : ${cross_cc_s390x=3D"s390x-linux-gnu-gcc"} : ${cross_cc_sh4=3D"sh4-linux-gnu-gcc"} --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645108; cv=none; d=zohomail.com; s=zohoarc; b=O/YSXCosGzSWXl0W/4S+dX5HpNW1oWRj0sW4RKaxI0oZIknx/gNGXWOz50EWRGBL81qdm40pl0jGTRQ2TQTXEo0VeQXGtT3OMFv3ye/RUoZ0X2o+BCen6TeVdwsexWWNg72W17nVf0coWM/KE6VuS/apHZqkmpriwHhMniYfQCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645108; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gg50s1nfYGFLRkj5CFVRlRoEsFcXXd7SBiqjypnbxZg=; b=ji0yFmQ8EX6V3Cydrx4j9csqUXvToM/K+t+T+rMJJhlVVR1frSIVa9BcHFF1yqgi+6EP1fMvvGiFXvUivTQq4iuWn2C491NUivnzNKi/cnJZo0+TvkFIwBr47EBeRJ6u8awJJ5wfy+2HtUTK5V8wvbic5rzSFurDpxIVLDwQFWY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639645108955203.5537411404831; Thu, 16 Dec 2021 00:58:28 -0800 (PST) Received: from localhost ([::1]:40748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmap-0003HQ-Rl for importer@patchew.org; Thu, 16 Dec 2021 03:58:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUX-0000lU-3G for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUU-0004Cf-Ut for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:56 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-294-vorzIHeQNIyJ_-vbB6fpDw-1; Thu, 16 Dec 2021 03:51:48 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A539100D682 for ; Thu, 16 Dec 2021 08:51:47 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FB4C2C1AB for ; Thu, 16 Dec 2021 08:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gg50s1nfYGFLRkj5CFVRlRoEsFcXXd7SBiqjypnbxZg=; b=bSAA+vfFxZ5WES0KFLmNT7tIZZT6UBMpTq3UKtqGu7Gbrh8CxSS0NTszNfmI1RLnGw2ibd fgSnHs9Ow4HGR4bap6Tap2E59ufJtyllK5uheM8M4RALa0qmYhn07LQFT+OYYDznJBX0DH QWciFAcZdUMtsq0qB1YKqK9DXV9BGqc= X-MC-Unique: vorzIHeQNIyJ_-vbB6fpDw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/10] configure: unify x86_64 and x32 Date: Thu, 16 Dec 2021 09:51:36 +0100 Message-Id: <20211216085139.99682-8-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645109470100001 Content-Type: text/plain; charset="utf-8" The only difference between the two, as far as either configure or Meson are concerned, is in the multilib flags passed to the compiler. For QEMU, this fixes the handling of TYPE_OLDDEVT in include/exec/user/thunk.h and enables testing of dirty ring buffer, because both are using HOST_X86_64. For tests/tcg, this means that on a hypothetical x32 host the cross compiler will not be used to build the tests. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 6 ++---- meson.build | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 741ff99f4f..741c33c7ad 100755 --- a/configure +++ b/configure @@ -646,6 +646,7 @@ case "$cpu" in cpu=3D"i386" CPU_CFLAGS=3D"-m32" ;; x32) + cpu=3D"x86_64" CPU_CFLAGS=3D"-mx32" ;; x86_64|amd64) cpu=3D"x86_64" @@ -3735,7 +3736,7 @@ fi if test "$linux" =3D "yes" ; then mkdir -p linux-headers case "$cpu" in - i386|x86_64|x32) + i386|x86_64) linux_arch=3Dx86 ;; ppc|ppc64) @@ -3917,9 +3918,6 @@ if test "$skip_meson" =3D no; then i386) echo "cpu_family =3D 'x86'" >> $cross ;; - x86_64|x32) - echo "cpu_family =3D 'x86_64'" >> $cross - ;; *) echo "cpu_family =3D '$ARCH'" >> $cross ;; diff --git a/meson.build b/meson.build index 96de1a6ef9..903d4f3b10 100644 --- a/meson.build +++ b/meson.build @@ -355,7 +355,7 @@ if not get_option('tcg').disabled() tcg_arch =3D 'tci' elif config_host['ARCH'] =3D=3D 'sparc64' tcg_arch =3D 'sparc' - elif config_host['ARCH'] in ['x86_64', 'x32'] + elif config_host['ARCH'] =3D=3D 'x86_64' tcg_arch =3D 'i386' elif config_host['ARCH'] =3D=3D 'ppc64' tcg_arch =3D 'ppc' @@ -1801,7 +1801,6 @@ disassemblers =3D { 'hppa' : ['CONFIG_HPPA_DIS'], 'i386' : ['CONFIG_I386_DIS'], 'x86_64' : ['CONFIG_I386_DIS'], - 'x32' : ['CONFIG_I386_DIS'], 'm68k' : ['CONFIG_M68K_DIS'], 'microblaze' : ['CONFIG_MICROBLAZE_DIS'], 'mips' : ['CONFIG_MIPS_DIS'], --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645334; cv=none; d=zohomail.com; s=zohoarc; b=Yfp8x7JonaripkYrNMBaaiZ+hnNiWUyJykiXrX8XjxPP8IC/Qu5vzXRNkfGgPmQx/FeS1YVU0+gzqDaBAgnGfo2mqs9VBPNW/j2MsOmozIQKak7D4Dpa8r3njL8uBY0SK5GSfV1DnE3vksPaeJlbMNDQa8gQB7a38+MRSQO4zkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645334; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+CucA0KdzLmyPY1OJd5Daaf33bMrUJi+XAcx92BC2iE=; b=jE5MW52qaLO1GZkVyydbRDXH8GEo5J2AVM0AZDvj+8t+oa8eLVZJQBuD8o6C6wlzQZ08ZkmhrY004ajN03KvlVnQSJrjGULn0Ag05QejH1nsCquyfgWufdLDXb9HcXMvfD4i4uQfLgiOkZ31mjAQAcSICloOgHS7hS/0zq5afas= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639645334355952.5337723928319; Thu, 16 Dec 2021 01:02:14 -0800 (PST) Received: from localhost ([::1]:47174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmeT-0007l6-0t for importer@patchew.org; Thu, 16 Dec 2021 04:02:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUX-0000mp-VF for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUW-0004DD-3V for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:57 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-515-xz7vjCX4M8WNWLXo9HADPg-1; Thu, 16 Dec 2021 03:51:49 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 059C484E256 for ; Thu, 16 Dec 2021 08:51:48 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77B8C2BE77 for ; Thu, 16 Dec 2021 08:51:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+CucA0KdzLmyPY1OJd5Daaf33bMrUJi+XAcx92BC2iE=; b=XOAkJXA/VVWoxqHk4Vp2RxKI3uClL6ijYY2EvrPtPpPa/wQFqWzRVGK7Q3ctfuvg+0swB6 gv3MkJWrqu4LxjOXyAdx5NmKHWprg7vATib/aXixnUuEbw06RTo899pYHyJBTpXHGQiqXh aKyECkozp4y/AR2plW8ib6BZlT3fk2E= X-MC-Unique: xz7vjCX4M8WNWLXo9HADPg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/10] meson: rename "arch" variable Date: Thu, 16 Dec 2021 09:51:37 +0100 Message-Id: <20211216085139.99682-9-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645336277100001 Content-Type: text/plain; charset="utf-8" Avoid confusion between the ARCH variable of configure/config-host.mak and the same-named variable of meson.build. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 903d4f3b10..677ab1b57d 100644 --- a/meson.build +++ b/meson.build @@ -2845,7 +2845,7 @@ emulators =3D {} foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] - arch =3D config_target['TARGET_BASE_ARCH'] + target_base_arch =3D config_target['TARGET_BASE_ARCH'] arch_srcs =3D [config_target_h[target]] arch_deps =3D [] c_args =3D ['-DNEED_CPU_H', @@ -2861,11 +2861,11 @@ foreach target : target_dirs if target.endswith('-softmmu') qemu_target_name =3D 'qemu-system-' + target_name target_type=3D'system' - t =3D target_softmmu_arch[arch].apply(config_target, strict: false) + t =3D target_softmmu_arch[target_base_arch].apply(config_target, stric= t: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 - hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : arch + hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : target_base_arch hw =3D hw_arch[hw_dir].apply(config_target, strict: false) arch_srcs +=3D hw.sources() arch_deps +=3D hw.dependencies() @@ -2876,8 +2876,8 @@ foreach target : target_dirs abi =3D config_target['TARGET_ABI_DIR'] target_type=3D'user' qemu_target_name =3D 'qemu-' + target_name - if arch in target_user_arch - t =3D target_user_arch[arch].apply(config_target, strict: false) + if target_base_arch in target_user_arch + t =3D target_user_arch[target_base_arch].apply(config_target, strict= : false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() endif @@ -2915,7 +2915,7 @@ foreach target : target_dirs arch_srcs +=3D gdbstub_xml endif =20 - t =3D target_arch[arch].apply(config_target, strict: false) + t =3D target_arch[target_base_arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639644964; cv=none; d=zohomail.com; s=zohoarc; b=WFi/CiAPDeiOM0JU0KiP3zinna6KnE0nP9FuDRy+txpssRStgdJefcrslbmtYOmQ11eOXvZCrYFpWLm6zuMa9BKNS0wYrMFog/JM4yA2+hWwGZwrLs/p8uEMuaSLNH9w/uyJdIG3LZYUZCBIS3ASrJx6cjbNcECDUNxzr2m/BF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639644964; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=116wCfArOU87fwTJbit/Ib4jMlT4uME8m7V4T1JMkZI=; b=Z36RGbv6XlZujTLF5jJSA8puEb6vZg+Etp3D+D+7T5Nh/xTXDcaANEqZoQ5LKrNx0cUaVtGUn2yYDcYN926dGgRkJ0bZ8n3l8NIIzPJ3pKNUTnjexTZxLzkwvfg9/0/FfEnbV3SryTTRHUta9G9nYUU3KrPJTHsg7E+ka+RHUP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16396449646191017.6070940233466; Thu, 16 Dec 2021 00:56:04 -0800 (PST) Received: from localhost ([::1]:34048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmYV-00074b-H7 for importer@patchew.org; Thu, 16 Dec 2021 03:56:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUV-0000fe-8f for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUS-0004CN-6x for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-LLJMRZCiMKuLw3Ixq5XCuQ-1; Thu, 16 Dec 2021 03:51:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1AF20801AAB for ; Thu, 16 Dec 2021 08:51:49 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F9642BE77 for ; Thu, 16 Dec 2021 08:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=116wCfArOU87fwTJbit/Ib4jMlT4uME8m7V4T1JMkZI=; b=he1tt1w0OXpR1Q5CU8XSsF3M3DiOZTQ2QbeIBi7Qp2EKSsb15DFcKjPkiHmMuDpEsBIp9g 7VXbXeP/zN0SbjudghkdGp0xn/Jsp2ZIwO6+ZgXhjwt2nFt2XZnTTcq39L1TA0tv59Nmw3 DEtXUVaMu86nc1SxxMODBZQsLnPxM4o= X-MC-Unique: LLJMRZCiMKuLw3Ixq5XCuQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/10] configure, meson: move ARCH to meson.build Date: Thu, 16 Dec 2021 09:51:38 +0100 Message-Id: <20211216085139.99682-10-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639644966557100001 Content-Type: text/plain; charset="utf-8" $ARCH and the HOST_* symbols are only used by the QEMU build; configure uses $cpu instead. Remove it from config-host.mak. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 21 ++++----------------- meson.build | 26 +++++++++++++++++--------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 741c33c7ad..2cecbd4c66 100755 --- a/configure +++ b/configure @@ -634,11 +634,9 @@ else cpu=3D$(uname -m) fi =20 -ARCH=3D -# Normalise host CPU name, set ARCH and multilib cflags +# Normalise host CPU name, set multilib cflags # Note that this case should only have supported host CPUs, not guests. case "$cpu" in - aarch64|riscv) ;; armv*b|armv*l|arm) cpu=3D"arm" ;; =20 @@ -667,8 +665,7 @@ case "$cpu" in CPU_CFLAGS=3D"-m64 -mlittle" ;; =20 s390) - CPU_CFLAGS=3D"-m31" - ARCH=3Dunknown ;; + CPU_CFLAGS=3D"-m31" ;; s390x) CPU_CFLAGS=3D"-m64" ;; =20 @@ -677,15 +674,7 @@ case "$cpu" in CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" ;; sparc64) CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" ;; - - *) - # This will result in either an error or falling back to TCI later - ARCH=3Dunknown - ;; esac -if test -z "$ARCH"; then - ARCH=3D"$cpu" -fi =20 : ${make=3D${MAKE-make}} =20 @@ -3432,8 +3421,6 @@ echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak echo "GIT_SUBMODULES_ACTION=3D$git_submodules_action" >> $config_host_mak =20 -echo "ARCH=3D$ARCH" >> $config_host_mak - if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi @@ -3914,12 +3901,12 @@ if test "$skip_meson" =3D no; then cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross echo "system =3D '$targetos'" >> $cross - case "$ARCH" in + case "$cpu" in i386) echo "cpu_family =3D 'x86'" >> $cross ;; *) - echo "cpu_family =3D '$ARCH'" >> $cross + echo "cpu_family =3D '$cpu'" >> $cross ;; esac echo "cpu =3D '$cpu'" >> $cross diff --git a/meson.build b/meson.build index 677ab1b57d..93f296e283 100644 --- a/meson.build +++ b/meson.build @@ -67,6 +67,14 @@ endif =20 targetos =3D host_machine.system() =20 +if cpu not in supported_cpus + host_arch =3D 'unknown' +elif cpu =3D=3D 'x86' + host_arch =3D 'i386' +else + host_arch =3D cpu +endif + if cpu in ['x86', 'x86_64'] kvm_targets =3D ['i386-softmmu', 'x86_64-softmmu'] elif cpu =3D=3D 'aarch64' @@ -335,9 +343,9 @@ if targetos =3D=3D 'netbsd' endif endif =20 -tcg_arch =3D config_host['ARCH'] +tcg_arch =3D host_arch if not get_option('tcg').disabled() - if cpu not in supported_cpus + if host_arch =3D=3D 'unknown' if get_option('tcg_interpreter') warning('Unsupported CPU @0@, will use TCG with TCI (slow)'.format(c= pu)) else @@ -353,11 +361,11 @@ if not get_option('tcg').disabled() endif if get_option('tcg_interpreter') tcg_arch =3D 'tci' - elif config_host['ARCH'] =3D=3D 'sparc64' + elif host_arch =3D=3D 'sparc64' tcg_arch =3D 'sparc' - elif config_host['ARCH'] =3D=3D 'x86_64' + elif host_arch =3D=3D 'x86_64' tcg_arch =3D 'i386' - elif config_host['ARCH'] =3D=3D 'ppc64' + elif host_arch =3D=3D 'ppc64' tcg_arch =3D 'ppc' endif add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tc= g_arch, @@ -1422,6 +1430,8 @@ config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDI= R', get_option('prefix') / config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / q= emu_moddir) config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / ge= t_option('sysconfdir')) =20 +config_host_data.set('HOST_' + host_arch.to_upper(), 1) + config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) @@ -1770,8 +1780,6 @@ foreach k, v: config_host v =3D '"' + '", "'.join(v.split()) + '", ' endif config_host_data.set(k, v) - elif k =3D=3D 'ARCH' - config_host_data.set('HOST_' + v.to_upper(), 1) elif strings.contains(k) config_host_data.set_quoted(k, v) elif k.startswith('CONFIG_') @@ -1914,7 +1922,7 @@ foreach target : target_dirs endif =20 foreach k, v: disassemblers - if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) + if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].starts= with(k) foreach sym: v config_target +=3D { sym: 'y' } config_all_disas +=3D { sym: 'y' } @@ -2883,7 +2891,7 @@ foreach target : target_dirs endif if 'CONFIG_LINUX_USER' in config_target base_dir =3D 'linux-user' - target_inc +=3D include_directories('linux-user/host/' / config_host= ['ARCH']) + target_inc +=3D include_directories('linux-user/host/' / host_arch) endif if 'CONFIG_BSD_USER' in config_target base_dir =3D 'bsd-user' --=20 2.33.1 From nobody Mon Feb 9 17:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645056; cv=none; d=zohomail.com; s=zohoarc; b=hXFp9xrCoP8fB6DYbCsSMhXIBkVmNym2u5jGfxFDXW+d6dq3RmbPzwmk/wO6BgVXiIfC9PdU0Gl0tyoKfMsjS5UxGO3GZlfDt119PHcLsWvRfw27vOCO2Ln3/v3/Eix089l2i+hvWhiApF29nsfivInYx9HfXN18wA5PPJSaj0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645056; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I73YxAkK7/a5dq5AEd6M8maBVnGUGHReNTrmVO11LMU=; b=HgFUmnnd7Ytr25bGJbPRSInPHNViXZ7aUgEJFGq8nHbC8w++m1TapofiXABUpZI2ifmrvpvdAwOfPr7bEBXXQMJhQqW9gYabQjPefh9tqaqK7vYTKBXpkyj1nobYBW6ty6YI9nm93Wqilj4OtgRKv4Zj4LgX0zzmEKOFd1OOiP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639645056490700.8047580561591; Thu, 16 Dec 2021 00:57:36 -0800 (PST) Received: from localhost ([::1]:37908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmZz-0001Lk-J7 for importer@patchew.org; Thu, 16 Dec 2021 03:57:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUV-0000gM-FG for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUS-0004CR-Id for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:55 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-cZtEp9EmPZyf2xzdBU7row-1; Thu, 16 Dec 2021 03:51:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E82AA100D680 for ; Thu, 16 Dec 2021 08:51:49 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 696442BE77 for ; Thu, 16 Dec 2021 08:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I73YxAkK7/a5dq5AEd6M8maBVnGUGHReNTrmVO11LMU=; b=G9NSMv4GcsarfxaGmG+Ka0WBSt+MExDxW9yVnmrcWj4oDaN/EDTURtSO3GV8YMPE02yTcH nFycoQ0OstIcwdQy/tAhjfKkPCMGqld10k+ccbawepV/UYtmdch0WFqZII0Icj7xIUfYJ9 ypL/v2ta8Ls0G41ARdHDU0APogS1+VE= X-MC-Unique: cZtEp9EmPZyf2xzdBU7row-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/10] configure: remove unnecessary symlinks Date: Thu, 16 Dec 2021 09:51:39 +0100 Message-Id: <20211216085139.99682-11-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645058474100001 Content-Type: text/plain; charset="utf-8" Make pc-bios/meson.build use the files in the source tree as inputs to bzip2. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 1 - pc-bios/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 2cecbd4c66..7751cc31b8 100755 --- a/configure +++ b/configure @@ -3817,7 +3817,6 @@ for bios_file in \ $source_path/pc-bios/*.img \ $source_path/pc-bios/openbios-* \ $source_path/pc-bios/u-boot.* \ - $source_path/pc-bios/edk2-*.fd.bz2 \ $source_path/pc-bios/palcode-* \ $source_path/pc-bios/qemu_vga.ndrv =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index b40ff3f2bd..1812a4084f 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -15,7 +15,7 @@ if unpack_edk2_blobs roms +=3D custom_target(f, build_by_default: have_system, output: f, - input: '@0@.bz2'.format(f), + input: files('@0@.bz2'.format(f)), capture: true, install: get_option('install_blobs'), install_dir: qemu_datadir, --=20 2.33.1