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
---
target/config/Config.in | 69 ---------------------------
toolchain/eglibc/Makefile | 97 --------------------------------------
toolchain/eglibc/Makefile.multilib | 47 ------------------
toolchain/gcc/Makefile | 11 +++--
toolchain/glibc/Makefile | 87 ----------------------------------
toolchain/glibc/Makefile.multilib | 16 -------
6 files changed, 8 insertions(+), 319 deletions(-)
delete mode 100644 toolchain/eglibc/Makefile.multilib
delete mode 100644 toolchain/glibc/Makefile.multilib
diff --git a/target/config/Config.in b/target/config/Config.in
index 15981617e..f8f59eabf 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -93,21 +93,17 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64
config ADK_TARGET_ABI_64
boolean "64 Bit ABI"
select ADK_64
- select ADK_TARGET_MULTILIB_X86_64 if ADK_TARGET_WITH_MULTILIB
config ADK_TARGET_ABI_X32
boolean "x32 ABI (new)"
select ADK_x32
- select ADK_TARGET_MULTILIB_X86_X32 if ADK_TARGET_WITH_MULTILIB
config ADK_TARGET_ABI_32
boolean "32 Bit ABI"
select ADK_32
- select ADK_TARGET_MULTILIB_X86_32 if ADK_TARGET_WITH_MULTILIB
endchoice
-# multilib support
config ADK_TARGET_LIBC_PATH
string
default "lib32" if ADK_n32
@@ -120,71 +116,6 @@ config ADK_TARGET_LIBC_PATH
default "lib"
-menu "Target multilib support"
-depends on ADK_TARGET_DISABLED && \
- ( ADK_LINUX_X86_64 || ADK_LINUX_MIPS ) && \
- ( ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC )
-
-config ADK_TARGET_WITH_MULTILIB
- boolean "multilib support"
-
-config ADK_TARGET_MULTILIB_MIPS_64
- boolean "64 bit libraries (n64 abi)"
- depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB
- default y if ADK_n64
-
-config ADK_TARGET_MULTILIB_MIPS_N32
- boolean "32 bit libraries (n32 abi)"
- depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB
- default y if ADK_n32
-
-config ADK_TARGET_MULTILIB_MIPS_O32
- boolean "32 bit libraries (o32 abi)"
- depends on ADK_LINUX_MIPS && ADK_TARGET_WITH_MULTILIB
- default y if ADK_o32
-
-config ADK_TARGET_MULTILIB_X86_64
- boolean "64 bit libraries"
- depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
- default y if ADK_64
-
-config ADK_TARGET_MULTILIB_X86_32
- boolean "32 bit libraries"
- depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
- default y if ADK_32
-
-config ADK_TARGET_MULTILIB_X86_X32
- boolean "x32 bit libraries"
- depends on ADK_LINUX_X86_64 && ADK_TARGET_WITH_MULTILIB
- default y if ADK_x32
-
-config ADK_MULTILIB_TARGET
- string
- default "m32" if ADK_TARGET_MULTILIB_X86_32 \
- && !ADK_TARGET_MULTILIB_X86_64 \
- && !ADK_TARGET_MULTILIB_X86_X32
- default "m64" if !ADK_TARGET_MULTILIB_X86_32 \
- && ADK_TARGET_MULTILIB_X86_64 \
- && !ADK_TARGET_MULTILIB_X86_X32
- default "x32" if !ADK_TARGET_MULTILIB_X86_32 \
- && !ADK_TARGET_MULTILIB_X86_64 \
- && ADK_TARGET_MULTILIB_X86_X32
- default "m32,m64" if ADK_TARGET_MULTILIB_X86_32 \
- && ADK_TARGET_MULTILIB_X86_64 \
- && !ADK_TARGET_MULTILIB_X86_X32
- default "mx32,m64" if !ADK_TARGET_MULTILIB_X86_32 \
- && ADK_TARGET_MULTILIB_X86_64 \
- && ADK_TARGET_MULTILIB_X86_X32
- default "m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \
- && !ADK_TARGET_MULTILIB_X86_64 \
- && ADK_TARGET_MULTILIB_X86_X32
- default "m64,m32,mx32" if ADK_TARGET_MULTILIB_X86_32 \
- && ADK_TARGET_MULTILIB_X86_64 \
- && ADK_TARGET_MULTILIB_X86_X32
-
-
-endmenu
-
# submodel support
#
choice
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 76b09237d..b9be77579 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -4,7 +4,6 @@
include $(TOPDIR)/rules.mk
include ../rules.mk
include Makefile.inc
-include Makefile.multilib
include ${TOPDIR}/mk/buildhlp.mk
# ssp partially supported
@@ -17,36 +16,6 @@ endif
EGLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
EGLIBC_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 $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
- $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
- $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}/option-groups.config; \
- (cd $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
- ${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc ${TCFLAGS}$${abi/*:/}" \
- $(WRKBUILD)/libc/configure \
- --prefix=$(STAGING_TARGET_DIR)-$${abi/*:/}/usr \
- --with-headers=$(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include \
- --host=$${abi/:*/} \
- ${EGLIBC_CONFOPTS} \
- ); \
- done
- touch $@
-
-$(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
- for abi in $(TABI); do \
- (cd $(EGLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \
- ${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc ${TCFLAGS}$${abi/*:/}" \
- $(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,o32,n32}.h; \
- done
- touch $@
-else
$(WRKBUILD)/.headers_configure:
mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
@@ -71,7 +40,6 @@ $(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,o32,n32,soft,hard}.h
touch $@
-endif
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
EGLIBC_ENV+= libc_cv_ssp=yes
@@ -79,56 +47,6 @@ else
EGLIBC_ENV+= libc_cv_ssp=no
endif
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-$(WRKBUILD)/.configured:
- for abi in $(TABI); do \
- mkdir -p $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/} ;\
- $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
- $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/}/option-groups.config ;\
- (cd $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/}; \
- ${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc ${TCFLAGS}$${abi/*:/}" \
- $(WRKBUILD)/libc/configure \
- --prefix=/usr \
- --enable-shared \
- --enable-stackguard-randomization \
- --host=$${abi/:*/} \
- ${EGLIBC_CONFOPTS} \
- ); \
- done
- touch $@
-
-$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
- for abi in $(TABI); do \
- ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/} cross-compiling=yes all ;\
- done
- touch $@
-
-$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
- for abi in $(TABI); do \
- ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/} install_root=$(STAGING_TARGET_DIR)-$${abi/*:/} install ;\
- done
- # default libgcc searching for 64 bit libraries
- ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_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,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/* \
- $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/; \
- rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/libc.so ; \
- 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
- ${INSTALL_DIR} ${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 $(EGLIBC_BUILD_DIR_FINAL)
$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
@@ -161,23 +79,8 @@ $(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so
${INSTALL_DATA} ${WRKBUILD}/libc/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/
${INSTALL_DATA} ${WRKBUILD}/libc/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
diff --git a/toolchain/eglibc/Makefile.multilib b/toolchain/eglibc/Makefile.multilib
deleted file mode 100644
index 825f5d63d..000000000
--- a/toolchain/eglibc/Makefile.multilib
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-# multilib support
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-TABI:=
-TCFLAGS:=
-ifeq ($(ADK_TARGET_MULTILIB_X86_X32),y)
-TABI+=x86_64-openadk-linux-gnu:x32
-TCFLAGS:=-m
-endif
-ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
-TABI+=i486-openadk-linux-gnu:32
-TCFLAGS:=-m
-endif
-ifeq ($(ADK_TARGET_MULTILIB_X86_64),y)
-TABI+=x86_64-openadk-linux-gnu:64
-TCFLAGS:=-m
-endif
-ifeq ($(ADK_TARGET_MULTILIB_MIPS_N32),y)
-ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:n32
-TCFLAGS:=-mabi=
-else
-TABI+=mips64-openadk-linux-gnu:n32
-TCFLAGS:=-mabi=
-endif
-endif
-ifeq ($(ADK_TARGET_MULTILIB_MIPS_O32),y)
-ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:32
-TCFLAGS:=-mabi=
-else
-TABI+=mips64-openadk-linux-gnu:32
-TCFLAGS:=-mabi=
-endif
-endif
-ifeq ($(ADK_TARGET_MULTILIB_MIPS_64),y)
-ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:64
-TCFLAGS:=-mabi=
-else
-TABI+=mips64-openadk-linux-gnu:64
-TCFLAGS:=-mabi=
-endif
-endif
-endif
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)
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
diff --git a/toolchain/glibc/Makefile.multilib b/toolchain/glibc/Makefile.multilib
deleted file mode 100644
index 47cc0ff99..000000000
--- a/toolchain/glibc/Makefile.multilib
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-# multilib support
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-TABI:=
-ifeq ($(ADK_TARGET_MULTILIB_X86_X32),y)
-TABI+=x86_64-openadk-linux-gnu:x32
-endif
-ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
-TABI+=i486-openadk-linux-gnu:32
-endif
-ifeq ($(ADK_TARGET_MULTILIB_X86_64),y)
-TABI+=x86_64-openadk-linux-gnu:64
-endif
-endif
--
cgit v1.2.3
From 207c4a9d3760ffbd97e117a63a4bce4c0a6b7bd7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Sun, 13 Oct 2013 19:57:47 +0200
Subject: update raspberry-pi firmware, allow userland to be build with
musl/uclibc
---
package/bcm2835-firmware/Makefile | 5 +++--
package/bcm2835-vc/Makefile | 3 ---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile
index 565064dda..76735591e 100644
--- a/package/bcm2835-firmware/Makefile
+++ b/package/bcm2835-firmware/Makefile
@@ -4,9 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bcm2835-firmware
-PKG_VERSION:= 0.3
+# actually 5113ce63be622e50c1b3ec309798e5d091d219ac from 12.10.2013
+PKG_VERSION:= 0.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= c05d3ceac71e884a95d7731cc2b5f39f
+PKG_MD5SUM:= 6f6a186ac50ddcb1a9abe8c4d4432b92
PKG_DESCR:= firmware for raspberry pi (bcm2835)
PKG_SECTION:= base
PKG_SITES:= http://openadk.org/distfiles/
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index 1251ce8d3..d0a398942 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -13,11 +13,8 @@ PKG_SECTION:= base
PKG_DEPENDS:= libpthread
PKG_SITES:= http://openadk.org/distfiles/
-PKG_LIBC_DEPENDS:= eglibc glibc
PKG_SYSTEM_DEPENDS:= raspberry-pi
-PKG_SUBPKGS:= BCM2835_VC
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
--
cgit v1.2.3
From 31a7ebfe6564e382e9e125dd714678bb91977de7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 14 Oct 2013 10:11:05 +0200
Subject: remove Makefile.multilib reference
---
package/eglibc/Makefile | 1 -
package/glibc/Makefile | 1 -
2 files changed, 2 deletions(-)
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 3261ba314..98c6b2de9 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -3,7 +3,6 @@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/toolchain/eglibc/Makefile.inc
-include $(TOPDIR)/toolchain/eglibc/Makefile.multilib
PKG_DESCR:= embedded GNU C library
PKG_SECTION:= base
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 7f0a1f8c7..a03a5c8bd 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -7,7 +7,6 @@ TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
include $(TOPDIR)/toolchain/glibc/Makefile.inc
-include $(TOPDIR)/toolchain/glibc/Makefile.multilib
PKG_DESCR:= GNU C library
PKG_SECTION:= base
--
cgit v1.2.3
From 7ac44464b06ec9a796fd10cdcd8b9996e7400520 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 14 Oct 2013 11:19:25 +0200
Subject: fix md5sum
---
package/bcm2835-firmware/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile
index 76735591e..f88910535 100644
--- a/package/bcm2835-firmware/Makefile
+++ b/package/bcm2835-firmware/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= bcm2835-firmware
# actually 5113ce63be622e50c1b3ec309798e5d091d219ac from 12.10.2013
PKG_VERSION:= 0.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6f6a186ac50ddcb1a9abe8c4d4432b92
+PKG_MD5SUM:= e7f4caa11f26d5af07ae45128b2ac328
PKG_DESCR:= firmware for raspberry pi (bcm2835)
PKG_SECTION:= base
PKG_SITES:= http://openadk.org/distfiles/
--
cgit v1.2.3
From e0bc31d6aeddd5cae6dd5f4726defb2370d7df26 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 14 Oct 2013 11:50:48 +0200
Subject: disable cris for now, problem with toolchain building, enable qemu
for autobuilder
---
mk/build.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mk/build.mk b/mk/build.mk
index 2251f499c..2e774a7ae 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -578,9 +578,9 @@ bulktoolchain:
# build all target architecture, target systems and libc combinations
bulk:
- for libc in uclibc eglibc glibc;do \
+ for libc in uclibc eglibc glibc musl;do \
while read arch; do \
- systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu); \
+ systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \
for system in $$systems;do \
mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
( \
@@ -598,7 +598,7 @@ bulk:
bulkall:
for libc in uclibc eglibc glibc musl;do \
while read arch; do \
- systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
+ systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \
for system in $$systems;do \
mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
( \
@@ -616,7 +616,7 @@ bulkall:
bulkallmod:
for libc in uclibc eglibc glibc musl;do \
while read arch; do \
- systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
+ systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \
for system in $$systems;do \
mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
( \
--
cgit v1.2.3