From nobody Sun Nov 16 16:27:31 2025 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=1600853905; cv=none; d=zohomail.com; s=zohoarc; b=YpBIgTRnBy/8nbF9wOZ48Q89lV9oREGKTYerv6uYZRUXqEso3ulLG+7IGTDv0eqeOZF1k3tlKK8NjehC+yagrfvCEu6nTrwmjD5RG+CzHSJZHuHyD4Qr4wmfTLD4RtMMVG4CwpAMYhOTvrRxvIwn6whv4hiJaflcZhE69+8054I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600853905; h=Content-Type:Content-Transfer-Encoding:Cc: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=07LcNJyvfIgjKm2ZgdgFmj83qm7MX/wQk0q80u2dgNs=; b=lqn5oaZZqaqu8qBN1EQsbd3Xn7HgUevysgWw67SLQ4sccBoqsaOpuAedF54WZurtuNL+UagdBHSMy4wLIEY5HP04Z5bB85rxAbuEmOgNGPaUfB9yBG+0DvJiskADoP/G/w557zAYCnDxTHvE29IJ0yBnEwFCDKSgy0LxzyN8jpY= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600853905286316.86586981689425; Wed, 23 Sep 2020 02:38:25 -0700 (PDT) Received: from localhost ([::1]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1EF-00075n-PG for importer@patchew.org; Wed, 23 Sep 2020 05:38:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL12m-0002cL-62 for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL12e-0004Y1-3A for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:26:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-ocZDr_HuMX-_Fu6KaCHXFw-1; Wed, 23 Sep 2020 05:26:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B112FAD680; Wed, 23 Sep 2020 09:26:19 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ECA560CCC; Wed, 23 Sep 2020 09:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600853182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=07LcNJyvfIgjKm2ZgdgFmj83qm7MX/wQk0q80u2dgNs=; b=iWhUDd85ZKcsmJYB8+P2UITxRKchoBU0gFQL04HivPwXH8HQWxXon0DN0lvtPIthWqgCqI ulB/yY6zUpJ98YhcfAn8NHv9e0A9JnBVK+zwkfmO90jyb/CGTTu6u61MooreT51eGRWnQh CGzoyGtr24c89AiDZh495GHKEqc132U= X-MC-Unique: ocZDr_HuMX-_Fu6KaCHXFw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] configure: cleanup CFLAGS and LDFLAGS for submodules Date: Wed, 23 Sep 2020 05:26:15 -0400 Message-Id: <20200923092617.1593722-3-pbonzini@redhat.com> In-Reply-To: <20200923092617.1593722-1-pbonzini@redhat.com> References: <20200923092617.1593722-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 00:53:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The -g and -O2 flags that configure adds to CFLAGS are only used by submodu= les, so do not put anymore the confusing CFLAGS variable in config-host.mak and replace it with more explicit SUBMODULE_CFLAGS variable. There was also no equivalent SUBMODULE_LDFLAGS variable, add it. This would theoretically help with LTO if we want -g and -O2 options on the command li= ne. I say "theoretically" because submodules should not be linking anything; but since we were passing an "LD" variable we might as well get its flags right. CFLAGS are now synthesized in the configuration summary as a quick way to p= resent --enable-debug and --enable-debug-info. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- Makefile | 3 +-- configure | 20 ++++++++++++++++---- meson.build | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 57fb63832f..3367ca520c 100644 --- a/Makefile +++ b/Makefile @@ -137,11 +137,10 @@ configure: ; .PHONY: all clean distclean install \ recurse-all dist msi FORCE =20 -SUBMODULE_CFLAGS =3D $(QEMU_CFLAGS) $(CFLAGS) SUBDIR_MAKEFLAGS =3D $(if $(V),,--no-print-directory --quiet) \ PKG_CONFIG=3D"$(PKG_CONFIG)" \ CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" \ - CFLAGS=3D"$(SUBMODULE_CFLAGS)" LDFLAGS=3D"$(QEMU_LDFLAGS)" \ + CFLAGS=3D"$(SUBMODULE_CFLAGS)" LDFLAGS=3D"$(SUBMODULE_LDFLAGS)" \ ARFLAGS=3D"$(ARFLAGS)" =20 include $(SRC_PATH)/tests/Makefile.include diff --git a/configure b/configure index dfecfd6c16..b04350f7ea 100755 --- a/configure +++ b/configure @@ -6112,12 +6112,23 @@ elif test "$fortify_source" =3D "yes" ; then QEMU_CFLAGS=3D"-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $QEMU_CFLAGS" debug=3Dno fi + +SUBMODULE_CFLAGS=3D-Wall +SUBMODULE_LDFLAGS=3D +if test "$pie" =3D "yes"; then + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS -fPIE" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS -pie" +else + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS $CFLAGS_NOPIE" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS $LDFLAGS_NOPIE" +fi if test "$debug_info" =3D "yes"; then - CFLAGS=3D"-g $CFLAGS" - LDFLAGS=3D"-g $LDFLAGS" + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS -g" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS -g" fi if test "$debug" =3D "no"; then - CFLAGS=3D"-O2 $CFLAGS" + SUBMODULE_CFLAGS=3D"$SUBMODULE_CFLAGS -O2" + SUBMODULE_LDFLAGS=3D"$SUBMODULE_LDFLAGS -O2" fi =20 case "$ARCH" in @@ -7292,7 +7303,8 @@ echo "RANLIB=3D$ranlib" >> $config_host_mak echo "NM=3D$nm" >> $config_host_mak echo "PKG_CONFIG=3D$pkg_config_exe" >> $config_host_mak echo "WINDRES=3D$windres" >> $config_host_mak -echo "CFLAGS=3D$CFLAGS" >> $config_host_mak +echo "SUBMODULE_CFLAGS=3D$CFLAGS \$(QEMU_CFLAGS) $SUBMODULE_CFLAGS" >> $co= nfig_host_mak +echo "SUBMODULE_LDFLAGS=3D$LDFLAGS \$(QEMU_LDFLAGS) $SUBMODULE_LDFLAGS" >>= $config_host_mak echo "CFLAGS_NOPIE=3D$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak diff --git a/meson.build b/meson.build index 9aeefa60fb..cb0113ee90 100644 --- a/meson.build +++ b/meson.build @@ -1471,7 +1471,8 @@ if targetos =3D=3D 'darwin' summary_info +=3D {'Objective-C compiler': meson.get_compiler('objc').cm= d_array()[0]} endif summary_info +=3D {'ARFLAGS': config_host['ARFLAGS']} -summary_info +=3D {'CFLAGS': config_host['CFLAGS']} +summary_info +=3D {'CFLAGS': '-O' + get_option('optimization') + + (get_option('debug') ? ' -g' = : '')} summary_info +=3D {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info +=3D {'make': config_host['MAKE']} --=20 2.26.2