From patchwork Wed Nov 28 01:38:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 202350 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 25C302C0086 for ; Wed, 28 Nov 2012 12:40:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 68A494A155; Wed, 28 Nov 2012 02:39:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dEnhuI7wVjlC; Wed, 28 Nov 2012 02:39:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 38B5E4A09D; Wed, 28 Nov 2012 02:39:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BE7F74A09D for ; Wed, 28 Nov 2012 02:39:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kM9o0F2c7WHw for ; Wed, 28 Nov 2012 02:39:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-vb0-f74.google.com (mail-vb0-f74.google.com [209.85.212.74]) by theia.denx.de (Postfix) with ESMTPS id 9B9994A09F for ; Wed, 28 Nov 2012 02:39:15 +0100 (CET) Received: by mail-vb0-f74.google.com with SMTP id s24so1559307vbi.3 for ; Tue, 27 Nov 2012 17:39:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=MFl5OuPTiB92KWUM1RJHfYWQKic5wPknNTAtD5UJSWY=; b=ZoFSzvAjA6hovWWfFRXMOU0GA0OewKyO9LBarNWTw2kwy+SnFJYNV/CGZsqKqOwIKc 3wMJE+xYvOZgdbsk702cMk69p6QDBS/erCMQspWQCYSV83ty9MU4lWf+DdZXPzJ/lJ2r 9xP2YXTzPr1jun5/D3o1tnXzO5GbhVQI4rj+38he4N2ZQY2ziyTZJiSZQoRQ6wjVR9Np qo6qM8tU5qGahsSUBnoiz5caBlMwpWZwqSeSP3BVm76H5yFiIFIO9N89CwlchdlCXIB2 gqLslaZgFbR//7BVASvgncTXeSzBE6oMnSE8fqWChRAE9Xi0HbwbQ+vRqlTwIDn7ATHm nD7g== Received: by 10.101.107.14 with SMTP id j14mr2931671anm.16.1354066752898; Tue, 27 Nov 2012 17:39:12 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id r10si775349ann.1.2012.11.27.17.39.12 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 27 Nov 2012 17:39:12 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id B6E25100047; Tue, 27 Nov 2012 17:39:12 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 52DD0160795; Tue, 27 Nov 2012 17:39:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Tue, 27 Nov 2012 17:38:34 -0800 Message-Id: <1354066718-1482-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 X-Gm-Message-State: ALoCoQl3XVmLBFpIPXrXXWVff3SaY/r+CSGlTN6wJ+TaQ60zMS6YFHPeP9CUGfq1UsbBBpLVYipmyK9JeyPDlcXI4HfMSpytqT5rz1O4FjYwHl+h58d14NyAPTZ2f1pVBSZhoSKTK6/LzA96zR1A0T6nIG28i7L4/+Y/YvOEtQzaekX/zUHRVOhyQkD6fxNyJxEwSxacDCcB Subject: [U-Boot] [PATCH 1/5] x86: Fix compilation on 64-bit build machines X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Graeme Russ Signed-off-by: Graeme Russ Signed-off-by: Simon Glass --- Makefile | 1 + arch/x86/cpu/config.mk | 3 ++- examples/standalone/Makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1a17be9..2ad5cc5 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ VERSION_FILE = $(obj)include/generated/version_autogenerated.h HOSTARCH := $(shell uname -m | \ sed -e s/i.86/x86/ \ + -e s/x86_64/x86/ \ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ \ -e s/sa110/arm/ \ diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index c00f867..092de68 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -23,7 +23,8 @@ CROSS_COMPILE ?= i386-linux- -PLATFORM_CPPFLAGS += -DCONFIG_X86 -D__I386__ -march=i386 -Werror +PLATFORM_CPPFLAGS += -DCONFIG_X86 -D__I386__ -march=i386 -Werror -m32 +PLATFORM_LDFLAGS += -m elf_i386 # DO NOT MODIFY THE FOLLOWING UNLESS YOU REALLY KNOW WHAT YOU ARE DOING! LDPPFLAGS += -DRESET_SEG_START=0xffff0000 diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index baaa2fb..7c1ea5c 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -98,7 +98,7 @@ $(ELF): $(obj)%: $(obj)%.o $(LIB) $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \ -o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ - -L$(gcclibdir) -lgcc + -L$(USE_PRIVATE_LIBGCC) -lgcc $(SREC): $(obj)%.srec: $(obj)%