From patchwork Sat Jul 30 23:01:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 1023072 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6UN22so016626 for ; Sat, 30 Jul 2011 23:02:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751433Ab1G3XCB (ORCPT ); Sat, 30 Jul 2011 19:02:01 -0400 Received: from casper.infradead.org ([85.118.1.10]:48819 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370Ab1G3XCA (ORCPT ); Sat, 30 Jul 2011 19:02:00 -0400 Received: from i7.infradead.org ([2001:8b0:10b:1:225:64ff:fee8:e9df]) by casper.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1QnIXd-0008Fu-PX; Sat, 30 Jul 2011 23:01:58 +0000 Subject: [PATCH 2/5] um: Remove gratuitous use of $(SUBARCH) in Makefile-i386 From: David Woodhouse To: Arnaud Lacombe Cc: "H. Peter Anvin" , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Date: Sun, 31 Jul 2011 00:01:23 +0100 In-Reply-To: <1312066693.22074.50.camel@i7.infradead.org> References: <1312066693.22074.50.camel@i7.infradead.org> X-Mailer: Evolution 3.0.2 (3.0.2-3.fc15) Message-ID: <1312066917.22074.52.camel@i7.infradead.org> Mime-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 30 Jul 2011 23:02:04 +0000 (UTC) If we're in Makefile-i386, we know what the target architecture is. Don't try to be cute. Signed-off-by: David Woodhouse --- arch/um/Makefile-i386 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 302cbe5..75b3309 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 @@ -5,8 +5,8 @@ TOP_ADDR := $(CONFIG_TOP_ADDR) START := 0x8048000 LDFLAGS += -m elf_i386 -ELF_ARCH := $(SUBARCH) -ELF_FORMAT := elf32-$(SUBARCH) +ELF_ARCH := i386 +ELF_FORMAT := elf32-i386 OBJCOPYFLAGS := -O binary -R .note -R .comment -S HEADER_ARCH := x86 CHECKFLAGS += -D__i386__