From patchwork Fri Jul 1 17:19:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9210315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5D108607D8 for ; Fri, 1 Jul 2016 17:49:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52B00286C6 for ; Fri, 1 Jul 2016 17:49:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46541286CE; Fri, 1 Jul 2016 17:49:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD3D9286C6 for ; Fri, 1 Jul 2016 17:49:32 +0000 (UTC) Received: from localhost ([::1]:34935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ2ZH-0005Rm-RI for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Jul 2016 13:49:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ26F-0003M9-28 for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:19:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ26B-0001eB-QW for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:19:29 -0400 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]:33717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ26B-0001dx-JZ for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:19:27 -0400 Received: by mail-pa0-x244.google.com with SMTP id ts6so10191617pac.0 for ; Fri, 01 Jul 2016 10:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iQEXW3d9OedwxJeiZH+Ym/qzyaRpe5TFA4UjgO0Cy9A=; b=NsOV0CjNi6Wz8EpomL9FMKkab3iU71OspQX3TM+WvqF6h9HdkCKbRv5tHnP1Yp8RCB dJWt+WNANNteP9K+yL8tjLiO6NDgoccWBh7DX/tG3TMuGytr9g7oqeANDP92wo5IHCCY U/NYysbWqhyc/l0QGJ/4+vLQ7pyr7itDwkw2vFTMF0M6mtZV1/yCS40nvkHUNMbG7c6C SIABRCzbLufcAdaFVnGlYPczLizOZ1RoGfvkieU3JdjBtzob7nvfQ3k6Gd6WMLwYhOtK fGFJTSH+8Pqb61paQ3k9zAfZTO2KgtWOOqi58iLk5T3TEsYnfNwtcjGmzmadcFk5L7EG pzPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=iQEXW3d9OedwxJeiZH+Ym/qzyaRpe5TFA4UjgO0Cy9A=; b=kPMNUFfImhxSoFuKRx3S7cHKJyXZ4PCo1kR1mjJ68BVe7HSGm6RI/qxSe0eQdQdcal WTf9ydpSRS9ov4ThFwrzwWlGALTFlhejobb4ayfuXklkLJNpiuPiYWfqH27od9NVt6Dn N4kDFo1FNg6+7JSfaJpGOSlJjjXxj5koH0jbyvq9UMzUBc1qTwJH3YqXFQgz/gZnG14G jSEFnCr1GQDOFp4rQfkoE2hcUmYeoYmPC4I4YbRbx3Kvg9CucaU0LThUlePsJwmRsg0W +QQeOvjZMOn2EeJsYCBTzRZWqFyd2LWHO/Ko1It5UZGHXjjQM0F+S6tvZg6nx2eNibAy u9Aw== X-Gm-Message-State: ALyK8tIgn0TKkMwaDtHB0tphuv82v295Tdsl+hKtUQd20Z9R5AyfXDeJeN8TH0G0A9OfaQ== X-Received: by 10.66.138.110 with SMTP id qp14mr33306460pab.135.1467393566660; Fri, 01 Jul 2016 10:19:26 -0700 (PDT) Received: from bigtime.twiddle.net (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id b71sm7102860pfc.51.2016.07.01.10.19.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 10:19:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 10:19:22 -0700 Message-Id: <1467393563-29447-4-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467393563-29447-1-git-send-email-rth@twiddle.net> References: <1467393563-29447-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::244 Subject: [Qemu-devel] [PULL 3/4] build: Use $(CCAS) for compiling .S files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We fail to pass to $(AS) all of the different flags that may be required for a given set of CFLAGS. Rather than figuring out the host-specific mapping, it's better to allow the compiler driver to do that. However, simply using $(CC) runs afoul of clang trying to build the option roms. C.f. 3dd46c78525a30e98c68, wherein we changed from using $(CC) to using $(AS) in the first place. Work around this by passing -fno-integrated-as to clang, so that we use the external assembler, and the clang driver still passes along all of the options that the assembler might require. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-Id: <1466703558-7723-1-git-send-email-rth@twiddle.net> --- configure | 13 ++++++++++--- rules.mak | 7 ++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 93e4c95..79af8ee 100755 --- a/configure +++ b/configure @@ -368,7 +368,7 @@ else fi ar="${AR-${cross_prefix}ar}" -as="${AS-${cross_prefix}as}" +ccas="${CCAS-$cc}" cpp="${CPP-$cc -E}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" @@ -4496,6 +4496,13 @@ if test "$fortify_source" != "no"; then fi fi +################################################# +# clang does not support the 16-bit assembly for roms + +if echo | $ccas -dM -E - | grep __clang__ > /dev/null 2>&1 ; then + ccas="$ccas -fno-integrated-as" +fi + ########################################## # check if struct fsxattr is available via linux/fs.h @@ -5516,7 +5523,7 @@ echo "CXX=$cxx" >> $config_host_mak echo "OBJCC=$objcc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak echo "ARFLAGS=$ARFLAGS" >> $config_host_mak -echo "AS=$as" >> $config_host_mak +echo "CCAS=$ccas" >> $config_host_mak echo "CPP=$cpp" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak @@ -5989,7 +5996,7 @@ for rom in seabios vgabios ; do config_mak=roms/$rom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak - echo "AS=$as" >> $config_mak + echo "CCAS=$ccas" >> $config_mak echo "CC=$cc" >> $config_mak echo "BCC=bcc" >> $config_mak echo "CPP=$cpp" >> $config_mak diff --git a/rules.mak b/rules.mak index 72c5955..7d7d83b 100644 --- a/rules.mak +++ b/rules.mak @@ -68,11 +68,8 @@ LINK = $(call quiet-command, $(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $(call process-archive-undefs, $1) \ $(version-obj-y) $(call extract-libs,$1) $(LIBS)," LINK $(TARGET_DIR)$@") -%.asm: %.S - $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -o $@ $<," CPP $(TARGET_DIR)$@") - -%.o: %.asm - $(call quiet-command,$(AS) $(ASFLAGS) -o $@ $<," AS $(TARGET_DIR)$@") +%.o: %.S + $(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") %.o: %.cc $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@")