From patchwork Wed Sep 23 09:26:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 304640 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=-11.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 2ED8BC2D0A8 for ; Wed, 23 Sep 2020 09:38:23 +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 A8D22235FD for ; Wed, 23 Sep 2020 09:38:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iWhUDd85" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8D22235FD 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]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL1EC-00075n-Nf for qemu-devel@archiver.kernel.org; Wed, 23 Sep 2020 05:38:20 -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 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= 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 X-MC-Unique: ocZDr_HuMX-_Fu6KaCHXFw-1 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) 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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The -g and -O2 flags that configure adds to CFLAGS are only used by submodules, 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 line. 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 present --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 -SUBMODULE_CFLAGS = $(QEMU_CFLAGS) $(CFLAGS) SUBDIR_MAKEFLAGS = $(if $(V),,--no-print-directory --quiet) \ PKG_CONFIG="$(PKG_CONFIG)" \ CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \ - CFLAGS="$(SUBMODULE_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" \ + CFLAGS="$(SUBMODULE_CFLAGS)" LDFLAGS="$(SUBMODULE_LDFLAGS)" \ ARFLAGS="$(ARFLAGS)" 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" = "yes" ; then QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" debug=no fi + +SUBMODULE_CFLAGS=-Wall +SUBMODULE_LDFLAGS= +if test "$pie" = "yes"; then + SUBMODULE_CFLAGS="$SUBMODULE_CFLAGS -fPIE" + SUBMODULE_LDFLAGS="$SUBMODULE_LDFLAGS -pie" +else + SUBMODULE_CFLAGS="$SUBMODULE_CFLAGS $CFLAGS_NOPIE" + SUBMODULE_LDFLAGS="$SUBMODULE_LDFLAGS $LDFLAGS_NOPIE" +fi if test "$debug_info" = "yes"; then - CFLAGS="-g $CFLAGS" - LDFLAGS="-g $LDFLAGS" + SUBMODULE_CFLAGS="$SUBMODULE_CFLAGS -g" + SUBMODULE_LDFLAGS="$SUBMODULE_LDFLAGS -g" fi if test "$debug" = "no"; then - CFLAGS="-O2 $CFLAGS" + SUBMODULE_CFLAGS="$SUBMODULE_CFLAGS -O2" + SUBMODULE_LDFLAGS="$SUBMODULE_LDFLAGS -O2" fi case "$ARCH" in @@ -7292,7 +7303,8 @@ echo "RANLIB=$ranlib" >> $config_host_mak echo "NM=$nm" >> $config_host_mak echo "PKG_CONFIG=$pkg_config_exe" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak -echo "CFLAGS=$CFLAGS" >> $config_host_mak +echo "SUBMODULE_CFLAGS=$CFLAGS \$(QEMU_CFLAGS) $SUBMODULE_CFLAGS" >> $config_host_mak +echo "SUBMODULE_LDFLAGS=$LDFLAGS \$(QEMU_LDFLAGS) $SUBMODULE_LDFLAGS" >> $config_host_mak echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=$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 == 'darwin' summary_info += {'Objective-C compiler': meson.get_compiler('objc').cmd_array()[0]} endif summary_info += {'ARFLAGS': config_host['ARFLAGS']} -summary_info += {'CFLAGS': config_host['CFLAGS']} +summary_info += {'CFLAGS': '-O' + get_option('optimization') + + (get_option('debug') ? ' -g' : '')} summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info += {'make': config_host['MAKE']}