Merge branch 'master' of openadk.org:/git/openadk

mk/build.mk

@@ -26,7 +26,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_INSTALLER=n \
 			ADK_PACKAGE_CXXTOOLS_DEV=n \
 			ADK_PACKAGE_XORG_SERVER_DEV=n \
-			ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -39,9 +38,8 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_CRYPTINIT=n \
-			ADK_PACKAGE_HEIMDAL=n \
+			ADK_PACKAGE_HEIMDAL_SERVER=n \
 			ADK_PACKAGE_LIBHEIMDAL=n \
-			ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
 			ADK_PACKAGE_PAM=n \
 			ADK_PACKAGE_PYTHON=n \
 			ADK_PACKAGE_VIRTINST=n \
@@ -578,9 +576,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 +596,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 +614,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; \
 	    ( \

package/alsa-lib/Makefile

@@ -24,8 +24,7 @@ $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG
 $(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV}))
 
 TARGET_CPPFLAGS+=	-D_POSIX_C_SOURCE=1
-CONFIGURE_ARGS+=	--disable-python \
-			--without-versioned
+CONFIGURE_ARGS+=	--disable-python
 
 alsa-lib-install:
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa

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:=		e7f4caa11f26d5af07ae45128b2ac328
 PKG_DESCR:=		firmware for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/

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}))
@@ -25,7 +22,7 @@ $(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},$
 CONFIG_STYLE:=          manual
 
 do-configure:
-	(cd $(WRKBUILD) && cmake .)
+	(cd $(WRKBUILD) && cmake -DCMAKE_SYSTEM_NAME=Linux .)
 
 bcm2835-vc-install:
 	$(INSTALL_DIR) ${IDIR_BCM2835_VC}/opt/vc/{bin,lib}

package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h

@@ -0,0 +1,12 @@
+--- bcm2835-vc-0.3.orig/interface/vcos/pthreads/vcos_platform.h	2013-09-27 14:22:08.000000000 +0200
++++ bcm2835-vc-0.3/interface/vcos/pthreads/vcos_platform.h	2013-10-13 20:20:55.000000000 +0200
+@@ -120,9 +120,6 @@ typedef struct
+ 
+ #define VCOS_ONCE_INIT        PTHREAD_ONCE_INIT
+ 
+-#if defined(__arm__) && !defined(_HAVE_TIMER_T) && !defined(ANDROID)
+-typedef __timer_t timer_t;
+-#endif
+ typedef struct VCOS_TIMER_T
+ {
+    pthread_t thread;                      /**< id of the timer thread */

package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c

@@ -0,0 +1,11 @@
+--- bcm2835-vc-0.3.orig/interface/vcos/pthreads/vcos_pthreads.c	2013-09-27 14:22:08.000000000 +0200
++++ bcm2835-vc-0.3/interface/vcos/pthreads/vcos_pthreads.c	2013-10-14 19:44:50.000000000 +0200
+@@ -580,7 +580,7 @@ const char ** vcos_get_argv(void)
+  */
+ uint32_t _vcos_get_ticks_per_second(void)
+ {
+-   return HZ;
++   return 100;
+ }
+ 
+ VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control,

package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c

@@ -0,0 +1,22 @@
+--- bcm2835-vc-0.3.orig/interface/vmcs_host/linux/vcfilesys.c	2013-09-27 14:22:08.000000000 +0200
++++ bcm2835-vc-0.3/interface/vmcs_host/linux/vcfilesys.c	2013-10-14 20:10:02.000000000 +0200
+@@ -49,10 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <ctype.h>
+ #include <limits.h>
+ 
+-#if !defined(ANDROID) && !defined( __USE_FILE_OFFSET64 )
+-#error   "__USE_FILE_OFFSET64 isn't defined"
+-#endif
+-
+ #include "interface/vcos/vcos.h"
+ 
+ /* Some hackery to prevent a clash with the Linux type of the same name */
+@@ -916,7 +912,7 @@ int vc_hostfs_set_attr(const char *path,
+ 
+    if (pathbuf)
+    {
+-      __mode_t mode = 0;
++      mode_t mode = 0;
+       struct stat sb;
+ 
+       backslash_to_slash(pathbuf);

package/boost/Makefile

@@ -9,15 +9,14 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		gettext-tiny
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 
+PKG_ARCH_DEPENDS:=	!avr32
+
 DISTFILES:=		boost_1_54_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
-
 PKG_SUBPKGS:=		BOOST BOOST_DEV
 PKGSD_BOOST_DEV:=	boost header files
 PKGSC_BOOST_DEV:=	devel
@@ -61,6 +60,8 @@ CONFIGURE_ARGS += \
 	--build=$(GNU_HOST_NAME) \
 	--prefix=${WRKINST}/usr \
 
+CONFIGURE_ARGS+=--without-locale
+
 ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},)
 	CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib
 else

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

package/ffmpeg/Makefile

@@ -4,16 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.0.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		dd71a1baedb2daa3e4d21e0651daa918
+PKG_VERSION:=		2.0.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6c5cfed204d8a108325d1fc439ab734a
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread
 PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 
-PKG_ARCH_DEPENDS:=	!cris
+PKG_ARCH_DEPENDS:=	!avr32 !cris
 
 PKG_SUBPKGS:=		LIBFFMPEG FFSERVER FFPROBE FFMPEG
 #PKGSD_FFPLAY:=		ffmpeg based video player

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

package/libmad/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libmad
 PKG_VERSION:=		0.15.1b
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1be543bc30c56fb6bea1d7bf6a64e66c
 PKG_DESCR:=		An high-quality MPEG audio decoding library
 PKG_SECTION:=		libs
@@ -21,13 +21,13 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV}))
 
-#FIXME
-XAKE_FLAGS+=             GCC_HONOUR_COPTS=s
-
 FPM:=default
 ifeq (${ARCH},i386)
 FPM:=intel
 endif
+ifeq (${ARCH},arm)
+FPM:=arm
+endif
 # MIPS optimization is broken for gcc 4.4 (removed h constraint)
 #ifeq (${ARCH},mips)
 #FPM:=mips
@@ -41,7 +41,7 @@ pre-install:
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
 	${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig
 
-post-install:
+libmad-install:
 	${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/
 

package/libmpeg2/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libmpeg2
 PKG_VERSION:=		0.5.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		0f92c7454e58379b4a5a378485bbd8ef
 PKG_DESCR:=		MPEG-1 & -2 decoding library
 PKG_SECTION:=		libs

package/libmpeg2/patches/patch-configure

@@ -0,0 +1,11 @@
+--- libmpeg2-0.5.1.orig/configure	2008-07-18 16:41:54.000000000 +0200
++++ libmpeg2-0.5.1/configure	2013-10-14 15:39:35.000000000 +0200
+@@ -4722,7 +4722,7 @@ rm -f core conftest.err conftest.$ac_obj
+     { echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6; }
+     if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+-        OPT_CFLAGS="$TRY_CFLAGS"
++        OPT_CFLAGS=""
+     else
+         :
+     fi

package/libvpx/Makefile

@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libvpx
-PKG_VERSION:=		1.1.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		7ae163ac3196c79ec2f0904280078a45
+PKG_VERSION:=		1.2.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f8de058e6ba14555144583a2d031fe19
 PKG_DESCR:=		VP8/VP9 codec library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.webmproject.org/about/
 PKG_SITES:=		http://webm.googlecode.com/files/
 
-PKG_SYSTEM_DEPENDS:=	raspberry-pi sharp-zaurus ibm-x40 lemote-yeelong qemu-i686
+PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:=             ${PKG_NAME}-v${PKG_VERSION}.tar.bz2
 WRKDIST=		$(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}
@@ -22,6 +22,9 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		minimal
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
+CONFIGURE_ARGS+=	--target=armv5te-linux-gcc
+endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_ARGS+=	--target=armv6-linux-gcc
 endif
@@ -84,6 +87,10 @@ CONFIGURE_ARGS+=	--prefix=/usr \
 			--enable-shared
 ALL_TARGET:=
 
+post-extract:
+	chmod a+x $(WRKBUILD)/build/make/*.sh
+	chmod a+x $(WRKBUILD)/build/make/*.pl
+
 libvpx-install:
 	$(INSTALL_DIR) $(IDIR_LIBVPX)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libvpx.so* \

package/libvpx/patches/patch-build_make_configure_sh

@@ -1,6 +1,6 @@
---- libvpx-v0.9.7-p1.orig/build/make/configure.sh	2011-08-15 23:02:45.000000000 +0200
-+++ libvpx-v0.9.7-p1/build/make/configure.sh	2011-09-17 17:48:07.667986440 +0200
-@@ -287,7 +287,7 @@ check_cpp() {
+--- libvpx-v1.2.0.orig/build/make/configure.sh	2013-09-04 20:49:22.000000000 +0200
++++ libvpx-v1.2.0/build/make/configure.sh	2013-10-14 20:15:20.000000000 +0200
+@@ -305,7 +305,7 @@ check_cpp() {
  check_ld() {
      log check_ld "$@"
      check_cc $@ \

package/libx264/patches/patch-Makefile

@@ -0,0 +1,11 @@
+--- libx264-1.0.orig/Makefile	2013-10-10 22:45:04.000000000 +0200
++++ libx264-1.0/Makefile	2013-10-12 17:50:05.000000000 +0200
+@@ -118,7 +118,7 @@ endif
+ 
+ # NEON optims
+ ifeq ($(ARCH),ARM)
+-ifneq ($(AS),)
++ifneq ($(ASM),no)
+ ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
+           common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
+           common/arm/predict-a.S

package/libx264/patches/patch-configure

@@ -1,5 +1,5 @@
 --- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/configure	2013-10-11 11:33:39.000000000 +0200
++++ libx264-1.0/configure	2013-10-12 17:49:39.000000000 +0200
 @@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
  elif [ $ARCH = ARM ]; then
      # arm-gcc-4.2 produces incorrect output with -ffast-math
@@ -12,7 +12,15 @@
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264
+@@ -1125,6 +1125,7 @@ bindir=$bindir
+ libdir=$libdir
+ includedir=$includedir
+ ARCH=$ARCH
++ASM=$asm
+ SYS=$SYS
+ CC=$CC
+ CFLAGS=$CFLAGS
+@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264
  AR=$AR
  RANLIB=$RANLIB
  STRIP=$STRIP

package/libx264/patches/patch-configure.orig

@@ -1,5 +1,17 @@
 --- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/configure	2013-10-11 11:32:15.000000000 +0200
++++ libx264-1.0/configure	2013-10-11 11:33:39.000000000 +0200
+@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
+ elif [ $ARCH = ARM ]; then
+     # arm-gcc-4.2 produces incorrect output with -ffast-math
+     # and it doesn't save any speed anyway on 4.4, so disable it
+-    CFLAGS="-O3 -fno-fast-math $CFLAGS"
++    CFLAGS="-fno-fast-math $CFLAGS"
+ else
+-    CFLAGS="-O3 -ffast-math $CFLAGS"
++    CFLAGS="-ffast-math $CFLAGS"
+ fi
+ 
+ if cc_check '' -fno-tree-vectorize ; then
 @@ -1136,7 +1136,7 @@ LIBX264=$LIBX264
  AR=$AR
  RANLIB=$RANLIB

package/madplay/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6814b47ceaa99880c754c5195aa1aac1
 PKG_DESCR:=		MPEG audio player in fixed point
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libid3tag libmad
-PKG_BUILDDEP:=		libid3tag libmad
+PKG_DEPENDS:=		libid3tag libmad alsa-lib
+PKG_BUILDDEP:=		libid3tag libmad alsa-lib
 PKG_URL:=		http://www.underbit.com/products/mad
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mad/}  \
 			ftp://ftp.mars.org/pub/mpeg/
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--disable-debugging \
 			--without-libiconv-prefix \
 			--without-libintl-prefix \
 			--without-esd \
-			--without-alsa
+			--with-alsa
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MADPLAY}/usr/bin

package/mpd/Makefile

@@ -15,6 +15,8 @@ PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.17/
 
+PKG_ARCH_DEPENDS:=	!avr32
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR

target/arm/kernel.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.9 Kernel Configuration
+# Linux/arm 3.9.11 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -18,7 +18,6 @@ CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
@@ -33,8 +32,8 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openadk"
 CONFIG_SYSVIPC=y
@@ -77,8 +76,9 @@ CONFIG_TINY_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_STALL_COMMON is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_NAMESPACES is not set
@@ -163,7 +163,7 @@ CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_FREEZER=y
+# CONFIG_FREEZER is not set
 
 #
 # System Type
@@ -289,7 +289,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -326,7 +326,7 @@ CONFIG_CMDLINE=""
 #
 # At least one emulation must be selected
 #
-# CONFIG_VFP is not set
+CONFIG_VFP=y
 
 #
 # Userspace binary formats
@@ -341,19 +341,10 @@ CONFIG_COREDUMP=y
 #
 # Power management options
 #
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
+# CONFIG_SUSPEND is not set
 # CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_PM_CLK=y
-CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
+# CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_NET=y
 
 #
@@ -739,9 +730,9 @@ CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_FANOTIFY is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTACTL is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -789,7 +780,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_DETECT_HUNG_TASK is not set
-CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
@@ -967,7 +958,6 @@ CONFIG_CRYPTO_HW=y
 #
 # Library routines
 #
-CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -976,9 +966,8 @@ CONFIG_GENERIC_IO=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_T10DIF is not set
 # CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32 is not set
+# CONFIG_CRC32_SLICEBY8 is not set
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set

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

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

toolchain/eglibc/Makefile.multilib

@@ -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

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)

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

toolchain/glibc/Makefile.multilib

@@ -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

toolchain/kernel-headers/patches/3.9.11/cris-header.patch

@@ -1,27 +1,68 @@
+diff -Nur linux-3.9.11.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.9.11/arch/cris/include/arch-v10/arch/Kbuild
+--- linux-3.9.11.orig/arch/cris/include/arch-v10/arch/Kbuild	2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/arch/cris/include/arch-v10/arch/Kbuild	2013-10-14 11:02:43.000000000 +0200
+@@ -1 +1,5 @@
+ # CRISv10 arch
++header-y += ptrace.h
++header-y += user.h
++header-y += elf.h
++header-y += system.h
 diff -Nur linux-3.9.11.orig/arch/cris/include/asm/Kbuild linux-3.9.11/arch/cris/include/asm/Kbuild
 --- linux-3.9.11.orig/arch/cris/include/asm/Kbuild	2013-07-21 02:16:17.000000000 +0200
-+++ linux-3.9.11/arch/cris/include/asm/Kbuild	2013-10-11 21:26:30.000000000 +0200
-@@ -1,7 +1,6 @@
++++ linux-3.9.11/arch/cris/include/asm/Kbuild	2013-10-13 18:34:22.000000000 +0200
+@@ -1,9 +1,11 @@
  
 -header-y += arch-v10/
 -header-y += arch-v32/
 -
 +header-y += ../arch-v10/arch/
 +header-y += ../arch-v32/arch/
++header-y += elf.h
++header-y += user.h
  
  generic-y += clkdev.h
  generic-y += exec.h
+ generic-y += module.h
+ generic-y += trace_clock.h
++generic-y += user.h
 diff -Nur linux-3.9.11.orig/arch/cris/include/uapi/asm/Kbuild linux-3.9.11/arch/cris/include/uapi/asm/Kbuild
 --- linux-3.9.11.orig/arch/cris/include/uapi/asm/Kbuild	2013-07-21 02:16:17.000000000 +0200
-+++ linux-3.9.11/arch/cris/include/uapi/asm/Kbuild	2013-10-11 21:32:52.000000000 +0200
++++ linux-3.9.11/arch/cris/include/uapi/asm/Kbuild	2013-10-13 16:18:43.000000000 +0200
 @@ -1,8 +1,8 @@
  # UAPI Header export list
  include include/uapi/asm-generic/Kbuild.asm
  
 -header-y += arch-v10/
 -header-y += arch-v32/
-+header-y += ../arch-v10/arch
-+header-y += ../arch-v32/arch
++header-y += ../arch-v10/arch/
++header-y += ../arch-v32/arch/
  header-y += auxvec.h
  header-y += bitsperlong.h
  header-y += byteorder.h
+diff -Nur linux-3.9.11.orig/include/uapi/asm-generic/Kbuild linux-3.9.11/include/uapi/asm-generic/Kbuild
+--- linux-3.9.11.orig/include/uapi/asm-generic/Kbuild	2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/include/uapi/asm-generic/Kbuild	2013-10-13 20:09:39.000000000 +0200
+@@ -34,3 +34,4 @@
+ header-y += types.h
+ header-y += ucontext.h
+ header-y += unistd.h
++header-y += user.h
+diff -Nur linux-3.9.11.orig/include/uapi/asm-generic/Kbuild.asm linux-3.9.11/include/uapi/asm-generic/Kbuild.asm
+--- linux-3.9.11.orig/include/uapi/asm-generic/Kbuild.asm	2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/include/uapi/asm-generic/Kbuild.asm	2013-10-13 18:42:03.000000000 +0200
+@@ -18,6 +18,7 @@
+ header-y += ipcbuf.h
+ header-y += mman.h
+ header-y += msgbuf.h
++header-y += page.h
+ header-y += param.h
+ header-y += poll.h
+ header-y += posix_types.h
+@@ -38,6 +39,7 @@
+ header-y += termios.h
+ header-y += types.h
+ header-y += unistd.h
++header-y += user.h
+ 
+ header-y += $(foreach hdr,$(opt-header), \
+ 	      $(if \