From 12fa8c0f0d960ad8e5d9c199a77e3c480cd605d4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Sun, 13 Oct 2013 17:48:12 +0200
Subject: remove multilib experimental stuff

---
 toolchain/gcc/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'toolchain/gcc/Makefile')

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index d09264718..deef63a5c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -33,11 +33,16 @@ else
 GCC_CONFOPTS+=		--disable-sjlj-exceptions
 endif
 
+ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),)
+GCC_CONFOPTS+=		--disable-biarch --disable-multilib
+endif
 ifeq ($(ADK_LINUX_SH),y)
 GCC_CONFOPTS+=		--with-multilib-list=m4,m4-nofpu
-else
-GCC_CONFOPTS+=		--disable-biarch \
-			--disable-multilib
+endif
+ifeq ($(ADK_LINUX_X86_64),y)
+ifeq ($(ADK_x32),y)
+GCC_CONFOPTS+=		--with-multilib-list=mx32
+endif
 endif
 
 ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y)
-- 
cgit v1.2.3