From patchwork Sun Apr 29 12:00:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Russ X-Patchwork-Id: 155727 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 A198EB6FE5 for ; Sun, 29 Apr 2012 22:02:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7CCF72828E; Sun, 29 Apr 2012 14:02:35 +0200 (CEST) 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 JrmKOdhv8pSG; Sun, 29 Apr 2012 14:02:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 640C4282A7; Sun, 29 Apr 2012 14:02:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BEAE7281FD for ; Sun, 29 Apr 2012 14:02:18 +0200 (CEST) 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 4aQhAAelFf0k for ; Sun, 29 Apr 2012 14:02:17 +0200 (CEST) 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-pz0-f49.google.com (mail-pz0-f49.google.com [209.85.210.49]) by theia.denx.de (Postfix) with ESMTPS id A6DE52828A for ; Sun, 29 Apr 2012 14:02:14 +0200 (CEST) Received: by dadq36 with SMTP id q36so2601919dad.22 for ; Sun, 29 Apr 2012 05:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/WQTLkE5XmwxCeogg1ZkG5RmfqJGlt3fTVZUH1de9mE=; b=GlwqWfuR4p0oGpYu8+Me3fzGlMpUAXC24UKXgRdET9V796oDkp+wvyoyR9rdeXrSaA HSSBHDSq66Uk0WuCgnj6b9PMBbFWY3OSXGJpG4NbbvxbaXNjXfmXClYBS1zxDDuZlzoX WluUAKMrKNBBdVSs0Ud/9j2YDUWd/VuI6hKEncloOP7t0PXF6LRim1bgze4OZ7Va/TKR cqFf/dsqVP7PhH3c9z7h1m0EhK3/sEAnfIqLWBpWjAm1Fe+0sFXLClXUF6/jgQE+B7QO KFGN4QqzKVdRP3gu6ONE6zuhBZPUs0Mgabvy+d5iTuEL/lx3uTCf90aPDCTuiTjA8hXW R5Lw== Received: by 10.68.195.163 with SMTP id if3mr39214204pbc.127.1335700931442; Sun, 29 Apr 2012 05:02:11 -0700 (PDT) Received: from dingo.localhost (d58-106-86-244.sbr801.nsw.optusnet.com.au. [58.106.86.244]) by mx.google.com with ESMTPS id pk5sm2625515pbb.68.2012.04.29.05.02.09 (version=SSLv3 cipher=OTHER); Sun, 29 Apr 2012 05:02:10 -0700 (PDT) From: Graeme Russ To: u-boot@lists.denx.de Date: Sun, 29 Apr 2012 22:00:19 +1000 Message-Id: <1335700823-15144-2-git-send-email-graeme.russ@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1335700823-15144-1-git-send-email-graeme.russ@gmail.com> References: <1335700823-15144-1-git-send-email-graeme.russ@gmail.com> Subject: [U-Boot] [PATCH 1/5] x86: Fix compilation on 64-built built 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 Signed-off-by: Graeme Russ --- 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 cdd4294..4f5cb60 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)%