From patchwork Mon Oct 5 08:23:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 303742 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADA4EC4363A for ; Mon, 5 Oct 2020 08:34:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 558672078D for ; Mon, 5 Oct 2020 08:34:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZzWDAsda" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 558672078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPLwi-0002Dv-EB for qemu-devel@archiver.kernel.org; Mon, 05 Oct 2020 04:34:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPLmr-00085E-Fp for qemu-devel@nongnu.org; Mon, 05 Oct 2020 04:24:01 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPLmp-0007Jz-1s for qemu-devel@nongnu.org; Mon, 05 Oct 2020 04:24:01 -0400 Received: by mail-wm1-x343.google.com with SMTP id 13so7636469wmf.0 for ; Mon, 05 Oct 2020 01:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TY2brkwcBdIH91nPnw+zTPTVXWuUUIgSzEitafhmCuQ=; b=ZzWDAsdahWjanEdA0YeGqSmzXsMizS9vI/t5MIlPC3WDuoOijIMPqA7YRWG0o7usa/ +/Ax8QOLducHy/9fZnH9GuU+bAEEFXQD37/iSyFL+xbqcrIQ9DLCukyG5DR00RwLd/5V 9KfodvFvz74cayAnblQR8ohrxAjgXOSW3vPr1hVRRKhLDl40BcbrNabSRZ3oQ/VIbFE6 WgXF13eZgqGsBLqU2RGiSzC1Zl9djmcybKX9A72wXjYfscCx5AVuInbOxK+w36X3pS1K oiQ3wWguY3WBqys0xiaSDP45nvVZmI2cyP8oplvnQbQ6b98/NNAGdW8IIe5kSSN0NWz7 Fcgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TY2brkwcBdIH91nPnw+zTPTVXWuUUIgSzEitafhmCuQ=; b=LIlIzM0lLTAJgFt/YFL9WqnrrOlEIxUpuQ9+boJFsXZeb2r+hdb4AolM/nr1RKpqnk 63x+dSgyPbdtz+ze9xFW9ubcilgvLfilA1Kyv/vSxnGVcK1JjgTBzzRF3HTyDUV9Y5Ft pp/WI3Je9hdgvv7W8rsI9hpfw0Z7zJiPwtp5XTCWLuL7CBDHeQbPI5Iihqx59i9rFkMH 0/ikn4rI14lNVO+g09p+XYnPZ+bWogQdFThCaPt2LS1JRsFxHqjALaoUAKrgbMaQpggH 4gvg/lTdcotj0QEVzxI7YOlRW5RIi8kxhARWQjMpmFuoBLqz32S/ZlsQ/kuasBYjHewk S3dw== X-Gm-Message-State: AOAM532CQaXzo0IvCxaGrMSW4Amsvwf2XOJA9zfpCSsMIYuz0+yyBx5r JYX0zHr/J2KtLKDuw/zOQlaoFwDOE4c= X-Google-Smtp-Source: ABdhPJww6ft9/ueFuG6Ti/u9IQT55Djg0UTp+YsMTR8KgJN4Mh6giyG9lruzrREt/xQU0Lwds6Jh1w== X-Received: by 2002:a1c:7ed5:: with SMTP id z204mr15758471wmc.177.1601886237446; Mon, 05 Oct 2020 01:23:57 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:2e86:3d8b:8b70:920c]) by smtp.gmail.com with ESMTPSA id z15sm11931434wrv.94.2020.10.05.01.23.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 01:23:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/19] configure: move OpenBSD W^X test to meson Date: Mon, 5 Oct 2020 10:23:41 +0200 Message-Id: <20201005082349.354095-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005082349.354095-1-pbonzini@redhat.com> References: <20201005082349.354095-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The TCG option is now passed through to Meson. Signed-off-by: Paolo Bonzini --- configure | 15 --------------- meson.build | 8 +++++++- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/configure b/configure index a32c43a905..b31bf24d60 100755 --- a/configure +++ b/configure @@ -1594,10 +1594,6 @@ if [ "$ARCH" = "unknown" ]; then linux_user="no" fi -if [ "$bsd_user" = "no" -a "$linux_user" = "no" -a "$softmmu" = "no" ] ; then - tcg="disabled" -fi - default_target_list="" deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu deprecated_features="" @@ -6041,17 +6037,6 @@ if test "$mingw32" = "yes" ; then done fi -# Disable OpenBSD W^X if available -if test "$tcg" = "enabled" && test "$targetos" = "OpenBSD"; then - cat > $TMPC < 0 + # Disable OpenBSD W^X if available + emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded') + endif endif accelerators = [] @@ -1247,7 +1253,7 @@ foreach target : target_dirs c_args = ['-DNEED_CPU_H', '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)] - link_args = [] + link_args = emulator_link_args config_target += config_host target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]