remove multilib experimental stuff

1 files changed, 0 insertions, 87 deletions

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index f8f0080fc..306927fc6 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -12,10 +12,8 @@ endif
 
 # ssp partially supported
 TARGET_CFLAGS:=	$(filter-out -fstack-protector,$(TARGET_CFLAGS))
-#TARGET_CFLAGS:=	$(filter-out -flto,$(TARGET_CFLAGS))
 
 include Makefile.inc
-include Makefile.multilib
 include ${TOPDIR}/mk/buildhlp.mk
 
 ifeq ($(ADK_TARGET_NO_FPU),y)
@@ -30,32 +28,6 @@ endif
 GLIBC_BUILD_DIR_INITIAL:=	${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-$(WRKBUILD)/.headers_configure: 
-	for abi in $(TABI); do \
-		mkdir -p $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
-		(cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
-			${GLIBC_ENV} \
-			CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \
-			$(WRKBUILD)/configure \
-				--prefix=$(STAGING_TARGET_DIR)-$${abi/*:/}/usr \
-				--with-sysroot=$(STAGING_TARGET_DIR)-$${abi/*:/} \
-				--host=$${abi/:*/} \
-				${GLIBC_CONFOPTS} \
-		); \
-	done
-	touch $@
-
-$(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
-	for abi in $(TABI); do \
-		(cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
-			${GLIBC_ENV} \
-			CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \
-			$(MAKE) ${GLIBC_MAKEOPTS} install-headers \
-		); \
-	done
-	touch $@
-else
 $(WRKBUILD)/.headers_configure:
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
@@ -75,51 +47,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h
 	touch $@
-endif
 
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-$(WRKBUILD)/.configured:
-	for abi in $(TABI); do \
-		mkdir -p $(GLIBC_BUILD_DIR_FINAL)-$${abi/*:/} ;\
-		(cd $(GLIBC_BUILD_DIR_FINAL)-$${abi/*:/}; \
-			${GLIBC_ENV} \
-			CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \
-			$(WRKBUILD)/configure \
-				--prefix=/usr \
-				--enable-shared \
-				--enable-stackguard-randomization \
-				--host=$${abi/:*/} \
-				${GLIBC_CONFOPTS} \
-		); \
-	done
-	touch $@
-
-$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	for abi in $(TABI); do \
-		${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_FINAL)-$${abi/*:/} all ;\
-	done
-	touch $@
-
-$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
-	for abi in $(TABI); do \
-		${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL)-$${abi/*:/} install_root=$(STAGING_TARGET_DIR)-$${abi/*:/} install ;\
-	done
-	# default libgcc searching for 64 bit libraries
-	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h
-	for abi in $(TABI); do \
-		mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \
-		$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \
-			$(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \
-		rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/}/libc.so ; \
-	done
-	mkdir -p ${STAGING_TARGET_DIR}/etc
-	${INSTALL_DATA} ${WRKBUILD}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/
-	${INSTALL_DATA} ${WRKBUILD}/libc/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/
-	${INSTALL_DATA} ${WRKBUILD}/libc/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/
-	touch $@
-else
 $(WRKBUILD)/.configured:
 	mkdir -p $(GLIBC_BUILD_DIR_FINAL)
 	(cd $(GLIBC_BUILD_DIR_FINAL); \
@@ -143,23 +71,8 @@ $(WRKBUILD)/.installed:
 	${INSTALL_DATA} ${WRKBUILD}/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc
 	${INSTALL_DATA} ${WRKBUILD}/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc
 	touch $@
-endif
 
 $(WRKBUILD)/.fixup:
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-ifeq ($(ADK_TARGET_ABI_64),y)
-	${CP} $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)/lib
-	${CP} $(STAGING_TARGET_DIR)-64/usr/lib/* $(STAGING_TARGET_DIR)/usr/lib
-endif
-ifeq ($(ADK_TARGET_ABI_32),y)
-	${CP} $(STAGING_TARGET_DIR)-32/lib/* $(STAGING_TARGET_DIR)/lib
-	${CP} $(STAGING_TARGET_DIR)-32/usr/lib/* $(STAGING_TARGET_DIR)/usr/lib
-endif
-ifeq ($(ADK_TARGET_ABI_X32),y)
-	${CP} $(STAGING_TARGET_DIR)-x32/lib/* $(STAGING_TARGET_DIR)/lib
-	${CP} $(STAGING_TARGET_DIR)-x32/usr/lib/* $(STAGING_TARGET_DIR)/usr/lib
-endif
-endif
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk