From f4dba935fc9aa5ec89084f9d21c5f610d4f7138e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Wed, 10 Oct 2012 11:00:27 +0200
Subject: update mutlilib support for mips
---
toolchain/eglibc/Makefile | 6 +++---
toolchain/eglibc/Makefile.multilib | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'toolchain/eglibc')
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 3529d9124..9658744cc 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -48,7 +48,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
); \
touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs.h; \
- touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64}.h; \
+ touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h; \
done
touch $@
else
@@ -76,7 +76,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
);
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
- touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+ touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
touch $@
endif
@@ -135,7 +135,7 @@ ifeq ($(ADK_TARGET_ABI_X32),y)
${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-x32 install_root=$(STAGING_TARGET_DIR) install
endif
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
- touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+ touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
# for libgcc build we need C library files, 64 bit default
mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2 ; \
$(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \
diff --git a/toolchain/eglibc/Makefile.multilib b/toolchain/eglibc/Makefile.multilib
index 517fbed26..5066aecbc 100644
--- a/toolchain/eglibc/Makefile.multilib
+++ b/toolchain/eglibc/Makefile.multilib
@@ -25,10 +25,10 @@ endif
endif
ifeq ($(ADK_TARGET_MULTILIB_MIPS_O32),y)
ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:o32
+TABI+=mips64el-openadk-linux-gnu:32
TCFLAGS:=-mabi=
else
-TABI+=mips64-openadk-linux-gnu:o32
+TABI+=mips64-openadk-linux-gnu:32
TCFLAGS:=-mabi=
endif
endif
--
cgit v1.2.3