From b83f7deb78fbc440a42db47eaa0605e116d9d28e Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick@georgi-clan.de>
Date: Sat, 17 May 2014 14:20:11 +0200
Subject: [PATCH] build: get rid of a special case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't call things in xcompile i386 and in the
buildsystem x86_32 and then bridge things so
they match. just call it the same everywhere.

Change-Id: Ieef5f03f7aafb0b0a606fbe5a2386e310d2b0e94
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/5766
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 toolchain.inc          | 3 ---
 util/xcompile/xcompile | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/toolchain.inc b/toolchain.inc
index dca00fc6e3..f666e0cc52 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -81,9 +81,6 @@ init_standard_toolchain = \
 init_stages = \
 	    $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(eval $(call init_standard_toolchain,$(stage))))
 
-# This mapping is created to have consistency with xcompile naming
-$(eval $(call create_class_compiler,x86_32,i386))
-
 $(eval $(call toolchain_to_dir))
 
 $(call init_stages)
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 0ac2bec942..b342de308f 100644
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -181,7 +181,7 @@ arch_config_aarch64() {
 }
 
 arch_config_x86() {
-	TARCH="i386"
+	TARCH="x86_32"
 	TBFDARCH="i386"
 	TCLIST="i386 x86_64"
 	TWIDTH="32"