From patchwork Sat Jul 30 23:02:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 1023102 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 p6UN2axE016906 for ; Sat, 30 Jul 2011 23:02:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751857Ab1G3XCc (ORCPT ); Sat, 30 Jul 2011 19:02:32 -0400 Received: from casper.infradead.org ([85.118.1.10]:60203 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806Ab1G3XCc (ORCPT ); Sat, 30 Jul 2011 19:02:32 -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 1QnIXq-0008HN-3t; Sat, 30 Jul 2011 23:02:30 +0000 Subject: [PATCH 3/5] um: Always use -m32 when building for 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:02:08 +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: <1312066930.22074.54.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:37 +0000 (UTC) If the compiler doesn't understand it, cc-option will deal with that. Signed-off-by: David Woodhouse --- arch/um/Makefile-i386 | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 75b3309..d65e316 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 @@ -11,16 +11,12 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S HEADER_ARCH := x86 CHECKFLAGS += -D__i386__ -ifeq ("$(origin SUBARCH)", "command line") -ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)") KBUILD_CFLAGS += $(call cc-option,-m32) KBUILD_AFLAGS += $(call cc-option,-m32) LINK-y += $(call cc-option,-m32) UML_OBJCOPYFLAGS += -F $(ELF_FORMAT) export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS -endif -endif # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. include $(srctree)/arch/x86/Makefile_32.cpu