From patchwork Sat Jun 18 06:47:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9185439 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 D4E6C6075F for ; Sat, 18 Jun 2016 06:47:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADEA027D85 for ; Sat, 18 Jun 2016 06:47:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A03A92835E; Sat, 18 Jun 2016 06:47:40 +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 D2F0527D85 for ; Sat, 18 Jun 2016 06:47:39 +0000 (UTC) Received: from localhost ([::1]:33371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEA2Y-0002Kt-Ci for patchwork-qemu-devel@patchwork.kernel.org; Sat, 18 Jun 2016 02:47:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEA2K-0002Kb-40 for qemu-devel@nongnu.org; Sat, 18 Jun 2016 02:47:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bEA2F-0000MS-UU for qemu-devel@nongnu.org; Sat, 18 Jun 2016 02:47:19 -0400 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]:35537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEA2F-0000MM-NN for qemu-devel@nongnu.org; Sat, 18 Jun 2016 02:47:15 -0400 Received: by mail-pa0-x242.google.com with SMTP id hf6so7098973pac.2 for ; Fri, 17 Jun 2016 23:47:15 -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=XoymHXZa95oszuPynno1y7Izxatrrpe4dbh8822hrs8=; b=KkWgmOoOqCa8cICVJOFdwU6d6y8yQUl516OMSFQPCfE+T2X+VOL3DqfrmSKP3jzMK7 jfX3NFDTdm0SbPd+kA1hNkhu0EH0zC1ksJi2wNU1BIrM5ifSEqEBQfFjj0mlvEIMxLJn rRWaXSpvz4oqfZ+h9a6CzwpGccK4nZZQ/g6aBBLFMr9lB3bn9uyw2uZuHTN9v3x/k2r4 r75BkmiwFOIW7bhS9ClDeLhwwRc/cdyFpPUkE/3QJA1yZr63Pa72/FJxa0dPYm8tPAXx ujFxOIxpqSOxbBmd2/qd9t8ZdD2yaR1OnV0bKU7UmQjvnGslWdHDXbs+Frw/Um6ptCbK UOxw== 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=XoymHXZa95oszuPynno1y7Izxatrrpe4dbh8822hrs8=; b=A4fmIBTVEtMU5OGmYOLvPkKrP1scy4rhQr/CWGjg3VnkzBUJbW/bSoTGkd3Uic1PMz 8fZY6T3MynsygyxX6XkXUQjWbHHabWCNBIkBlWPIHYefrdtHzc5AOFwWroBKcWalZje4 V7hnfM77s7+LdBV3KT7VqyNe0H1dc0O1U9OtjfoRSKB//i5HDiCn9k1o0B2+9KqQ+ttM GVUajtGcL7B7w7xzgZg8OEwEaTcTHeDLI7fA0MEOvExtOpg18dV1qPFyMA/ibSiJQ07p nZqino5d9enspA6dKUESezJblZ/rVgIQsn4D4jWtF4funf1lx7D95Q/FVZSGolO+gPzc EEvQ== X-Gm-Message-State: ALyK8tIvBw6FOAW5ryub7XD4FngLsLA9mDqvNnFJDYZpmx/lTENCF5c0sbKUXcbFuY+/tA== X-Received: by 10.66.22.134 with SMTP id d6mr7248948paf.35.1466232434232; Fri, 17 Jun 2016 23:47:14 -0700 (PDT) Received: from pike.twiddle.net (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id wt6sm72920818pab.3.2016.06.17.23.47.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Jun 2016 23:47:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 17 Jun 2016 23:47:12 -0700 Message-Id: <1466232432-27513-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:400e:c03::242 Subject: [Qemu-devel] [PATCH] build: Use $(CC) 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. This fixes e.g. ../configure --cpu=i686, but would also be required for ppc and sparc. Signed-off-by: Richard Henderson --- rules.mak | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rules.mak b/rules.mak index 72c5955..f16598b 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,$(CC) $(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)$@")