From patchwork Thu Jun 23 17:39:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 639802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rb7zx4mhsz9s4q for ; Fri, 24 Jun 2016 03:41:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yJeDAw8Q; dkim-atps=neutral Received: from localhost ([::1]:38357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8ct-00016U-Kl for incoming@patchwork.ozlabs.org; Thu, 23 Jun 2016 13:41:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8bb-0007jo-AX for qemu-devel@nongnu.org; Thu, 23 Jun 2016 13:39:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG8bX-00022I-3z for qemu-devel@nongnu.org; Thu, 23 Jun 2016 13:39:55 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:34174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8bX-00022C-03 for qemu-devel@nongnu.org; Thu, 23 Jun 2016 13:39:51 -0400 Received: by mail-qk0-x241.google.com with SMTP id j2so17045185qkf.1 for ; Thu, 23 Jun 2016 10:39:50 -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; bh=43gkvptge/OBQvKuXxVfioaNTk6LfIcQqwwhbdMY/wc=; b=yJeDAw8QUKmsXWCTFvQMwpff+sgeJ9+DqmyEefLJ8IxenBkv28l4NsRYidiNWvvQnu 66ugxPgfSUKBCr68AhFaoUEzrbXHMBhybYhkenw2qk2F4gNFJIiiJHBUTy4uXfuDLICP wY5tmYVAlNRfWaBkMlXqM+Kd9TCCl32g1iF57c1lEEkK6GwUjdx1KLAUi5QsaZqsSw2t vT5Nvu4XO5gEgnjHRqB3+jqxcA9UFz9WJ8in5njj6f92LeVoTAYT7gR/gH4h7ipejma+ 0oTzTmFdkGORhbTjPLH924/sOvSLo5sVo6i3EY/2yIrCqDeYfInp0rz2dOdjfU5NuM8y 9rhw== 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; bh=43gkvptge/OBQvKuXxVfioaNTk6LfIcQqwwhbdMY/wc=; b=V1ZWFudhDeTq+Cj+1QSuGVVAj0fZY5bb1/z6lcry4eY0eCxP3DjMtqk3BUPbb7Nc6/ VsMbFIdFrfwc7gLc+oWMGEtsTgZRwOzbuGIBd/ke7P7cVzdpElAys5FEV0s+XRlBYmSe p+3f3mciD7vzXxoe9fTFr+YtMZxWX8u254Zr/J9vs/6NuuC1Bi3ldMgDdbxoM/5bdrsC 5d0psQfztVS5O/vGsw7maLwF++SfUMgKfMU37RLWkFT+Ynh6GcdXktGwyTh2lJvewlGG Llfmagb+0CHPTiNOXZ2OapvMWsst825GPfUWn2eL7HCklAGBCvyLRGBatJlOqsq55Xvv hUhA== X-Gm-Message-State: ALyK8tKCZlCHDaig83009V5RVCKCWz6EKz4BdU5D8gHoS2EmG9hwUCicDWGb05h4oN4Jig== X-Received: by 10.55.185.67 with SMTP id j64mr43636422qkf.170.1466703590532; Thu, 23 Jun 2016 10:39:50 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id w17sm451063qtc.47.2016.06.23.10.39.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2016 10:39:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 23 Jun 2016 10:39:18 -0700 Message-Id: <1466703558-7723-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- configure | 13 ++++++++++--- rules.mak | 7 ++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 5929aba..29ad43e 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}" @@ -4488,6 +4488,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 @@ -5498,7 +5505,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 @@ -5971,7 +5978,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)$@")