From patchwork Fri Jul 8 02:30:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9219977 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 802E160574 for ; Fri, 8 Jul 2016 02:31:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 712A527D64 for ; Fri, 8 Jul 2016 02:31:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6554527D85; Fri, 8 Jul 2016 02:31:11 +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 7FAE927D76 for ; Fri, 8 Jul 2016 02:31:10 +0000 (UTC) Received: from localhost ([::1]:43158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLLZM-0000oO-ID for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 22:31:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLLZ6-0000bH-3S for qemu-devel@nongnu.org; Thu, 07 Jul 2016 22:30:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLLZ1-0001lh-0p for qemu-devel@nongnu.org; Thu, 07 Jul 2016 22:30:50 -0400 Received: from mail-qt0-x22a.google.com ([2607:f8b0:400d:c0d::22a]:35300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLLZ0-0001l6-Qp for qemu-devel@nongnu.org; Thu, 07 Jul 2016 22:30:46 -0400 Received: by mail-qt0-x22a.google.com with SMTP id f89so18033967qtd.2 for ; Thu, 07 Jul 2016 19:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to; bh=wp49TKi8JvtI+HMHGGAyGV95jXF/SYjW05v0CINlEMU=; b=rgOpld7PvYGbmPsrmC15qgM0IgmRm+7DZ0wBNzCejn7bSpFUVvY0HT76LTg+SR5UlC feUWwfVpJG/DPnyzv0lIxowUPCDUqaZ8JADT2byYtRadK4fMd2Xt7IKuYo0YTcjWQMsq SXMCuNThvg4LHyIDndjdC/N9Uf+Aw8tcMM30S+RnSEwxbZGC9nQajTLjZbD9Fqpst+Ne pBuVtt2BhxkNqz+H2L/2hBMlZYRFnKolhZa5yovgiug1t1gP31ekCMjLIJmVBOaNcgB3 JVBCJs5x1cPI7OhCNQs08ntQe1f184jT+cKUREVszjh7MrU1DTP9ZpdKB5MGyocz+aIl GONg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to; bh=wp49TKi8JvtI+HMHGGAyGV95jXF/SYjW05v0CINlEMU=; b=d2JKh3aL11iiRtEB7aNz20QRMB1NNEsx+gV1DEsXCZwbKZI9aqymRt+DqojTmQydaX 06C1UyZf6IO1f5pE93PMkhc+UqvVup7yanGIdDlQXXF2AhM6L57xStIhO4zdkoLqiDAC G3X6LS+wbwzliDRjDsRUmho9t2obfaNDLaQh7wGyRhfUyJaGiU8/xrjDZhYayV1MS2ZA jUOjksuGRpS2+VUMwetTMxhBiDE6seyhrX/DFyp6tNqI9a3JIJ+dnT2IPhA1jAT7T8Aj 5zyT9wXw0zWakOKiqwkO0Gju7IA0rAOcKf+eA3GDqbH2xYVy8RlUvp9QVgxZYojmpgOy /EyQ== X-Gm-Message-State: ALyK8tITzxwasYveFJ4IMBovn5HW+4w1iVIMmuj0+319CtyLuLr66LIAVvyy3z4IAgeDXg== X-Received: by 10.200.39.150 with SMTP id w22mr5201209qtw.78.1467945046433; Thu, 07 Jul 2016 19:30:46 -0700 (PDT) Received: from bigtime.twiddle.net (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.googlemail.com with ESMTPSA id l2sm641721qkb.45.2016.07.07.19.30.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jul 2016 19:30:45 -0700 (PDT) To: =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <1467821896-32616-1-git-send-email-rth@twiddle.net> <1467821896-32616-2-git-send-email-rth@twiddle.net> <87a8htmnj5.fsf@linaro.org> From: Richard Henderson Message-ID: <2c3bbb2d-d91a-251f-3d15-79d9f47dcaae@twiddle.net> Date: Thu, 7 Jul 2016 19:30:43 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <87a8htmnj5.fsf@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::22a Subject: Re: [Qemu-devel] [PULL v2 1/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, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 07/07/2016 09:16 AM, Alex Bennée wrote: >> +if echo | $ccas -dM -E - | grep __clang__ > /dev/null 2>&1 ; then >> + ccas="$ccas -fno-integrated-as" >> +fi > > Hi Richard, > > This looks like it breaks the Travis clang: > > https://travis-ci.org/qemu/qemu/builds/142825178 > > We get the error: > > AS optionrom/multiboot.o > clang: error: unknown argument: '-fno-integrated-as' > make[1]: *** [multiboot.o] Error 1 > make: *** [romsubdir-optionrom] Error 2 > make: *** Waiting for unfinished jobs.... > > Clang in Travis is: > > clang version 3.4 (tags/RELEASE_34/final) Please try this. It works here for clang 3.9. r~ diff --git a/configure b/configure index e9090a0..5ada56d 100755 --- a/configure +++ b/configure @@ -368,6 +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}" @@ -4490,13 +4491,6 @@ 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 @@ -5515,6 +5509,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 @@ -5988,6 +5983,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 diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index ce4852a..2cdda87 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -20,6 +20,9 @@ build-all: multiboot.bin linuxboot.bin kvmvapic.bin # suppress auto-removal of intermediate files .SECONDARY: +%.o: %.S + $(call quiet-command,$(CPP) $(QEMU_INCLUDES) $(QEMU_DGFLAGS) $(CFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@," AS $(TARGET_DIR)$@") + %.img: %.o $(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -Ttext 0 -e _start -s -o $@ $<," Building $(TARGET_DIR)$@") diff --git a/rules.mak b/rules.mak index 7d7d83b..ed8e482 100644 --- a/rules.mak +++ b/rules.mak @@ -69,7 +69,7 @@ LINK = $(call quiet-command, $(LINKPROG) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $(version-obj-y) $(call extract-libs,$1) $(LIBS)," LINK $(TARGET_DIR)$@") %.o: %.S - $(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") + $(call quiet-command,$(CCAS) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CCAS $(TARGET_DIR)$@") %.o: %.cc $(call quiet-command,$(CXX) $(QEMU_INCLUDES) $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) -c -o $@ $<," CXX $(TARGET_DIR)$@")