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

author: Waldemar Brodkorb <wbx@openadk.org> 2014-03-08 18:31:42 +0100
committer: Waldemar Brodkorb <wbx@openadk.org> 2014-03-08 18:31:42 +0100
commit: ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (patch)
tree: 1b2ea8ee4b80c2e2e8c28a65a41cb90648d571ca
parent: 3fe732e577313be28abbb99a636779a9debe400c (diff)
parent: bd228e8c35627f71a4a15a05424dbd178fcb31e8 (diff)
55 files changed, 684 insertions, 520 deletions
diff --git a/BUGS b/BUGS
index 528b590cf..70759ad05 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,5 @@
-- arm: thumb mode with glibc does not boot
-- sparc64: ide driver not working, only virtio (but unstable)
-- microblaze big endian: network card emulation fails
+- qemu-sparc: startup kernel with gcc 4.8.2 broken
+- qemu-sh4: usb keyboard is broken
+- qemu-arm: thumb mode with glibc does not boot
+- qemu-sparc64: ide driver not working, only virtio (but unstable)
+- qemu-microblaze: network card emulation fails, little endian works
diff --git a/README b/README
index 3e280c165..687950abd 100644
--- a/README
+++ b/README
@@ -10,6 +10,7 @@ Before you can start you need to install some tools:
 - GNU make
 - GNU awk
 - GNU sed
+- findutils (find, xargs)
 - tar
 - patch
 - gzip
@@ -18,7 +19,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- xargs
 
 There is a check for the required versions of these tools in advance, though.
 (to re-issue the checks, use "make prereq").
diff --git a/mk/build.mk b/mk/build.mk
index 62366cbad..8a77a1bfe 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -143,7 +143,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean
 
 world:
-	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
+	mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(PACKAGE_DIR) $(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \
 		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
diff --git a/mk/fetch.mk b/mk/fetch.mk
index a2590d467..6382571b3 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 ifneq ($(strip ${DIST_SUBDIR}),)
-FULLDISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
+FULLDISTDIR?=		${DL_DIR}/${DIST_SUBDIR}
 else
-FULLDISTDIR?=		${DISTDIR}
+FULLDISTDIR?=		${DL_DIR}
 endif
 
 FULLDISTFILES=		$(patsubst %,${FULLDISTDIR}/%,${DISTFILES})
diff --git a/mk/image.mk b/mk/image.mk
index ec61ff374..6721549b5 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -47,11 +47,10 @@ image-prepare-post:
 			mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
 		done; \
 	fi
-	sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
+	$(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
-ifneq ($(ADK_TARGET_ABI_X32),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
@@ -61,7 +60,6 @@ ifneq ($(ADK_TARGET_ABI_X32),y)
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
-endif
 ifeq ($(ADK_LINUX_PPC64),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
@@ -173,7 +171,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
 createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
-	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
+	${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
diff --git a/mk/vars.mk b/mk/vars.mk
index 8f3022634..01120b005 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -10,40 +10,56 @@ MAKEFLAGS=		$(EXTRA_MAKEFLAGS)
 BUILD_USER=		$(shell id -un)
 BUILD_GROUP=		$(shell id -gn)
 
+# some global dirs
 BASE_DIR:=		$(TOPDIR)
-DISTDIR?=		${BASE_DIR}/dl
-BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+ifeq ($(ADK_DL_DIR),)
+DL_DIR?=		$(BASE_DIR)/dl
+else
+DL_DIR?=		$(ADK_DL_DIR)
+endif
+TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
+SCRIPT_DIR:=		$(BASE_DIR)/scripts
+STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
+
+# PFX dirs for cleandir
+FW_DIR_PFX:=		$(BASE_DIR)/firmware
 BUILD_DIR_PFX:=		$(BASE_DIR)/build_*
-STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
-STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
+STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
+TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
+TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
+
 ifeq ($(ADK_TARGET_ABI),)
+TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+FW_DIR:=		$(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
 else
+TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+FW_DIR:=		$(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 endif
-SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
-STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
-TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
-TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
-SCRIPT_DIR:=		$(BASE_DIR)/scripts
-FW_DIR:=		$(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-FW_DIR_PFX:=		$(BASE_DIR)/firmware
+
 PACKAGE_DIR:=		$(FW_DIR)/packages
-TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
+SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
+
+# PATH variables
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 HOST_PATH=		${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
+
 ifeq ($(ADK_TARGET_ABI_X32),y)
-GNU_TARGET_NAME=	$(CPU_ARCH)-x32-linux
+GNU_TARGET_NAME=	$(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX)
 else
 GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
 endif
@@ -133,9 +149,9 @@ LDFLAGS_FOR_BUILD?= 	-L$(STAGING_HOST_DIR)/usr/lib
 FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
-SED:=			sed -i -e
+SED:=			PATH=${HOST_PATH} sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
-KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} KERNELVERSION="2.6" \
+KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} \
 			KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
 			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
 			LDFLAGS="$(ADK_TARGET_KERNEL_LDFLAGS)" CFLAGS_MODULE="-fhonour-copts" V=1
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9323b25ad..a298d108b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		66
+PKG_RELEASE:=		67
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
@@ -33,13 +33,13 @@ endif
 	$(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
+	echo /bin/mksh >>${IDIR_BASE_FILES}/etc/shells
+ifneq (${ADK_PACKAGE_ASH},)
 	echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells
+endif
 ifneq (${ADK_PACKAGE_BASH},)
 	echo /bin/bash >>${IDIR_BASE_FILES}/etc/shells
 endif
-ifneq (${ADK_PACKAGE_MKSH},)
-	echo /bin/mksh >>${IDIR_BASE_FILES}/etc/shells
-endif
 ifneq (${ADK_PACKAGE_ZSH},)
 	echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
 endif
diff --git a/package/base-files/src/etc/fstab b/package/base-files/src/etc/fstab
new file mode 100644
index 000000000..fafa1d56e
--- /dev/null
+++ b/package/base-files/src/etc/fstab
@@ -0,0 +1,9 @@
+# /etc/fstab: static file system information.
+#
+# <file system> <mount pt>     <type>   <options>         <dump> <pass>
+#/dev/root       /              ext2     rw,noauto         0      1
+proc            /proc          proc     defaults          0      0
+devpts          /dev/pts       devpts   defaults,gid=5,mode=620   0      0
+tmpfs           /dev/shm       tmpfs    mode=0777         0      0
+tmpfs           /tmp           tmpfs    mode=1777         0      0
+sysfs           /sys           sysfs    defaults          0      0
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index df2c493d7..b859d1d89 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -4,6 +4,29 @@
 
 . /etc/functions.sh
 
+# disable kernel messages
+echo 0 > /proc/sys/kernel/printk
+
+# remount /dev with smaller size
+mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
+
+# remount /tmp with smaller size
+size=$(cat /etc/tmpfs 2>/dev/null)
+[ -z $size ] && size=2048
+mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
+
+# start mdev dynamic device node management
+echo >/dev/mdev.seq
+echo "/sbin/mdev" >/proc/sys/kernel/hotplug
+mdev -s
+
+# seed some random
+cat /etc/.rnd >/dev/urandom 2>&1
+
+# setup cfgfs
+[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
+
+# create some useful directories in tmpfs
 mkdir -p /var/log
 mkdir -p /var/run
 touch /var/log/lastlog
@@ -22,6 +45,4 @@ for f in /etc/modules.d/*; do
 	[[ -e $f ]] && load_modules /etc/modules.d/*
 	break
 done
-# settle down, after module load
-sleep 2
 exit 0
diff --git a/package/base-files/src/etc/init.d/mount b/package/base-files/src/etc/init.d/mount
deleted file mode 100644
index 6c59d7bab..000000000
--- a/package/base-files/src/etc/init.d/mount
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#INIT 60
-[[ $1 = autostart ]] || exit 0
-
-# any lvm volumes to activate?
-[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay;}
-# check and mount all filesystems not /
-[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
-
-exit 0
diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index 55c86729c..d34cce6e9 100755
--- a/package/base-files/src/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
@@ -1,10 +1,11 @@
 #!/bin/sh
+echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+ln -s /proc/self/fd/2 /dev/stderr
 {
 	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
-		sh ${line%%:*} autostart 2>&1
+		sh ${line%%:*} autostart
 	    done
-	test -e /etc/init.d/boot.local && (/bin/sh /etc/init.d/boot.local) 2>&1
-} | logger -p 6 -t '' &
+} | tee /dev/stderr |logger -p 6 -t ''
diff --git a/package/base-files/src/etc/init.d/umount b/package/base-files/src/etc/init.d/umount
deleted file mode 100755
index 49bd5a020..000000000
--- a/package/base-files/src/etc/init.d/umount
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#INIT 55
-
-case $1 in
-autostop)
-	cd /
-	sync
-	for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }'|grep -v none);do
-       	 umount $i 2>/dev/null
-	done
-	;;
-esac
-exit 0
-
diff --git a/package/base-files/src/etc/inittab b/package/base-files/src/etc/inittab
index 79e69d931..eb00b00ef 100644
--- a/package/base-files/src/etc/inittab
+++ b/package/base-files/src/etc/inittab
@@ -1,2 +1,8 @@
+null::sysinit:/bin/mount -t proc proc /proc
+null::sysinit:/bin/mkdir -p /dev/pts
+null::sysinit:/bin/mkdir -p /dev/shm
+null::sysinit:/bin/mount -a
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/etc/init.d/rcK
+null::shutdown:/bin/umount -a -r
+null::shutdown:/sbin/swapoff -a
diff --git a/package/base-files/src/etc/network/if-post-down.d/03-wireless b/package/base-files/src/etc/network/if-post-down.d/03-wireless
index 67c01714e..77bca475b 100755
--- a/package/base-files/src/etc/network/if-post-down.d/03-wireless
+++ b/package/base-files/src/etc/network/if-post-down.d/03-wireless
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -x
 set -e 
 
 [ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile
index 96f03b980..ce425b54c 100644
--- a/package/base-files/src/etc/profile
+++ b/package/base-files/src/etc/profile
@@ -1,5 +1,4 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-export TERM=linux
 export EDITOR=/bin/vi
 if [[ $(id -u) = 0 ]]; then
 	export PS1='`whoami`@`hostname`:`pwd` # '
diff --git a/package/base-files/src/init b/package/base-files/src/init
index ad519e96d..a27548217 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -1,26 +1,7 @@
 #!/bin/sh
-echo "System initialization ..."
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
-mount -nt proc proc /proc
-echo 0 > /proc/sys/kernel/printk
-mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
-[ ! -f /etc/notmpfs ] && {
-  size=$(cat /etc/tmpfs 2>/dev/null)
-  [ -z $size ] && size=2048
-  mount -o nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
-}
-mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
-[ -d /dev/pts ] || mkdir /dev/pts 
-[ -d /dev/shm ] || mkdir /dev/shm
-mount -o nosuid,noexec -t tmpfs tmpfs /dev/shm
-mount -o nosuid,noexec -t devpts devpts /dev/pts
-echo >/dev/mdev.seq
-echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-mdev -s
-cat /etc/.rnd >/dev/urandom 2>&1
-[ -x /installer ] && { /installer; }
-[ -x /kexecinit ] && { /kexecinit; }
-[ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
-[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
-exec /sbin/init
+# devtmpfs does not get automounted for initramfs
+/bin/mount -t devtmpfs devtmpfs /dev
+exec 0</dev/console
+exec 1>/dev/console
+exec 2>/dev/console
+exec /sbin/init $*
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 1b195fc3f..6bf16ab17 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		misc
 PKG_URL:=		http://cdrecord.berlios.de/private/cdrecord.html
 PKG_SITES:=		http://openadk.org/
 
+PKG_CFLINE_CDRTOOLS:=	depends on ADK_BROKEN
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 1079227f2..6cdf53b0b 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
+PKG_CFLINE_CMAKE:=	depends on ADK_BROKEN
+
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 92898307b..8e4dc6f94 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -24,7 +24,7 @@ ecj-hostinstall:
 	$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
 		-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
-		$(DISTDIR)/ecj.jar
+		$(DL_DIR)/ecj.jar
 	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
 		${STAGING_HOST_DIR}/usr/bin/ecj
 	chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 5ff8cc810..15c56b204 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -41,8 +41,8 @@ HOST_CONFIGURE_ARGS:=	--enable-dependency-tracking \
 			--disable-bootstrap
 
 post-extract:
-	(cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
-	(cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .)
+	(cd $(DL_DIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
+	(cd $(WRKBUILD); $(CP) $(DL_DIR)/ecj.jar .)
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index b483b838c..a09dc3be5 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gettext-tiny
-PKG_VERSION:=		0.0.3
+PKG_VERSION:=		0.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af6fd8a9042603b61f634b1c6f49e7e
+PKG_MD5SUM:=		09f6a74945df5961080234f7851f352c
 PKG_DESCR:=		Gettext stub and replacement
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		gettext-tiny-host
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 389b4f39a..19d678a7a 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		id3lib
 PKG_VERSION:=		3.8.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		19f27ddd2dda4b2d26a559a4f0f402a7
 PKG_DESCR:=		An ID3v1/ID3v2 tagging library
 PKG_SECTION:=		libs
diff --git a/package/id3lib/patches/patch-configure b/package/id3lib/patches/patch-configure
index 6853215af..10b0add38 100644
--- a/package/id3lib/patches/patch-configure
+++ b/package/id3lib/patches/patch-configure
@@ -1,6 +1,24 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- id3lib-3.8.3.orig/configure	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/configure	2008-12-15 13:14:18.000000000 +0100
++++ id3lib-3.8.3/configure	2014-03-08 12:16:00.000000000 +0100
+@@ -3353,7 +3353,7 @@ irix5* | irix6*)
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   case $host_cpu in
+   alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+     lt_cv_deplibs_check_method=pass_all ;;
+@@ -6142,7 +6142,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
 @@ -10296,7 +10296,7 @@ done
  
  for ac_header in \
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index 7404fc123..be7e6a749 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=		1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
 PKG_DESCR:=		jikes java compiler
+PKG_BUILDDEP:=		jikes-host
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
@@ -17,6 +18,7 @@ include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 
@@ -26,6 +28,7 @@ hostpost-install:
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
 
+jikes-install:
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 6289c1cb8..4a332b32e 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ruby openldap
 PKG_URL:=		http://ruby-ldap.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
 
+PKG_CFLINE_RUBY_LDAP:=	depends on ADK_BROKEN
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
deleted file mode 100644
index 99c721879..000000000
--- a/package/upower/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		upower
-PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
-PKG_DESCR:=		powermanagement
-PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit eudev
-PKG_DEPENDS:=		glib dbus-glib polkit libgudev
-PKG_URL:=		http://upower.freedesktop.org/
-PKG_SITES:=		http://upower.freedesktop.org/releases/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--without-systemdutildir \
-			--disable-rpath
-
-upower-install:
-	$(INSTALL_DIR) $(IDIR_UPOWER)/etc
-	$(CP) $(WRKINST)/etc/* \
-		$(IDIR_UPOWER)/etc
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libupower*.so* \
-		$(IDIR_UPOWER)/usr/lib
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
-		$(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
-		$(IDIR_UPOWER)/usr/bin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
-	$(CP) $(WRKINST)/usr/share/dbus-1/* \
-		$(IDIR_UPOWER)/usr/share/dbus-1
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/patches/patch-Makefile_in b/package/upower/patches/patch-Makefile_in
deleted file mode 100644
index 7709ee096..000000000
--- a/package/upower/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- upower-0.99.0.orig/Makefile.in	2013-10-29 11:39:06.000000000 +0100
-+++ upower-0.99.0/Makefile.in	2014-01-10 17:09:06.000000000 +0100
-@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = etc libupower-glib src doc tools po rules
-+DIST_SUBDIRS = etc libupower-glib src tools po rules
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- udevrulesdir = @udevrulesdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
-+SUBDIRS = etc libupower-glib src tools po $(am__append_1)
- EXTRA_DIST = \
- 	HACKING 			\
- 	ChangeLog
diff --git a/rules.mk b/rules.mk
index 8e9e013d9..2fe8aa751 100644
--- a/rules.mk
+++ b/rules.mk
@@ -48,6 +48,7 @@ ADK_RUNTIME_TMPFS_SIZE:=	$(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE)))
 ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)))
 ADK_HOST:=		$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=		$(strip $(subst ",, $(ADK_VENDOR)))
+ADK_DL_DIR:=		$(strip $(subst ",, $(ADK_DL_DIR)))
 ADK_COMPRESSION_TOOL:=		$(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
 ADK_TOOLS_ADDPATTERN_ARGS:=	$(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS)))
 ADK_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_KERNEL_VERSION)))
diff --git a/scripts/automake.dep b/scripts/automake.dep
deleted file mode 100644
index 2cfd5d3ce..000000000
--- a/scripts/automake.dep
+++ /dev/null
@@ -1,36 +0,0 @@
-configure configure.ac
-configure configure.in
-configure configure.sh
-configure missing
-/Makefile.in /Makefile.am
-/Makefile.in configure.in
-/Makefile.in configure.ac
-/Makefile.in aclocal.m4
-aclocal.m4 configure.in
-aclocal.m4 configure.ac
-aclocal.m4 acinclude.m4
-config-h.in configure.in
-config-h.in configure.ac
-config.h.in configure.in
-config.h.in configure.ac
-config.h.in aclocal.m4
-config.h.in autoconfig.h.in
-config.h.in gpsd_config.h.in
-configure configure.in
-configure configure.ac
-configure aclocal.m4
-stamp-h.in configure.in
-stamp-h.in configure.ac
-stamp-h.in aclocal.m4
-stamp-h.in acconfig.h
-/Makefile.am subdirs
-/Makefile.am /Makefile.am.in
-subdirs /Makefile.am.in
-configure.files subdirs
-configure.files /configure.in.in
-configure.files admin/configure.in.min
-configure.in configure.files
-acinclude.m4 admin/libtool.m4.in
-acinclude.m4 admin/acinclude.m4.in
-acinclude.m4 libltdl/ltdl.m4
-libtoolize.in configure
diff --git a/scripts/find b/scripts/find
new file mode 100755
index 000000000..ea38d92fb
--- /dev/null
+++ b/scripts/find
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gfind 2>/dev/null)" ];then
+	/usr/bin/find "$@"
+else
+	gfind "$@"
+fi
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index a7883cb24..c16aff609 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -37,8 +37,9 @@ if [[ -e foo ]]; then
 		Darwin*)
 			echo "Building OpenADK on $os needs a case-sensitive disk partition."
 			echo "For Snow Leopard and above you can use diskutil to resize your existing disk."
-			echo "For older versions you might consider to use a disk image."
 			echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G"
+			echo "For older versions you might consider to use a disk image:"
+			echo "hdiutil create -type SPARSE -fs 'Case-sensitive Journaled HFS+' -size 30g ~/openadk.dmg"
 			;;
 	esac
 	exit 1
diff --git a/target/config/Config.in b/target/config/Config.in
index 6c6f83249..9d8a36b49 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -71,6 +71,10 @@ config ADK_TOOLCHAIN
 source "target/config/Config.in.arch"
 source "target/config/Config.in.system"
 
+config ADK_LINUX_MIPS64
+	boolean
+	default y if ADK_LINUX_MIPS && ADK_TARGET_KERNEL64
+
 choice
 prompt "Toolchain options"
 depends on ADK_TOOLCHAIN
@@ -87,8 +91,6 @@ prompt "Target Kernel"
 depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS64EL \
-	|| ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64 \
-	|| ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL \
 	|| ADK_LINUX_X86_64
 
 config ADK_TARGET_KERNEL64
@@ -133,26 +135,19 @@ config ADK_TARGET_ABI
 	default "eabihf" if ADK_eabihf
 
 config ADK_TARGET_MIPS_ABI
-	depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
+	depends on ADK_LINUX_MIPS
 	string
 	default "32" if ADK_o32
 	default "n32" if ADK_n32
 	default "64" if ADK_n64
 
-config ADK_TARGET_ABI_MIPS_O32
-	boolean
-	select ADK_o32
-	depends on !ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
-	default y
-
 choice
 prompt "Target ABI"
-depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
+depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN
 
 config ADK_TARGET_ABI_N32
 	boolean "N32 ABI (new)"
 	select ADK_n32
-	depends on !ADK_TARGET_LIB_MUSL
 
 config ADK_TARGET_ABI_O32
 	boolean "O32 ABI (old)"
@@ -161,13 +156,12 @@ config ADK_TARGET_ABI_O32
 config ADK_TARGET_ABI_N64
 	boolean "N64 ABI"
 	select ADK_n64
-	depends on !ADK_TARGET_LIB_MUSL
 
 endchoice
 
 choice
 prompt "Target ABI"
-depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64
+depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN
 
 config ADK_TARGET_ABI_64
 	boolean "64 Bit ABI"
@@ -247,6 +241,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_INPUT_MOUSE
 	select ADK_KERNEL_INPUT_MOUSEDEV
+	select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
 
 endchoice
 
@@ -558,8 +553,8 @@ config ADK_TARGET_CPU_ARCH
 	default "m68k" if ADK_LINUX_M68K
 	default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big
 	default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little
-	default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_TARGET_KERNEL64
-	default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_TARGET_KERNEL64
+	default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_LINUX_64
+	default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_LINUX_64
 	default "mips" if ADK_LINUX_MIPS && ADK_big
 	default "mipsel" if ADK_LINUX_MIPS && ADK_little
 	default "arm" if ADK_LINUX_ARM && ADK_little
@@ -570,26 +565,26 @@ config ADK_TARGET_CPU_ARCH
 	default "sh4eb" if ADK_LINUX_SH && ADK_big
 	default "ppc" if ADK_CPU_PPC
 	default "ppc64" if ADK_CPU_PPC64
-	default "mips64el" if ADK_native && ADK_lemote_yeelong	
+	default "mips64el" if ADK_native && ADK_lemote_yeelong
 
 config ADK_TARGET_ABI_CFLAGS
 	string
-	default "-mabi=32" if ADK_TARGET_ABI_O32 || ADK_TARGET_ABI_MIPS_O32
-	default "-mabi=n32" if ADK_TARGET_ABI_N32
-	default "-mabi=64" if ADK_TARGET_ABI_N64
-	default "-m32" if ADK_TARGET_ABI_32
-	default "-mx32" if ADK_TARGET_ABI_X32
-	default "-m64" if ADK_TARGET_ABI_64
+	default "-mabi=32" if ADK_o32
+	default "-mabi=n32" if ADK_n32
+	default "-mabi=64" if ADK_n64
+	default "-m32" if ADK_32
+	default "-mx32" if ADK_x32
+	default "-m64" if ADK_64
 
 config ADK_TARGET_ABI_LDFLAGS
 	string
-	default "-Wl,-m -Wl,elf_i386" if ADK_TARGET_ABI_32
+	default "-Wl,-m -Wl,elf_i386" if ADK_32
 
 config ADK_TARGET_KERNEL_LDFLAGS
 	string
-	default "-mabi=64" if ADK_TARGET_ABI_N32 && ADK_TARGET_KERNEL64
-	default "-mabi=64" if ADK_TARGET_ABI_O32 && ADK_TARGET_KERNEL64
-	default "-mabi=64" if ADK_TARGET_ABI_N64 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_n32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_o32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_n64 && ADK_TARGET_KERNEL64
 	default ""
 
 config ADK_TARGET_CFLAGS
@@ -675,7 +670,7 @@ config ADK_TARGET_LIB_UCLIBC
 		   !ADK_LINUX_MICROBLAZE && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
-		   !ADK_LINUX_NATIVE
+		   !ADK_TARGET_ABI_X32
 	help
  	 http://uclibc.org
 
@@ -685,7 +680,6 @@ config ADK_TARGET_LIB_GLIBC
 	select ADK_glibc
 	depends on \
 		ADK_LINUX_ARM || \
-		ADK_LINUX_ARMEB || \
 		ADK_LINUX_M68K || \
 		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
@@ -703,6 +697,7 @@ config ADK_TARGET_LIB_MUSL
 	prompt "musl C library"
 	boolean
 	select ADK_musl
+	depends on !ADK_LINUX_MIPS64
 	depends on \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_MICROBLAZE || \
@@ -711,6 +706,7 @@ config ADK_TARGET_LIB_MUSL
 		ADK_LINUX_SH || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
+		
 	help
  	 http://musl-libc.org
 
@@ -726,25 +722,25 @@ config ADK_TARGET_SUFFIX
 	string
 	default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf
 	default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi
-	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64
-	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64
-	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64
+	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32
+	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32
 	default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64
 	default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64
 	default "gnu" if ADK_TARGET_LIB_GLIBC
 	default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf
 	default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi
-	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64
-	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64
-	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64
+	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32
+	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32
 	default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64
 	default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64
 	default "uclibc" if ADK_TARGET_LIB_UCLIBC
 	default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf
 	default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi
-	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64
-	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64
-	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64
+	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64
+	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32
+	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32
 	default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64
 	default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64
 	default "musl" if ADK_TARGET_LIB_MUSL
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 46de14044..7544723bf 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -12,6 +12,13 @@ config ADK_HOST
 	help
 	  Configure host for IPKG package management.
 
+config ADK_DL_DIR
+	string "download directory for packages"
+	default ""
+	help
+	  Configure the download directory for all source packages.
+	  Use an absolute path.
+
 config ADK_DEBUG
 	bool "Compile applications with debug support by default"
 	default n
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index b6716cbdd..03cecfca1 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -38,7 +38,7 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && ADK_TARGET_QEMU_WITH_GRAPHIC
 default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 default ADK_RUNTIME_CONSOLE_SERIAL
 
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 17c23b65c..5a01ee1e1 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_USB_HID
+	boolean
+	default n
+
 config ADK_KERNEL_HID_LOGITECH
 	boolean
 	default n
@@ -113,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH
 config ADK_KPACKAGE_KMOD_USB_HID
 	prompt "kmod-usb-hid..................... USB keyboard/mouse support"
 	tristate
+	depends on !ADK_KERNEL_USB_HID
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_HID_GENERIC
@@ -122,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC
 	default n
 
 config ADK_KERNEL_LOGITECH_DINOVO
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b2c750673..f6fd22339 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,11 +1,23 @@
 menu "USB support"
-depends on ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU
 
 config ADK_KERNEL_USB_SUPPORT
 	boolean
 
 config ADK_KERNEL_USB
 	select ADK_KERNEL_USB_SUPPORT
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
+	boolean
+
+config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	boolean
 
 config ADK_KERNEL_USB_LIBUSUAL
@@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB
 	select ADK_KERNEL_USB_SUPPORT
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
+	default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/linux/patches/3.11.10/startup.patch b/target/linux/patches/3.11.10/startup.patch
index d23d6d212..4dccae8c1 100644
--- a/target/linux/patches/3.11.10/startup.patch
+++ b/target/linux/patches/3.11.10/startup.patch
@@ -1,16 +1,6 @@
 diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
 --- linux-3.7.3.orig/init/main.c	2013-01-17 17:47:40.000000000 +0100
 +++ linux-3.7.3/init/main.c	2013-01-19 15:08:13.000000000 +0100
-@@ -834,7 +834,8 @@
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	if (!run_init_process("/sbin/init") ||
-+	if (!run_init_process("/init") ||
-+ 	    !run_init_process("/sbin/init") ||
- 	    !run_init_process("/etc/init") ||
- 	    !run_init_process("/bin/init") ||
- 	    !run_init_process("/bin/sh"))
 @@ -879,6 +880,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.13/startup.patch
index d23d6d212..4dccae8c1 100644
--- a/target/linux/patches/3.12.13/startup.patch
+++ b/target/linux/patches/3.12.13/startup.patch
@@ -1,16 +1,6 @@
 diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c
 --- linux-3.7.3.orig/init/main.c	2013-01-17 17:47:40.000000000 +0100
 +++ linux-3.7.3/init/main.c	2013-01-19 15:08:13.000000000 +0100
-@@ -834,7 +834,8 @@
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
--	if (!run_init_process("/sbin/init") ||
-+	if (!run_init_process("/init") ||
-+ 	    !run_init_process("/sbin/init") ||
- 	    !run_init_process("/etc/init") ||
- 	    !run_init_process("/bin/init") ||
- 	    !run_init_process("/bin/sh"))
 @@ -879,6 +880,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.13.5/startup.patch b/target/linux/patches/3.13.5/startup.patch
index bfe3ae6ec..be4ea469d 100644
--- a/target/linux/patches/3.13.5/startup.patch
+++ b/target/linux/patches/3.13.5/startup.patch
@@ -1,16 +1,6 @@
 diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c
 --- linux-3.13.3.orig/init/main.c	2014-02-13 23:00:14.000000000 +0100
 +++ linux-3.13.3/init/main.c	2014-02-17 11:35:14.000000000 +0100
-@@ -871,7 +871,8 @@
- 		pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
- 			execute_command, ret);
- 	}
--	if (!try_to_run_init_process("/sbin/init") ||
-+	if (!try_to_run_init_process("/init") ||
-+            !try_to_run_init_process("/sbin/init") ||
- 	    !try_to_run_init_process("/etc/init") ||
- 	    !try_to_run_init_process("/bin/init") ||
- 	    !try_to_run_init_process("/bin/sh"))
 @@ -916,6 +917,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		pr_err("Warning: unable to open an initial console.\n");
diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.82/startup.patch
index 68e8987b0..4f47eddcb 100644
--- a/target/linux/patches/3.4.82/startup.patch
+++ b/target/linux/patches/3.4.82/startup.patch
@@ -1,14 +1,6 @@
 diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c
 --- linux-2.6.34.orig/init/main.c	2010-05-16 23:17:36.000000000 +0200
 +++ linux-2.6.34/init/main.c	2010-05-20 20:13:26.321613615 +0200
-@@ -842,6 +842,7 @@
- 		printk(KERN_WARNING "Failed to execute %s.  Attempting "
- 					"defaults...\n", execute_command);
- 	}
-+	run_init_process("/init");
- 	run_init_process("/sbin/init");
- 	run_init_process("/etc/init");
- 	run_init_process("/bin/init");
 @@ -889,6 +890,8 @@
  	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64
index 7a7562edc..924c70bc4 100644
--- a/target/mips/sys-available/qemu-mips64
+++ b/target/mips/sys-available/qemu-mips64
@@ -4,9 +4,8 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	select ADK_big
 	select ADK_qemu_mips64
 	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_VMLINUZ
 	select ADK_USE_KERNEL_MINICONFIG
 	help
diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el
index 34d44c054..14b548632 100644
--- a/target/mips/sys-available/qemu-mips64el
+++ b/target/mips/sys-available/qemu-mips64el
@@ -4,12 +4,9 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
 	select ADK_little
 	select ADK_qemu_mips64el
 	select ADK_CPU_MIPS64
-	select ADK_TARGET_KERNEL64
+	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_VMLINUZ
 	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Qemu support for mips64 little endian architecture.
-
diff --git a/target/mips/sys-available/toolchain-mips64 b/target/mips/sys-available/toolchain-mips64
index 9cc19e299..e9ea69170 100644
--- a/target/mips/sys-available/toolchain-mips64
+++ b/target/mips/sys-available/toolchain-mips64
@@ -1,10 +1,12 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
-	bool "Toolchain only (mips64 big endian)"
+	bool "Toolchain only (mips64 big endian o32 ABI)"
 	select ADK_mips
 	select ADK_big
-	select ADK_CPU_MIPS64
+	select ADK_o32
 	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  MIPS64 big endian toolchain.
+	  MIPS64 big endian o32 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64el b/target/mips/sys-available/toolchain-mips64el
index 2cb27d99c..0d54692ee 100644
--- a/target/mips/sys-available/toolchain-mips64el
+++ b/target/mips/sys-available/toolchain-mips64el
@@ -1,10 +1,12 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL
-	bool "Toolchain only (mips64 little endian)"
+	bool "Toolchain only (mips64 little endian o32 ABI)"
 	select ADK_mips
 	select ADK_little
-	select ADK_CPU_MIPS64
+	select ADK_o32
 	select ADK_toolchain_mips64el
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  MIPS64 little endian toolchain.
+	  MIPS64 little endian o32 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64eln32 b/target/mips/sys-available/toolchain-mips64eln32
new file mode 100644
index 000000000..9c0f44381
--- /dev/null
+++ b/target/mips/sys-available/toolchain-mips64eln32
@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN32
+	bool "Toolchain only (mips64 little endian n32 ABI)"
+	select ADK_mips
+	select ADK_little
+	select ADK_n32
+	select ADK_toolchain_mips64el
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 little endian n32 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64eln64 b/target/mips/sys-available/toolchain-mips64eln64
new file mode 100644
index 000000000..2795598d8
--- /dev/null
+++ b/target/mips/sys-available/toolchain-mips64eln64
@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN64
+	bool "Toolchain only (mips64 little endian n64 ABI)"
+	select ADK_mips
+	select ADK_little
+	select ADK_n64
+	select ADK_toolchain_mips64el
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 little endian n64 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64n32 b/target/mips/sys-available/toolchain-mips64n32
new file mode 100644
index 000000000..e2acd59b3
--- /dev/null
+++ b/target/mips/sys-available/toolchain-mips64n32
@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N32
+	bool "Toolchain only (mips64 big endian n32 ABI)"
+	select ADK_mips
+	select ADK_big
+	select ADK_n32
+	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 big endian n64 ABI toolchain.
diff --git a/target/mips/sys-available/toolchain-mips64n64 b/target/mips/sys-available/toolchain-mips64n64
new file mode 100644
index 000000000..e544008f4
--- /dev/null
+++ b/target/mips/sys-available/toolchain-mips64n64
@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N64
+	bool "Toolchain only (mips64 big endian n64 ABI)"
+	select ADK_mips
+	select ADK_big
+	select ADK_n64
+	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 big endian n64 ABI toolchain.
diff --git a/target/sh/Makefile b/target/sh/Makefile
index da733acac..3cf65f614 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -8,6 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage
+QEMU_ARGS:=${ADK_QEMU_ARGS} -monitor null -serial null -serial stdio
 
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
@@ -18,7 +19,7 @@ ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
@@ -28,7 +29,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -37,6 +38,6 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index f32b1836d..d7527442f 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -136,6 +136,8 @@ ifeq ($(ADK_LINUX_SH),y)
 endif
 	sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure
 	cd $(GCC_BUILD_DIR_MINIMAL); PATH='$(TARGET_PATH)' \
+		CFLAGS="-O0 -g0" \
+		CXXFLAGS="-O0 -g0" \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=c \
@@ -154,6 +156,8 @@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled
 $(GCC_BUILD_DIR_INITIAL)/.configured:
 	mkdir -p $(GCC_BUILD_DIR_INITIAL)
 	cd $(GCC_BUILD_DIR_INITIAL); PATH='$(TARGET_PATH)' \
+		CFLAGS="-O0 -g0" \
+		CXXFLAGS="-O0 -g0" \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=c \
diff --git a/toolchain/musl/patches/musl-git-20140301.patch b/toolchain/musl/patches/musl-git-20140307.patch
index 1362c9ba9..0cf790196 100644
--- a/toolchain/musl/patches/musl-git-20140301.patch
+++ b/toolchain/musl/patches/musl-git-20140307.patch
@@ -1,6 +1,6 @@
 diff -Nur musl-0.9.15/arch/arm/bits/shm.h musl-git/arch/arm/bits/shm.h
 --- musl-0.9.15/arch/arm/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/bits/shm.h	2014-03-01 08:58:13.000000000 +0100
++++ musl-git/arch/arm/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -16,3 +16,14 @@
  	unsigned long __pad1;
  	unsigned long __pad2;
@@ -18,7 +18,7 @@ diff -Nur musl-0.9.15/arch/arm/bits/shm.h musl-git/arch/arm/bits/shm.h
 +
 diff -Nur musl-0.9.15/arch/arm/bits/termios.h musl-git/arch/arm/bits/termios.h
 --- musl-0.9.15/arch/arm/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/bits/termios.h	2014-03-01 08:58:13.000000000 +0100
++++ musl-git/arch/arm/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -42,6 +42,7 @@
  #define IXANY   0004000
  #define IXOFF   0010000
@@ -74,7 +74,7 @@ diff -Nur musl-0.9.15/arch/arm/bits/termios.h musl-git/arch/arm/bits/termios.h
 +#endif
 diff -Nur musl-0.9.15/arch/arm/syscall_arch.h musl-git/arch/arm/syscall_arch.h
 --- musl-0.9.15/arch/arm/syscall_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/arm/syscall_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -3,6 +3,8 @@
  ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
  #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
@@ -86,7 +86,7 @@ diff -Nur musl-0.9.15/arch/arm/syscall_arch.h musl-git/arch/arm/syscall_arch.h
  #define __asm_syscall(...) do { \
 diff -Nur musl-0.9.15/arch/i386/bits/shm.h musl-git/arch/i386/bits/shm.h
 --- musl-0.9.15/arch/i386/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/i386/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/i386/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -16,3 +16,14 @@
  	unsigned long __pad1;
  	unsigned long __pad2;
@@ -104,7 +104,7 @@ diff -Nur musl-0.9.15/arch/i386/bits/shm.h musl-git/arch/i386/bits/shm.h
 +
 diff -Nur musl-0.9.15/arch/i386/bits/termios.h musl-git/arch/i386/bits/termios.h
 --- musl-0.9.15/arch/i386/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/i386/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/i386/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -42,6 +42,7 @@
  #define IXANY   0004000
  #define IXOFF   0010000
@@ -160,7 +160,7 @@ diff -Nur musl-0.9.15/arch/i386/bits/termios.h musl-git/arch/i386/bits/termios.h
 +#endif
 diff -Nur musl-0.9.15/arch/microblaze/bits/shm.h musl-git/arch/microblaze/bits/shm.h
 --- musl-0.9.15/arch/microblaze/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/microblaze/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -16,3 +16,14 @@
  	unsigned long __pad1;
  	unsigned long __pad2;
@@ -178,7 +178,7 @@ diff -Nur musl-0.9.15/arch/microblaze/bits/shm.h musl-git/arch/microblaze/bits/s
 +
 diff -Nur musl-0.9.15/arch/microblaze/bits/termios.h musl-git/arch/microblaze/bits/termios.h
 --- musl-0.9.15/arch/microblaze/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/microblaze/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -42,6 +42,7 @@
  #define IXANY   0004000
  #define IXOFF   0010000
@@ -234,7 +234,7 @@ diff -Nur musl-0.9.15/arch/microblaze/bits/termios.h musl-git/arch/microblaze/bi
 +#endif
 diff -Nur musl-0.9.15/arch/microblaze/syscall_arch.h musl-git/arch/microblaze/syscall_arch.h
 --- musl-0.9.15/arch/microblaze/syscall_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/microblaze/syscall_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -3,6 +3,8 @@
  ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
  #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
@@ -246,7 +246,7 @@ diff -Nur musl-0.9.15/arch/microblaze/syscall_arch.h musl-git/arch/microblaze/sy
  static __inline long __syscall0(long n)
 diff -Nur musl-0.9.15/arch/mips/bits/fenv.h musl-git/arch/mips/bits/fenv.h
 --- musl-0.9.15/arch/mips/bits/fenv.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/fenv.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/mips/bits/fenv.h	2014-03-07 14:03:57.000000000 +0100
 @@ -1,3 +1,7 @@
 +#ifdef __mips_soft_float
 +#define FE_ALL_EXCEPT 0
@@ -265,7 +265,7 @@ diff -Nur musl-0.9.15/arch/mips/bits/fenv.h musl-git/arch/mips/bits/fenv.h
  
 diff -Nur musl-0.9.15/arch/mips/bits/shm.h musl-git/arch/mips/bits/shm.h
 --- musl-0.9.15/arch/mips/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/mips/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -13,3 +13,14 @@
  	unsigned long __pad1;
  	unsigned long __pad2;
@@ -283,7 +283,7 @@ diff -Nur musl-0.9.15/arch/mips/bits/shm.h musl-git/arch/mips/bits/shm.h
 +
 diff -Nur musl-0.9.15/arch/mips/bits/termios.h musl-git/arch/mips/bits/termios.h
 --- musl-0.9.15/arch/mips/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/mips/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -77,9 +77,6 @@
  #define VT0    0000000
  #define VT1    0040000
@@ -334,7 +334,7 @@ diff -Nur musl-0.9.15/arch/mips/bits/termios.h musl-git/arch/mips/bits/termios.h
 +#endif
 diff -Nur musl-0.9.15/arch/mips/reloc.h musl-git/arch/mips/reloc.h
 --- musl-0.9.15/arch/mips/reloc.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/reloc.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/mips/reloc.h	2014-03-07 14:03:57.000000000 +0100
 @@ -8,7 +8,13 @@
  #define ENDIAN_SUFFIX ""
  #endif
@@ -352,7 +352,7 @@ diff -Nur musl-0.9.15/arch/mips/reloc.h musl-git/arch/mips/reloc.h
  #define IS_PLT(x) 1
 diff -Nur musl-0.9.15/arch/mips/syscall_arch.h musl-git/arch/mips/syscall_arch.h
 --- musl-0.9.15/arch/mips/syscall_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/mips/syscall_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -3,6 +3,8 @@
  ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
  #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
@@ -364,7 +364,7 @@ diff -Nur musl-0.9.15/arch/mips/syscall_arch.h musl-git/arch/mips/syscall_arch.h
  #define __asm_syscall(...) do { \
 diff -Nur musl-0.9.15/arch/powerpc/bits/shm.h musl-git/arch/powerpc/bits/shm.h
 --- musl-0.9.15/arch/powerpc/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/powerpc/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -16,3 +16,14 @@
  	unsigned long __pad1;
  	unsigned long __pad2;
@@ -382,7 +382,7 @@ diff -Nur musl-0.9.15/arch/powerpc/bits/shm.h musl-git/arch/powerpc/bits/shm.h
 +
 diff -Nur musl-0.9.15/arch/powerpc/bits/termios.h musl-git/arch/powerpc/bits/termios.h
 --- musl-0.9.15/arch/powerpc/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/powerpc/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -66,7 +66,6 @@
  #define TAB1	00002000
  #define TAB2	00004000
@@ -442,7 +442,7 @@ diff -Nur musl-0.9.15/arch/powerpc/bits/termios.h musl-git/arch/powerpc/bits/ter
 +#endif
 diff -Nur musl-0.9.15/arch/sh/atomic.h musl-git/arch/sh/atomic.h
 --- musl-0.9.15/arch/sh/atomic.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/atomic.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/atomic.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,87 @@
 +#ifndef _INTERNAL_ATOMIC_H
 +#define _INTERNAL_ATOMIC_H
@@ -533,7 +533,7 @@ diff -Nur musl-0.9.15/arch/sh/atomic.h musl-git/arch/sh/atomic.h
 +#endif
 diff -Nur musl-0.9.15/arch/sh/bits/alltypes.h.in musl-git/arch/sh/bits/alltypes.h.in
 --- musl-0.9.15/arch/sh/bits/alltypes.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/alltypes.h.in	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/alltypes.h.in	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,23 @@
 +#define _Addr int
 +#define _Int64 long long
@@ -560,7 +560,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/alltypes.h.in musl-git/arch/sh/bits/alltypes.
 +TYPEDEF struct { union { int __i[5]; void *__p[5]; } __u; } pthread_barrier_t;
 diff -Nur musl-0.9.15/arch/sh/bits/endian.h musl-git/arch/sh/bits/endian.h
 --- musl-0.9.15/arch/sh/bits/endian.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/endian.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/endian.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +#if __BIG_ENDIAN__
 +#define __BYTE_ORDER __BIG_ENDIAN
@@ -569,7 +569,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/endian.h musl-git/arch/sh/bits/endian.h
 +#endif
 diff -Nur musl-0.9.15/arch/sh/bits/errno.h musl-git/arch/sh/bits/errno.h
 --- musl-0.9.15/arch/sh/bits/errno.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/errno.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/errno.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,134 @@
 +#define EPERM            1
 +#define ENOENT           2
@@ -707,7 +707,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/errno.h musl-git/arch/sh/bits/errno.h
 +#define EHWPOISON       133
 diff -Nur musl-0.9.15/arch/sh/bits/fcntl.h musl-git/arch/sh/bits/fcntl.h
 --- musl-0.9.15/arch/sh/bits/fcntl.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/fcntl.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/fcntl.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,39 @@
 +#define O_CREAT        0100
 +#define O_EXCL         0200
@@ -750,7 +750,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/fcntl.h musl-git/arch/sh/bits/fcntl.h
 +#define F_GETOWNER_UIDS 17
 diff -Nur musl-0.9.15/arch/sh/bits/fenv.h musl-git/arch/sh/bits/fenv.h
 --- musl-0.9.15/arch/sh/bits/fenv.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/fenv.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/fenv.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,26 @@
 +#ifndef __SH_FPU_ANY__
 +
@@ -780,7 +780,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/fenv.h musl-git/arch/sh/bits/fenv.h
 +#define FE_DFL_ENV    ((const fenv_t *) -1)
 diff -Nur musl-0.9.15/arch/sh/bits/float.h musl-git/arch/sh/bits/float.h
 --- musl-0.9.15/arch/sh/bits/float.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/float.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/float.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,17 @@
 +#define FLT_ROUNDS 1
 +#define FLT_EVAL_METHOD 0
@@ -801,7 +801,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/float.h musl-git/arch/sh/bits/float.h
 +#define DECIMAL_DIG 17
 diff -Nur musl-0.9.15/arch/sh/bits/ioctl.h musl-git/arch/sh/bits/ioctl.h
 --- musl-0.9.15/arch/sh/bits/ioctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/ioctl.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/ioctl.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,205 @@
 +#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
 +#define _IOC_NONE  0U
@@ -1010,7 +1010,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/ioctl.h musl-git/arch/sh/bits/ioctl.h
 +#define SIOCPROTOPRIVATE    0x89E0
 diff -Nur musl-0.9.15/arch/sh/bits/ipc.h musl-git/arch/sh/bits/ipc.h
 --- musl-0.9.15/arch/sh/bits/ipc.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/ipc.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/ipc.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,14 @@
 +struct ipc_perm
 +{
@@ -1028,7 +1028,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/ipc.h musl-git/arch/sh/bits/ipc.h
 +#define IPC_64 0x100
 diff -Nur musl-0.9.15/arch/sh/bits/limits.h musl-git/arch/sh/bits/limits.h
 --- musl-0.9.15/arch/sh/bits/limits.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/limits.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/limits.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,8 @@
 +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
 + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
@@ -1040,7 +1040,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/limits.h musl-git/arch/sh/bits/limits.h
 +#define LLONG_MAX  0x7fffffffffffffffLL
 diff -Nur musl-0.9.15/arch/sh/bits/mman.h musl-git/arch/sh/bits/mman.h
 --- musl-0.9.15/arch/sh/bits/mman.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/mman.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/mman.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,62 @@
 +#define MAP_FAILED ((void *) -1)
 +
@@ -1106,7 +1106,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/mman.h musl-git/arch/sh/bits/mman.h
 +#endif
 diff -Nur musl-0.9.15/arch/sh/bits/msg.h musl-git/arch/sh/bits/msg.h
 --- musl-0.9.15/arch/sh/bits/msg.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/msg.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/msg.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,16 @@
 +struct msqid_ds
 +{
@@ -1126,18 +1126,18 @@ diff -Nur musl-0.9.15/arch/sh/bits/msg.h musl-git/arch/sh/bits/msg.h
 +};
 diff -Nur musl-0.9.15/arch/sh/bits/posix.h musl-git/arch/sh/bits/posix.h
 --- musl-0.9.15/arch/sh/bits/posix.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/posix.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/posix.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,2 @@
 +#define _POSIX_V6_ILP32_OFFBIG  1
 +#define _POSIX_V7_ILP32_OFFBIG  1
 diff -Nur musl-0.9.15/arch/sh/bits/setjmp.h musl-git/arch/sh/bits/setjmp.h
 --- musl-0.9.15/arch/sh/bits/setjmp.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/setjmp.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/setjmp.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +typedef unsigned long __jmp_buf[13];
 diff -Nur musl-0.9.15/arch/sh/bits/shm.h musl-git/arch/sh/bits/shm.h
 --- musl-0.9.15/arch/sh/bits/shm.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,28 @@
 +#define SHMLBA 16384
 +
@@ -1169,7 +1169,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/shm.h musl-git/arch/sh/bits/shm.h
 +};
 diff -Nur musl-0.9.15/arch/sh/bits/signal.h musl-git/arch/sh/bits/signal.h
 --- musl-0.9.15/arch/sh/bits/signal.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/signal.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/signal.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,76 @@
 +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
 + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
@@ -1249,7 +1249,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/signal.h musl-git/arch/sh/bits/signal.h
 +#define _NSIG 65
 diff -Nur musl-0.9.15/arch/sh/bits/socket.h musl-git/arch/sh/bits/socket.h
 --- musl-0.9.15/arch/sh/bits/socket.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/socket.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/socket.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,17 @@
 +struct msghdr
 +{
@@ -1270,7 +1270,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/socket.h musl-git/arch/sh/bits/socket.h
 +};
 diff -Nur musl-0.9.15/arch/sh/bits/statfs.h musl-git/arch/sh/bits/statfs.h
 --- musl-0.9.15/arch/sh/bits/statfs.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/statfs.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/statfs.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +struct statfs {
 +	unsigned long f_type, f_bsize;
@@ -1281,7 +1281,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/statfs.h musl-git/arch/sh/bits/statfs.h
 +};
 diff -Nur musl-0.9.15/arch/sh/bits/stat.h musl-git/arch/sh/bits/stat.h
 --- musl-0.9.15/arch/sh/bits/stat.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/stat.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/stat.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +/* copied from kernel definition, but with padding replaced
 + * by the corresponding correctly-sized userspace types. */
@@ -1307,7 +1307,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/stat.h musl-git/arch/sh/bits/stat.h
 +};
 diff -Nur musl-0.9.15/arch/sh/bits/stdarg.h musl-git/arch/sh/bits/stdarg.h
 --- musl-0.9.15/arch/sh/bits/stdarg.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/stdarg.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/stdarg.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,4 @@
 +#define va_start(v,l)   __builtin_va_start(v,l)
 +#define va_end(v)       __builtin_va_end(v)
@@ -1315,7 +1315,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/stdarg.h musl-git/arch/sh/bits/stdarg.h
 +#define va_copy(d,s)    __builtin_va_copy(d,s)
 diff -Nur musl-0.9.15/arch/sh/bits/stdint.h musl-git/arch/sh/bits/stdint.h
 --- musl-0.9.15/arch/sh/bits/stdint.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/stdint.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/stdint.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,20 @@
 +typedef int32_t int_fast16_t;
 +typedef int32_t int_fast32_t;
@@ -1339,7 +1339,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/stdint.h musl-git/arch/sh/bits/stdint.h
 +#define SIZE_MAX        UINT32_MAX
 diff -Nur musl-0.9.15/arch/sh/bits/syscall.h musl-git/arch/sh/bits/syscall.h
 --- musl-0.9.15/arch/sh/bits/syscall.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/syscall.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/syscall.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,684 @@
 +#define __NR_restart_syscall        0
 +#define __NR_exit                   1
@@ -2027,7 +2027,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/syscall.h musl-git/arch/sh/bits/syscall.h
 +#define SYS_finit_module            368
 diff -Nur musl-0.9.15/arch/sh/bits/termios.h musl-git/arch/sh/bits/termios.h
 --- musl-0.9.15/arch/sh/bits/termios.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,160 @@
 +struct termios
 +{
@@ -2191,7 +2191,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/termios.h musl-git/arch/sh/bits/termios.h
 +#endif
 diff -Nur musl-0.9.15/arch/sh/crt_arch.h musl-git/arch/sh/crt_arch.h
 --- musl-0.9.15/arch/sh/crt_arch.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/crt_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/crt_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,9 @@
 +__asm__("\
 +.global _start \n\
@@ -2204,7 +2204,7 @@ diff -Nur musl-0.9.15/arch/sh/crt_arch.h musl-git/arch/sh/crt_arch.h
 +");
 diff -Nur musl-0.9.15/arch/sh/pthread_arch.h musl-git/arch/sh/pthread_arch.h
 --- musl-0.9.15/arch/sh/pthread_arch.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/pthread_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/pthread_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,11 @@
 +static inline struct pthread *__pthread_self()
 +{
@@ -2219,7 +2219,7 @@ diff -Nur musl-0.9.15/arch/sh/pthread_arch.h musl-git/arch/sh/pthread_arch.h
 +#define CANCEL_REG_IP 17
 diff -Nur musl-0.9.15/arch/sh/reloc.h musl-git/arch/sh/reloc.h
 --- musl-0.9.15/arch/sh/reloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/reloc.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/reloc.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,47 @@
 +#if __BYTE_ORDER == __BIG_ENDIAN
 +#define ENDIAN_SUFFIX "eb"
@@ -2270,7 +2270,7 @@ diff -Nur musl-0.9.15/arch/sh/reloc.h musl-git/arch/sh/reloc.h
 +}
 diff -Nur musl-0.9.15/arch/sh/src/atomic.c musl-git/arch/sh/src/atomic.c
 --- musl-0.9.15/arch/sh/src/atomic.c	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/src/atomic.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/src/atomic.c	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,146 @@
 +#include "libc.h"
 +
@@ -2420,13 +2420,13 @@ diff -Nur musl-0.9.15/arch/sh/src/atomic.c musl-git/arch/sh/src/atomic.c
 +}
 diff -Nur musl-0.9.15/arch/sh/src/__fpsrc_values.c musl-git/arch/sh/src/__fpsrc_values.c
 --- musl-0.9.15/arch/sh/src/__fpsrc_values.c	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/src/__fpsrc_values.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/src/__fpsrc_values.c	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,2 @@
 +/* used by gcc for switching the FPU between single and double precision */
 +const unsigned long __fpscr_values[2] = { 0, 0x80000 };
 diff -Nur musl-0.9.15/arch/sh/syscall_arch.h musl-git/arch/sh/syscall_arch.h
 --- musl-0.9.15/arch/sh/syscall_arch.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/sh/syscall_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,87 @@
 +#define __SYSCALL_LL_E(x) \
 +((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
@@ -2517,7 +2517,7 @@ diff -Nur musl-0.9.15/arch/sh/syscall_arch.h musl-git/arch/sh/syscall_arch.h
 +}
 diff -Nur musl-0.9.15/arch/x32/atomic.h musl-git/arch/x32/atomic.h
 --- musl-0.9.15/arch/x32/atomic.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/atomic.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/atomic.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,125 @@
 +#ifndef _INTERNAL_ATOMIC_H
 +#define _INTERNAL_ATOMIC_H
@@ -2646,7 +2646,7 @@ diff -Nur musl-0.9.15/arch/x32/atomic.h musl-git/arch/x32/atomic.h
 +#endif
 diff -Nur musl-0.9.15/arch/x32/bits/alltypes.h.in musl-git/arch/x32/bits/alltypes.h.in
 --- musl-0.9.15/arch/x32/bits/alltypes.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/alltypes.h.in	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/alltypes.h.in	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,28 @@
 +#define _Addr int
 +#define _Int64 long long
@@ -2678,12 +2678,12 @@ diff -Nur musl-0.9.15/arch/x32/bits/alltypes.h.in musl-git/arch/x32/bits/alltype
 +TYPEDEF struct { union { int __i[8]; void *__p[4]; } __u; } pthread_barrier_t;
 diff -Nur musl-0.9.15/arch/x32/bits/endian.h musl-git/arch/x32/bits/endian.h
 --- musl-0.9.15/arch/x32/bits/endian.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/endian.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/endian.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +#define __BYTE_ORDER __LITTLE_ENDIAN
 diff -Nur musl-0.9.15/arch/x32/bits/errno.h musl-git/arch/x32/bits/errno.h
 --- musl-0.9.15/arch/x32/bits/errno.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/errno.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/errno.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,134 @@
 +#define EPERM            1
 +#define ENOENT           2
@@ -2821,7 +2821,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/errno.h musl-git/arch/x32/bits/errno.h
 +#define EHWPOISON       133
 diff -Nur musl-0.9.15/arch/x32/bits/fcntl.h musl-git/arch/x32/bits/fcntl.h
 --- musl-0.9.15/arch/x32/bits/fcntl.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/fcntl.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/fcntl.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,39 @@
 +#define O_CREAT        0100
 +#define O_EXCL         0200
@@ -2864,7 +2864,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/fcntl.h musl-git/arch/x32/bits/fcntl.h
 +#define F_GETOWNER_UIDS 17
 diff -Nur musl-0.9.15/arch/x32/bits/fenv.h musl-git/arch/x32/bits/fenv.h
 --- musl-0.9.15/arch/x32/bits/fenv.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/fenv.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/fenv.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,34 @@
 +#define FE_INVALID    1
 +#define __FE_DENORM   2
@@ -2902,7 +2902,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/fenv.h musl-git/arch/x32/bits/fenv.h
 +#define FE_DFL_ENV      ((const fenv_t *) -1)
 diff -Nur musl-0.9.15/arch/x32/bits/float.h musl-git/arch/x32/bits/float.h
 --- musl-0.9.15/arch/x32/bits/float.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/float.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/float.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,21 @@
 +#define FLT_ROUNDS 1
 +#ifdef __FLT_EVAL_METHOD__
@@ -2927,7 +2927,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/float.h musl-git/arch/x32/bits/float.h
 +#define DECIMAL_DIG 21
 diff -Nur musl-0.9.15/arch/x32/bits/ioctl.h musl-git/arch/x32/bits/ioctl.h
 --- musl-0.9.15/arch/x32/bits/ioctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/ioctl.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/ioctl.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,197 @@
 +#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
 +#define _IOC_NONE  0U
@@ -3128,7 +3128,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/ioctl.h musl-git/arch/x32/bits/ioctl.h
 +#define SIOCPROTOPRIVATE 0x89E0
 diff -Nur musl-0.9.15/arch/x32/bits/io.h musl-git/arch/x32/bits/io.h
 --- musl-0.9.15/arch/x32/bits/io.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/io.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/io.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,77 @@
 +static __inline void outb(unsigned char __val, unsigned short __port)
 +{
@@ -3209,7 +3209,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/io.h musl-git/arch/x32/bits/io.h
 +}
 diff -Nur musl-0.9.15/arch/x32/bits/ipc.h musl-git/arch/x32/bits/ipc.h
 --- musl-0.9.15/arch/x32/bits/ipc.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/ipc.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/ipc.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,14 @@
 +struct ipc_perm
 +{
@@ -3227,7 +3227,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/ipc.h musl-git/arch/x32/bits/ipc.h
 +#define IPC_64 0
 diff -Nur musl-0.9.15/arch/x32/bits/limits.h musl-git/arch/x32/bits/limits.h
 --- musl-0.9.15/arch/x32/bits/limits.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/limits.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/limits.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,8 @@
 +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
 + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
@@ -3239,7 +3239,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/limits.h musl-git/arch/x32/bits/limits.h
 +#define LLONG_MAX  0x7fffffffffffffffLL
 diff -Nur musl-0.9.15/arch/x32/bits/mman.h musl-git/arch/x32/bits/mman.h
 --- musl-0.9.15/arch/x32/bits/mman.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/mman.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/mman.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,62 @@
 +#define MAP_FAILED ((void *) -1)
 +
@@ -3305,7 +3305,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/mman.h musl-git/arch/x32/bits/mman.h
 +#endif
 diff -Nur musl-0.9.15/arch/x32/bits/msg.h musl-git/arch/x32/bits/msg.h
 --- musl-0.9.15/arch/x32/bits/msg.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/msg.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/msg.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,16 @@
 +struct msqid_ds
 +{
@@ -3325,13 +3325,13 @@ diff -Nur musl-0.9.15/arch/x32/bits/msg.h musl-git/arch/x32/bits/msg.h
 +};
 diff -Nur musl-0.9.15/arch/x32/bits/posix.h musl-git/arch/x32/bits/posix.h
 --- musl-0.9.15/arch/x32/bits/posix.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/posix.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/posix.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,2 @@
 +#define _POSIX_V6_LP64_OFF64  1
 +#define _POSIX_V7_LP64_OFF64  1
 diff -Nur musl-0.9.15/arch/x32/bits/reg.h musl-git/arch/x32/bits/reg.h
 --- musl-0.9.15/arch/x32/bits/reg.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/reg.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/reg.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,29 @@
 +#undef __WORDSIZE
 +#define __WORDSIZE 32
@@ -3364,12 +3364,12 @@ diff -Nur musl-0.9.15/arch/x32/bits/reg.h musl-git/arch/x32/bits/reg.h
 +#define GS     26
 diff -Nur musl-0.9.15/arch/x32/bits/setjmp.h musl-git/arch/x32/bits/setjmp.h
 --- musl-0.9.15/arch/x32/bits/setjmp.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/setjmp.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/setjmp.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +typedef unsigned long long __jmp_buf[8];
 diff -Nur musl-0.9.15/arch/x32/bits/shm.h musl-git/arch/x32/bits/shm.h
 --- musl-0.9.15/arch/x32/bits/shm.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,33 @@
 +#define SHMLBA 4096
 +
@@ -3406,7 +3406,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/shm.h musl-git/arch/x32/bits/shm.h
 +;
 diff -Nur musl-0.9.15/arch/x32/bits/signal.h musl-git/arch/x32/bits/signal.h
 --- musl-0.9.15/arch/x32/bits/signal.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/signal.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/signal.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,119 @@
 +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
 + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
@@ -3529,7 +3529,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/signal.h musl-git/arch/x32/bits/signal.h
 +
 diff -Nur musl-0.9.15/arch/x32/bits/socket.h musl-git/arch/x32/bits/socket.h
 --- musl-0.9.15/arch/x32/bits/socket.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/socket.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/socket.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,18 @@
 +struct msghdr
 +{
@@ -3551,7 +3551,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/socket.h musl-git/arch/x32/bits/socket.h
 +};
 diff -Nur musl-0.9.15/arch/x32/bits/statfs.h musl-git/arch/x32/bits/statfs.h
 --- musl-0.9.15/arch/x32/bits/statfs.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/statfs.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/statfs.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +struct statfs {
 +	unsigned long f_type, f_bsize;
@@ -3562,7 +3562,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/statfs.h musl-git/arch/x32/bits/statfs.h
 +};
 diff -Nur musl-0.9.15/arch/x32/bits/stat.h musl-git/arch/x32/bits/stat.h
 --- musl-0.9.15/arch/x32/bits/stat.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/stat.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/stat.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +/* copied from kernel definition, but with padding replaced
 + * by the corresponding correctly-sized userspace types. */
@@ -3588,7 +3588,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/stat.h musl-git/arch/x32/bits/stat.h
 +};
 diff -Nur musl-0.9.15/arch/x32/bits/stdarg.h musl-git/arch/x32/bits/stdarg.h
 --- musl-0.9.15/arch/x32/bits/stdarg.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/stdarg.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/stdarg.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,4 @@
 +#define va_start(v,l)   __builtin_va_start(v,l)
 +#define va_end(v)       __builtin_va_end(v)
@@ -3596,7 +3596,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/stdarg.h musl-git/arch/x32/bits/stdarg.h
 +#define va_copy(d,s)    __builtin_va_copy(d,s)
 diff -Nur musl-0.9.15/arch/x32/bits/stdint.h musl-git/arch/x32/bits/stdint.h
 --- musl-0.9.15/arch/x32/bits/stdint.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/stdint.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/stdint.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,20 @@
 +typedef int32_t int_fast16_t;
 +typedef int32_t int_fast32_t;
@@ -3620,7 +3620,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/stdint.h musl-git/arch/x32/bits/stdint.h
 +#define SIZE_MAX        UINT32_MAX
 diff -Nur musl-0.9.15/arch/x32/bits/syscall.h musl-git/arch/x32/bits/syscall.h
 --- musl-0.9.15/arch/x32/bits/syscall.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/syscall.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/syscall.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,634 @@
 +#define __X32_SYSCALL_BIT        0x40000000
 +#define __NR_read (__X32_SYSCALL_BIT + 0)
@@ -4258,7 +4258,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/syscall.h musl-git/arch/x32/bits/syscall.h
 +#define SYS_fadvise SYS_fadvise64
 diff -Nur musl-0.9.15/arch/x32/bits/termios.h musl-git/arch/x32/bits/termios.h
 --- musl-0.9.15/arch/x32/bits/termios.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,160 @@
 +struct termios
 +{
@@ -4422,7 +4422,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/termios.h musl-git/arch/x32/bits/termios.h
 +#endif
 diff -Nur musl-0.9.15/arch/x32/bits/user.h musl-git/arch/x32/bits/user.h
 --- musl-0.9.15/arch/x32/bits/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/bits/user.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/bits/user.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,44 @@
 +#undef __WORDSIZE
 +#define __WORDSIZE 64
@@ -4470,7 +4470,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/user.h musl-git/arch/x32/bits/user.h
 +#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
 diff -Nur musl-0.9.15/arch/x32/crt_arch.h musl-git/arch/x32/crt_arch.h
 --- musl-0.9.15/arch/x32/crt_arch.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/crt_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/crt_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,9 @@
 +__asm__("\
 +.text \n\
@@ -4483,7 +4483,7 @@ diff -Nur musl-0.9.15/arch/x32/crt_arch.h musl-git/arch/x32/crt_arch.h
 +");
 diff -Nur musl-0.9.15/arch/x32/pthread_arch.h musl-git/arch/x32/pthread_arch.h
 --- musl-0.9.15/arch/x32/pthread_arch.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/pthread_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/pthread_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,10 @@
 +static inline struct pthread *__pthread_self()
 +{
@@ -4497,7 +4497,7 @@ diff -Nur musl-0.9.15/arch/x32/pthread_arch.h musl-git/arch/x32/pthread_arch.h
 +#define CANCEL_REG_IP 16
 diff -Nur musl-0.9.15/arch/x32/reloc.h musl-git/arch/x32/reloc.h
 --- musl-0.9.15/arch/x32/reloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/reloc.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/reloc.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,46 @@
 +#include <stdint.h>
 +#include <string.h>
@@ -4547,7 +4547,7 @@ diff -Nur musl-0.9.15/arch/x32/reloc.h musl-git/arch/x32/reloc.h
 +}
 diff -Nur musl-0.9.15/arch/x32/src/syscall_cp_fixup.c musl-git/arch/x32/src/syscall_cp_fixup.c
 --- musl-0.9.15/arch/x32/src/syscall_cp_fixup.c	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/src/syscall_cp_fixup.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/src/syscall_cp_fixup.c	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,31 @@
 +#include <sys/syscall.h>
 +long __syscall_cp_internal(volatile void*, long long, long long, long long, long long,
@@ -4580,9 +4580,60 @@ diff -Nur musl-0.9.15/arch/x32/src/syscall_cp_fixup.c musl-git/arch/x32/src/sysc
 +	return __syscall_cp_internal(foo, n, a1, a2, a3, a4, a5, a6);
 +}
 +
+diff -Nur musl-0.9.15/arch/x32/src/sysinfo.c musl-git/arch/x32/src/sysinfo.c
+--- musl-0.9.15/arch/x32/src/sysinfo.c	1970-01-01 01:00:00.000000000 +0100
++++ musl-git/arch/x32/src/sysinfo.c	2014-03-07 14:03:57.000000000 +0100
+@@ -0,0 +1,47 @@
++#include <sys/sysinfo.h>
++#include "syscall.h"
++
++#define klong long long
++#define kulong unsigned long long
++
++struct kernel_sysinfo {
++	klong uptime;
++	kulong loads[3];
++	kulong totalram;
++	kulong freeram;
++	kulong sharedram;
++	kulong bufferram;
++	kulong totalswap;
++	kulong freeswap;
++	short procs;
++	short pad;
++	kulong totalhigh;
++	kulong freehigh;
++	unsigned mem_unit;
++};
++
++int __x32_sysinfo(struct sysinfo *info)
++{
++	struct kernel_sysinfo tmp;
++	int ret = syscall(SYS_sysinfo, &tmp);
++	if(ret == -1) return ret;
++	info->uptime = tmp.uptime;
++	info->loads[0] = tmp.loads[0];
++	info->loads[1] = tmp.loads[1];
++	info->loads[2] = tmp.loads[2];
++	kulong shifts;
++	kulong max = tmp.totalram | tmp.totalswap;
++	__asm__("bsr %1,%0" : "=r"(shifts) : "r"(max));
++	shifts = shifts >= 32 ? shifts - 31 : 0;
++	info->totalram = tmp.totalram >> shifts;
++	info->freeram = tmp.freeram >> shifts;
++	info->sharedram = tmp.sharedram >> shifts;
++	info->bufferram = tmp.bufferram >> shifts;
++	info->totalswap = tmp.totalswap >> shifts;
++	info->freeswap = tmp.freeswap >> shifts;
++	info->procs = tmp.procs ;
++	info->totalhigh = tmp.totalhigh >> shifts;
++	info->freehigh = tmp.freehigh >> shifts;
++	info->mem_unit = (tmp.mem_unit ? tmp.mem_unit : 1) << shifts;
++	return ret;
++}
 diff -Nur musl-0.9.15/arch/x32/syscall_arch.h musl-git/arch/x32/syscall_arch.h
 --- musl-0.9.15/arch/x32/syscall_arch.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/x32/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x32/syscall_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,117 @@
 +#define __SYSCALL_LL_E(x) (x)
 +#define __SYSCALL_LL_O(x) (x)
@@ -4703,7 +4754,7 @@ diff -Nur musl-0.9.15/arch/x32/syscall_arch.h musl-git/arch/x32/syscall_arch.h
 +}
 diff -Nur musl-0.9.15/arch/x86_64/atomic.h musl-git/arch/x86_64/atomic.h
 --- musl-0.9.15/arch/x86_64/atomic.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/x86_64/atomic.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x86_64/atomic.h	2014-03-07 14:03:57.000000000 +0100
 @@ -5,38 +5,36 @@
  
  static inline int a_ctz_64(uint64_t x)
@@ -4789,7 +4840,7 @@ diff -Nur musl-0.9.15/arch/x86_64/atomic.h musl-git/arch/x86_64/atomic.h
  static inline void a_spin()
 diff -Nur musl-0.9.15/arch/x86_64/bits/shm.h musl-git/arch/x86_64/bits/shm.h
 --- musl-0.9.15/arch/x86_64/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/x86_64/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x86_64/bits/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -13,3 +13,14 @@
  	unsigned long __pad1;
  	unsigned long __pad2;
@@ -4807,7 +4858,7 @@ diff -Nur musl-0.9.15/arch/x86_64/bits/shm.h musl-git/arch/x86_64/bits/shm.h
 +
 diff -Nur musl-0.9.15/arch/x86_64/bits/stat.h musl-git/arch/x86_64/bits/stat.h
 --- musl-0.9.15/arch/x86_64/bits/stat.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/x86_64/bits/stat.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x86_64/bits/stat.h	2014-03-07 14:03:57.000000000 +0100
 @@ -2,7 +2,7 @@
   * by the corresponding correctly-sized userspace types. */
  
@@ -4819,7 +4870,7 @@ diff -Nur musl-0.9.15/arch/x86_64/bits/stat.h musl-git/arch/x86_64/bits/stat.h
  
 diff -Nur musl-0.9.15/arch/x86_64/bits/termios.h musl-git/arch/x86_64/bits/termios.h
 --- musl-0.9.15/arch/x86_64/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/x86_64/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x86_64/bits/termios.h	2014-03-07 14:03:57.000000000 +0100
 @@ -42,6 +42,7 @@
  #define IXANY   0004000
  #define IXOFF   0010000
@@ -4875,7 +4926,7 @@ diff -Nur musl-0.9.15/arch/x86_64/bits/termios.h musl-git/arch/x86_64/bits/termi
 +#endif
 diff -Nur musl-0.9.15/arch/x86_64/pthread_arch.h musl-git/arch/x86_64/pthread_arch.h
 --- musl-0.9.15/arch/x86_64/pthread_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/x86_64/pthread_arch.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/arch/x86_64/pthread_arch.h	2014-03-07 14:03:57.000000000 +0100
 @@ -1,7 +1,7 @@
  static inline struct pthread *__pthread_self()
  {
@@ -4887,7 +4938,7 @@ diff -Nur musl-0.9.15/arch/x86_64/pthread_arch.h musl-git/arch/x86_64/pthread_ar
  
 diff -Nur musl-0.9.15/configure musl-git/configure
 --- musl-0.9.15/configure	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/configure	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/configure	2014-03-07 14:03:57.000000000 +0100
 @@ -222,12 +222,16 @@
  # Convert to just ARCH
  #
@@ -4952,9 +5003,29 @@ diff -Nur musl-0.9.15/configure musl-git/configure
  test "$SUBARCH" \
  && printf "configured for %s variant: %s\n" "$ARCH" "$ARCH$SUBARCH"
  
+diff -Nur musl-0.9.15/COPYRIGHT musl-git/COPYRIGHT
+--- musl-0.9.15/COPYRIGHT	2014-01-03 21:12:17.000000000 +0100
++++ musl-git/COPYRIGHT	2014-03-07 14:03:57.000000000 +0100
+@@ -1,6 +1,6 @@
+ musl as a whole is licensed under the following standard MIT license:
+ 
+-Copyright © 2005-2013 Rich Felker
++Copyright © 2005-2014 Rich Felker
+ 
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+@@ -79,7 +79,7 @@
+ from Bionic libc, used on Android.
+ 
+ All other files which have no copyright comments are original works
+-Copyright © 2005-2013 Rich Felker, the main author of this library.
++Copyright © 2005-2014 Rich Felker, the main author of this library.
+ The decision to exclude such comments is intentional, as it should be
+ possible to carry around the complete source code on tiny storage
+ media. All public header files (include/* and arch/*/bits/*) should be
 diff -Nur musl-0.9.15/crt/superh/crti.s musl-git/crt/superh/crti.s
 --- musl-0.9.15/crt/superh/crti.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/crt/superh/crti.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/crt/superh/crti.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,13 @@
 +.section .init
 +.global  _init
@@ -4971,7 +5042,7 @@ diff -Nur musl-0.9.15/crt/superh/crti.s musl-git/crt/superh/crti.s
 +	nop
 diff -Nur musl-0.9.15/crt/superh/crtn.s musl-git/crt/superh/crtn.s
 --- musl-0.9.15/crt/superh/crtn.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/crt/superh/crtn.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/crt/superh/crtn.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,9 @@
 +.section .init
 +	lds.l @r15+, pr
@@ -4984,7 +5055,7 @@ diff -Nur musl-0.9.15/crt/superh/crtn.s musl-git/crt/superh/crtn.s
 +	 nop
 diff -Nur musl-0.9.15/crt/x32/crti.s musl-git/crt/x32/crti.s
 --- musl-0.9.15/crt/x32/crti.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/crt/x32/crti.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/crt/x32/crti.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,9 @@
 +.section .init
 +.global _init
@@ -4997,7 +5068,7 @@ diff -Nur musl-0.9.15/crt/x32/crti.s musl-git/crt/x32/crti.s
 +	push %rax
 diff -Nur musl-0.9.15/crt/x32/crtn.s musl-git/crt/x32/crtn.s
 --- musl-0.9.15/crt/x32/crtn.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/crt/x32/crtn.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/crt/x32/crtn.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.section .init
 +	pop %rax
@@ -5008,7 +5079,7 @@ diff -Nur musl-0.9.15/crt/x32/crtn.s musl-git/crt/x32/crtn.s
 +	ret
 diff -Nur musl-0.9.15/.gitignore musl-git/.gitignore
 --- musl-0.9.15/.gitignore	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/.gitignore	2014-03-01 08:58:13.000000000 +0100
++++ musl-git/.gitignore	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,11 @@
 +*.o
 +*.lo
@@ -5023,7 +5094,7 @@ diff -Nur musl-0.9.15/.gitignore musl-git/.gitignore
 +src/internal/version.h
 diff -Nur musl-0.9.15/include/arpa/inet.h musl-git/include/arpa/inet.h
 --- musl-0.9.15/include/arpa/inet.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/arpa/inet.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/arpa/inet.h	2014-03-07 14:03:57.000000000 +0100
 @@ -20,7 +20,7 @@
  const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t);
  
@@ -5035,7 +5106,7 @@ diff -Nur musl-0.9.15/include/arpa/inet.h musl-git/include/arpa/inet.h
  
 diff -Nur musl-0.9.15/include/dlfcn.h musl-git/include/dlfcn.h
 --- musl-0.9.15/include/dlfcn.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/dlfcn.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/dlfcn.h	2014-03-07 14:03:57.000000000 +0100
 @@ -31,7 +31,7 @@
  	const char *dli_sname;
  	void *dli_saddr;
@@ -5047,7 +5118,7 @@ diff -Nur musl-0.9.15/include/dlfcn.h musl-git/include/dlfcn.h
  
 diff -Nur musl-0.9.15/include/elf.h musl-git/include/elf.h
 --- musl-0.9.15/include/elf.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/elf.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/elf.h	2014-03-07 14:03:57.000000000 +0100
 @@ -1153,6 +1153,7 @@
  #define EF_MIPS_64BIT_WHIRL 16
  #define EF_MIPS_ABI2	    32
@@ -5176,7 +5247,7 @@ diff -Nur musl-0.9.15/include/elf.h musl-git/include/elf.h
  #define R_AARCH64_JUMP_SLOT    1026
 diff -Nur musl-0.9.15/include/fcntl.h musl-git/include/fcntl.h
 --- musl-0.9.15/include/fcntl.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/fcntl.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/fcntl.h	2014-03-07 14:03:57.000000000 +0100
 @@ -148,6 +148,7 @@
  #define SPLICE_F_MORE 4
  #define SPLICE_F_GIFT 8
@@ -5195,7 +5266,7 @@ diff -Nur musl-0.9.15/include/fcntl.h musl-git/include/fcntl.h
  #define creat64 creat
 diff -Nur musl-0.9.15/include/netdb.h musl-git/include/netdb.h
 --- musl-0.9.15/include/netdb.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/netdb.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/netdb.h	2014-03-07 14:03:57.000000000 +0100
 @@ -131,6 +131,7 @@
  #define TRY_AGAIN      2
  #define NO_RECOVERY    3
@@ -5206,7 +5277,7 @@ diff -Nur musl-0.9.15/include/netdb.h musl-git/include/netdb.h
  #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 diff -Nur musl-0.9.15/include/netinet/if_ether.h musl-git/include/netinet/if_ether.h
 --- musl-0.9.15/include/netinet/if_ether.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/netinet/if_ether.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/netinet/if_ether.h	2014-03-07 14:03:57.000000000 +0100
 @@ -54,6 +54,7 @@
  #define ETH_P_8021AH	0x88E7
  #define ETH_P_MVRP	0x88F5
@@ -5217,7 +5288,7 @@ diff -Nur musl-0.9.15/include/netinet/if_ether.h musl-git/include/netinet/if_eth
  #define ETH_P_FIP	0x8914
 diff -Nur musl-0.9.15/include/netinet/in.h musl-git/include/netinet/in.h
 --- musl-0.9.15/include/netinet/in.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/netinet/in.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/netinet/in.h	2014-03-07 14:03:57.000000000 +0100
 @@ -149,7 +149,7 @@
          (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe))
  
@@ -5326,7 +5397,7 @@ diff -Nur musl-0.9.15/include/netinet/in.h musl-git/include/netinet/in.h
  
 diff -Nur musl-0.9.15/include/netinet/tcp.h musl-git/include/netinet/tcp.h
 --- musl-0.9.15/include/netinet/tcp.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/netinet/tcp.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/netinet/tcp.h	2014-03-07 14:03:57.000000000 +0100
 @@ -44,42 +44,80 @@
  #define SOL_TCP 6
  #include <sys/types.h>
@@ -5524,7 +5595,7 @@ diff -Nur musl-0.9.15/include/netinet/tcp.h musl-git/include/netinet/tcp.h
  #endif
 diff -Nur musl-0.9.15/include/netinet/udp.h musl-git/include/netinet/udp.h
 --- musl-0.9.15/include/netinet/udp.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/netinet/udp.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/netinet/udp.h	2014-03-07 14:03:57.000000000 +0100
 @@ -5,19 +5,22 @@
  extern "C" {
  #endif
@@ -5557,7 +5628,7 @@ diff -Nur musl-0.9.15/include/netinet/udp.h musl-git/include/netinet/udp.h
  #define UDP_ENCAP	100
 diff -Nur musl-0.9.15/include/sched.h musl-git/include/sched.h
 --- musl-0.9.15/include/sched.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sched.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sched.h	2014-03-07 14:03:57.000000000 +0100
 @@ -78,7 +78,7 @@
  int sched_getaffinity(pid_t, size_t, cpu_set_t *);
  int sched_setaffinity(pid_t, size_t, const cpu_set_t *);
@@ -5569,7 +5640,7 @@ diff -Nur musl-0.9.15/include/sched.h musl-git/include/sched.h
  #define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=)
 diff -Nur musl-0.9.15/include/signal.h musl-git/include/signal.h
 --- musl-0.9.15/include/signal.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/signal.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/signal.h	2014-03-07 14:03:57.000000000 +0100
 @@ -227,8 +227,8 @@
  typedef void (*sighandler_t)(int);
  void (*bsd_signal(int, void (*)(int)))(int);
@@ -5583,7 +5654,7 @@ diff -Nur musl-0.9.15/include/signal.h musl-git/include/signal.h
  #define SA_ONESHOT SA_RESETHAND
 diff -Nur musl-0.9.15/include/stdlib.h musl-git/include/stdlib.h
 --- musl-0.9.15/include/stdlib.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/stdlib.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/stdlib.h	2014-03-07 14:03:57.000000000 +0100
 @@ -93,7 +93,7 @@
  #define WSTOPSIG(s) WEXITSTATUS(s)
  #define WIFEXITED(s) (!WTERMSIG(s))
@@ -5595,7 +5666,7 @@ diff -Nur musl-0.9.15/include/stdlib.h musl-git/include/stdlib.h
  int setenv (const char *, const char *, int);
 diff -Nur musl-0.9.15/include/sys/inotify.h musl-git/include/sys/inotify.h
 --- musl-0.9.15/include/sys/inotify.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/inotify.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/inotify.h	2014-03-07 14:03:57.000000000 +0100
 @@ -48,7 +48,7 @@
  int inotify_init(void);
  int inotify_init1(int);
@@ -5607,7 +5678,7 @@ diff -Nur musl-0.9.15/include/sys/inotify.h musl-git/include/sys/inotify.h
  }
 diff -Nur musl-0.9.15/include/sys/mman.h musl-git/include/sys/mman.h
 --- musl-0.9.15/include/sys/mman.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/mman.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/mman.h	2014-03-07 14:03:57.000000000 +0100
 @@ -33,7 +33,7 @@
  
  #ifdef _GNU_SOURCE
@@ -5619,7 +5690,7 @@ diff -Nur musl-0.9.15/include/sys/mman.h musl-git/include/sys/mman.h
  #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 diff -Nur musl-0.9.15/include/sys/sem.h musl-git/include/sys/sem.h
 --- musl-0.9.15/include/sys/sem.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/sem.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/sem.h	2014-03-07 14:03:57.000000000 +0100
 @@ -29,19 +29,19 @@
  
  struct semid_ds {
@@ -5650,7 +5721,7 @@ diff -Nur musl-0.9.15/include/sys/sem.h musl-git/include/sys/sem.h
  #define _SEM_SEMUN_UNDEFINED 1
 diff -Nur musl-0.9.15/include/sys/shm.h musl-git/include/sys/shm.h
 --- musl-0.9.15/include/sys/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/shm.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/shm.h	2014-03-07 14:03:57.000000000 +0100
 @@ -14,6 +14,13 @@
  #include <bits/alltypes.h>
  
@@ -5688,7 +5759,7 @@ diff -Nur musl-0.9.15/include/sys/shm.h musl-git/include/sys/shm.h
  void *shmat(int, const void *, int);
 diff -Nur musl-0.9.15/include/sys/socket.h musl-git/include/sys/socket.h
 --- musl-0.9.15/include/sys/socket.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/socket.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/socket.h	2014-03-07 14:03:57.000000000 +0100
 @@ -202,11 +202,16 @@
  #define SO_LOCK_FILTER          44
  #define SO_SELECT_ERR_QUEUE     45
@@ -5729,7 +5800,7 @@ diff -Nur musl-0.9.15/include/sys/sysctl.h musl-git/include/sys/sysctl.h
 -#endif
 diff -Nur musl-0.9.15/include/sys/time.h musl-git/include/sys/time.h
 --- musl-0.9.15/include/sys/time.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/time.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/time.h	2014-03-07 14:03:57.000000000 +0100
 @@ -51,6 +51,17 @@
  	((a)->tv_usec += 1000000, (a)->tv_sec--) )
  #endif
@@ -5750,7 +5821,7 @@ diff -Nur musl-0.9.15/include/sys/time.h musl-git/include/sys/time.h
  #endif
 diff -Nur musl-0.9.15/include/sys/wait.h musl-git/include/sys/wait.h
 --- musl-0.9.15/include/sys/wait.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/sys/wait.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/sys/wait.h	2014-03-07 14:03:57.000000000 +0100
 @@ -50,7 +50,7 @@
  #define WCOREDUMP(s) ((s) & 0x80)
  #define WIFEXITED(s) (!WTERMSIG(s))
@@ -5762,7 +5833,7 @@ diff -Nur musl-0.9.15/include/sys/wait.h musl-git/include/sys/wait.h
  #ifdef __cplusplus
 diff -Nur musl-0.9.15/include/syslog.h musl-git/include/syslog.h
 --- musl-0.9.15/include/syslog.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/syslog.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/syslog.h	2014-03-07 14:03:57.000000000 +0100
 @@ -21,7 +21,7 @@
  #define	LOG_MAKEPRI(f, p) (((f)<<3)|(p))
  
@@ -5774,7 +5845,7 @@ diff -Nur musl-0.9.15/include/syslog.h musl-git/include/syslog.h
  #define LOG_USER     (1<<3)
 diff -Nur musl-0.9.15/include/time.h musl-git/include/time.h
 --- musl-0.9.15/include/time.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/time.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/time.h	2014-03-07 14:03:57.000000000 +0100
 @@ -125,7 +125,7 @@
  
  
@@ -5786,7 +5857,7 @@ diff -Nur musl-0.9.15/include/time.h musl-git/include/time.h
  
 diff -Nur musl-0.9.15/include/utmp.h musl-git/include/utmp.h
 --- musl-0.9.15/include/utmp.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/utmp.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/utmp.h	2014-03-07 14:03:57.000000000 +0100
 @@ -10,6 +10,7 @@
  #define ACCOUNTING 9
  #define UT_NAMESIZE 32
@@ -5806,7 +5877,7 @@ diff -Nur musl-0.9.15/include/utmp.h musl-git/include/utmp.h
  struct utmp *getutent(void);
 diff -Nur musl-0.9.15/include/utmpx.h musl-git/include/utmpx.h
 --- musl-0.9.15/include/utmpx.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/include/utmpx.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/include/utmpx.h	2014-03-07 14:03:57.000000000 +0100
 @@ -5,6 +5,8 @@
  extern "C" {
  #endif
@@ -5853,7 +5924,7 @@ diff -Nur musl-0.9.15/include/utmpx.h musl-git/include/utmpx.h
  #define RUN_LVL         1
 diff -Nur musl-0.9.15/src/crypt/crypt_des.c musl-git/src/crypt/crypt_des.c
 --- musl-0.9.15/src/crypt/crypt_des.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/crypt/crypt_des.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/crypt/crypt_des.c	2014-03-07 14:03:57.000000000 +0100
 @@ -692,7 +692,7 @@
  	return saltbits;
  }
@@ -5910,7 +5981,7 @@ diff -Nur musl-0.9.15/src/crypt/crypt_des.c musl-git/src/crypt/crypt_des.c
  	 * Now encode the result...
 diff -Nur musl-0.9.15/src/crypt/encrypt.c musl-git/src/crypt/encrypt.c
 --- musl-0.9.15/src/crypt/encrypt.c	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/crypt/encrypt.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/crypt/encrypt.c	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,60 @@
 +#include <stdint.h>
 +#include <stdlib.h>
@@ -5974,7 +6045,7 @@ diff -Nur musl-0.9.15/src/crypt/encrypt.c musl-git/src/crypt/encrypt.c
 +}
 diff -Nur musl-0.9.15/src/dirent/readdir.c musl-git/src/dirent/readdir.c
 --- musl-0.9.15/src/dirent/readdir.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/dirent/readdir.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/dirent/readdir.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,5 +1,7 @@
  #include <dirent.h>
 +#include <errno.h>
@@ -5997,9 +6068,34 @@ diff -Nur musl-0.9.15/src/dirent/readdir.c musl-git/src/dirent/readdir.c
  		dir->buf_end = len;
  		dir->buf_pos = 0;
  	}
+diff -Nur musl-0.9.15/src/errno/strerror.c musl-git/src/errno/strerror.c
+--- musl-0.9.15/src/errno/strerror.c	2014-01-03 21:12:17.000000000 +0100
++++ musl-git/src/errno/strerror.c	2014-03-07 14:03:57.000000000 +0100
+@@ -1,7 +1,7 @@
+ #include <errno.h>
+ #include <string.h>
+ 
+-#define E(a,b) a,
++#define E(a,b) ((unsigned char)a),
+ static const unsigned char errid[] = {
+ #include "__strerror.h"
+ };
+@@ -16,6 +16,12 @@
+ {
+ 	const char *s;
+ 	int i;
++	/* mips has one error code outside of the 8-bit range due to a
++	 * historical typo, so we just remap it. */
++	if (EDQUOT==1133) {
++		if (e==109) e=-1;
++		else if (e==EDQUOT) e=109;
++	}
+ 	for (i=0; errid[i] && errid[i] != e; i++);
+ 	for (s=errmsg; i; s++, i--) for (; *s; s++);
+ 	return (char *)s;
 diff -Nur musl-0.9.15/src/fcntl/fcntl.c musl-git/src/fcntl/fcntl.c
 --- musl-0.9.15/src/fcntl/fcntl.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/fcntl/fcntl.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fcntl/fcntl.c	2014-03-07 14:03:57.000000000 +0100
 @@ -13,11 +13,11 @@
  	arg = va_arg(ap, long);
  	va_end(ap);
@@ -6032,7 +6128,7 @@ diff -Nur musl-0.9.15/src/fcntl/fcntl.c musl-git/src/fcntl/fcntl.c
  }
 diff -Nur musl-0.9.15/src/fcntl/posix_fadvise.c musl-git/src/fcntl/posix_fadvise.c
 --- musl-0.9.15/src/fcntl/posix_fadvise.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/fcntl/posix_fadvise.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fcntl/posix_fadvise.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,8 +1,11 @@
  #include <fcntl.h>
  #include "syscall.h"
@@ -6047,7 +6143,7 @@ diff -Nur musl-0.9.15/src/fcntl/posix_fadvise.c musl-git/src/fcntl/posix_fadvise
 +LFS64(posix_fadvise);
 diff -Nur musl-0.9.15/src/fcntl/posix_fallocate.c musl-git/src/fcntl/posix_fallocate.c
 --- musl-0.9.15/src/fcntl/posix_fallocate.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/fcntl/posix_fallocate.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fcntl/posix_fallocate.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,8 +1,11 @@
  #include <fcntl.h>
  #include "syscall.h"
@@ -6062,7 +6158,7 @@ diff -Nur musl-0.9.15/src/fcntl/posix_fallocate.c musl-git/src/fcntl/posix_fallo
 +LFS64(posix_fallocate);
 diff -Nur musl-0.9.15/src/fenv/i386/fenv.s musl-git/src/fenv/i386/fenv.s
 --- musl-0.9.15/src/fenv/i386/fenv.s	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/fenv/i386/fenv.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/i386/fenv.s	2014-03-07 14:03:57.000000000 +0100
 @@ -126,7 +126,7 @@
  	push %eax
  	push %eax
@@ -6074,17 +6170,17 @@ diff -Nur musl-0.9.15/src/fenv/i386/fenv.s musl-git/src/fenv/i386/fenv.s
  	fldenv (%esp)
 diff -Nur musl-0.9.15/src/fenv/mipsel-sf/fenv.sub musl-git/src/fenv/mipsel-sf/fenv.sub
 --- musl-0.9.15/src/fenv/mipsel-sf/fenv.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/fenv/mipsel-sf/fenv.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/mipsel-sf/fenv.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../fenv.c
 diff -Nur musl-0.9.15/src/fenv/mips-sf/fenv.sub musl-git/src/fenv/mips-sf/fenv.sub
 --- musl-0.9.15/src/fenv/mips-sf/fenv.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/fenv/mips-sf/fenv.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/mips-sf/fenv.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../fenv.c
 diff -Nur musl-0.9.15/src/fenv/sh/fenv.s musl-git/src/fenv/sh/fenv.s
 --- musl-0.9.15/src/fenv/sh/fenv.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/fenv/sh/fenv.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/sh/fenv.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,74 @@
 +.global fegetround
 +.type   fegetround, @function
@@ -6162,17 +6258,17 @@ diff -Nur musl-0.9.15/src/fenv/sh/fenv.s musl-git/src/fenv/sh/fenv.s
 +	 mov #0, r0
 diff -Nur musl-0.9.15/src/fenv/sheb-nofpu/fenv.sub musl-git/src/fenv/sheb-nofpu/fenv.sub
 --- musl-0.9.15/src/fenv/sheb-nofpu/fenv.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/fenv/sheb-nofpu/fenv.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/sheb-nofpu/fenv.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../fenv.c
 diff -Nur musl-0.9.15/src/fenv/sh-nofpu/fenv.sub musl-git/src/fenv/sh-nofpu/fenv.sub
 --- musl-0.9.15/src/fenv/sh-nofpu/fenv.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/fenv/sh-nofpu/fenv.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/sh-nofpu/fenv.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../fenv.c
 diff -Nur musl-0.9.15/src/fenv/x32/fenv.s musl-git/src/fenv/x32/fenv.s
 --- musl-0.9.15/src/fenv/x32/fenv.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/fenv/x32/fenv.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/x32/fenv.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,97 @@
 +.global feclearexcept
 +.type feclearexcept,@function
@@ -6273,7 +6369,7 @@ diff -Nur musl-0.9.15/src/fenv/x32/fenv.s musl-git/src/fenv/x32/fenv.s
 +	ret
 diff -Nur musl-0.9.15/src/fenv/x86_64/fenv.s musl-git/src/fenv/x86_64/fenv.s
 --- musl-0.9.15/src/fenv/x86_64/fenv.s	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/fenv/x86_64/fenv.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/fenv/x86_64/fenv.s	2014-03-07 14:03:57.000000000 +0100
 @@ -76,7 +76,7 @@
  	ret
  1:	push %rax
@@ -6285,7 +6381,7 @@ diff -Nur musl-0.9.15/src/fenv/x86_64/fenv.s musl-git/src/fenv/x86_64/fenv.s
  	pushq $0x1f80
 diff -Nur musl-0.9.15/src/internal/sh/syscall.s musl-git/src/internal/sh/syscall.s
 --- musl-0.9.15/src/internal/sh/syscall.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/internal/sh/syscall.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/internal/sh/syscall.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +.global __syscall
 +.type   __syscall, @function
@@ -6311,7 +6407,7 @@ diff -Nur musl-0.9.15/src/internal/sh/syscall.s musl-git/src/internal/sh/syscall
 +	 nop
 diff -Nur musl-0.9.15/src/internal/stdio_impl.h musl-git/src/internal/stdio_impl.h
 --- musl-0.9.15/src/internal/stdio_impl.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/internal/stdio_impl.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/internal/stdio_impl.h	2014-03-07 14:03:57.000000000 +0100
 @@ -17,6 +17,7 @@
  #define F_EOF 16
  #define F_ERR 32
@@ -6322,7 +6418,7 @@ diff -Nur musl-0.9.15/src/internal/stdio_impl.h musl-git/src/internal/stdio_impl
  	unsigned flags;
 diff -Nur musl-0.9.15/src/internal/syscall.h musl-git/src/internal/syscall.h
 --- musl-0.9.15/src/internal/syscall.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/internal/syscall.h	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/internal/syscall.h	2014-03-07 14:03:57.000000000 +0100
 @@ -1,22 +1,28 @@
  #ifndef _INTERNAL_SYSCALL_H
  #define _INTERNAL_SYSCALL_H
@@ -6386,7 +6482,7 @@ diff -Nur musl-0.9.15/src/internal/syscall.h musl-git/src/internal/syscall.h
  #define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
 diff -Nur musl-0.9.15/src/internal/x32/syscall.s musl-git/src/internal/x32/syscall.s
 --- musl-0.9.15/src/internal/x32/syscall.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/internal/x32/syscall.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/internal/x32/syscall.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,12 @@
 +.global __syscall
 +.type __syscall,@function
@@ -6402,7 +6498,7 @@ diff -Nur musl-0.9.15/src/internal/x32/syscall.s musl-git/src/internal/x32/sysca
 +	ret
 diff -Nur musl-0.9.15/src/ipc/semctl.c musl-git/src/ipc/semctl.c
 --- musl-0.9.15/src/ipc/semctl.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/ipc/semctl.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ipc/semctl.c	2014-03-07 14:03:57.000000000 +0100
 @@ -3,16 +3,22 @@
  #include "syscall.h"
  #include "ipc.h"
@@ -6432,7 +6528,7 @@ diff -Nur musl-0.9.15/src/ipc/semctl.c musl-git/src/ipc/semctl.c
  }
 diff -Nur musl-0.9.15/src/ldso/dladdr.c musl-git/src/ldso/dladdr.c
 --- musl-0.9.15/src/ldso/dladdr.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/ldso/dladdr.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ldso/dladdr.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,9 +1,9 @@
  #define _GNU_SOURCE
  #include <dlfcn.h>
@@ -6447,7 +6543,7 @@ diff -Nur musl-0.9.15/src/ldso/dladdr.c musl-git/src/ldso/dladdr.c
  }
 diff -Nur musl-0.9.15/src/ldso/dynlink.c musl-git/src/ldso/dynlink.c
 --- musl-0.9.15/src/ldso/dynlink.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/ldso/dynlink.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ldso/dynlink.c	2014-03-07 14:03:57.000000000 +0100
 @@ -253,7 +253,8 @@
  			name = strings + sym->st_name;
  			ctx = IS_COPY(type) ? head->next : head;
@@ -6478,7 +6574,7 @@ diff -Nur musl-0.9.15/src/ldso/dynlink.c musl-git/src/ldso/dynlink.c
  }
 diff -Nur musl-0.9.15/src/ldso/sh/dlsym.s musl-git/src/ldso/sh/dlsym.s
 --- musl-0.9.15/src/ldso/sh/dlsym.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/ldso/sh/dlsym.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ldso/sh/dlsym.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,10 @@
 +.text
 +.global dlsym
@@ -6492,7 +6588,7 @@ diff -Nur musl-0.9.15/src/ldso/sh/dlsym.s musl-git/src/ldso/sh/dlsym.s
 +L1:	.long __dlsym@PLT-(1b-.)
 diff -Nur musl-0.9.15/src/ldso/sh/start.s musl-git/src/ldso/sh/start.s
 --- musl-0.9.15/src/ldso/sh/start.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/ldso/sh/start.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ldso/sh/start.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,26 @@
 +.text
 +.global _start
@@ -6522,7 +6618,7 @@ diff -Nur musl-0.9.15/src/ldso/sh/start.s musl-git/src/ldso/sh/start.s
 +L1:	.long __dynlink@PLT-(2b-.)
 diff -Nur musl-0.9.15/src/ldso/x32/dlsym.s musl-git/src/ldso/x32/dlsym.s
 --- musl-0.9.15/src/ldso/x32/dlsym.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/ldso/x32/dlsym.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ldso/x32/dlsym.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,6 @@
 +.text
 +.global dlsym
@@ -6532,7 +6628,7 @@ diff -Nur musl-0.9.15/src/ldso/x32/dlsym.s musl-git/src/ldso/x32/dlsym.s
 +	jmp __dlsym
 diff -Nur musl-0.9.15/src/ldso/x32/start.s musl-git/src/ldso/x32/start.s
 --- musl-0.9.15/src/ldso/x32/start.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/ldso/x32/start.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/ldso/x32/start.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,24 @@
 +.text
 +.global _start
@@ -6560,7 +6656,7 @@ diff -Nur musl-0.9.15/src/ldso/x32/start.s musl-git/src/ldso/x32/start.s
 +	jmp *%rax
 diff -Nur musl-0.9.15/src/linux/clone.c musl-git/src/linux/clone.c
 --- musl-0.9.15/src/linux/clone.c	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/linux/clone.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/linux/clone.c	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,19 @@
 +#include <stdarg.h>
 +#include <unistd.h>
@@ -6583,7 +6679,7 @@ diff -Nur musl-0.9.15/src/linux/clone.c musl-git/src/linux/clone.c
 +}
 diff -Nur musl-0.9.15/src/linux/fallocate.c musl-git/src/linux/fallocate.c
 --- musl-0.9.15/src/linux/fallocate.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/linux/fallocate.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/linux/fallocate.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,9 +1,13 @@
  #define _GNU_SOURCE
  #include <fcntl.h>
@@ -6600,7 +6696,7 @@ diff -Nur musl-0.9.15/src/linux/fallocate.c musl-git/src/linux/fallocate.c
 +LFS64(fallocate);
 diff -Nur musl-0.9.15/src/linux/inotify.c musl-git/src/linux/inotify.c
 --- musl-0.9.15/src/linux/inotify.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/linux/inotify.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/linux/inotify.c	2014-03-07 14:03:57.000000000 +0100
 @@ -15,7 +15,7 @@
  	return syscall(SYS_inotify_add_watch, fd, pathname, mask);
  }
@@ -6612,7 +6708,7 @@ diff -Nur musl-0.9.15/src/linux/inotify.c musl-git/src/linux/inotify.c
  }
 diff -Nur musl-0.9.15/src/linux/remap_file_pages.c musl-git/src/linux/remap_file_pages.c
 --- musl-0.9.15/src/linux/remap_file_pages.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/linux/remap_file_pages.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/linux/remap_file_pages.c	2014-03-07 14:03:57.000000000 +0100
 @@ -2,7 +2,7 @@
  #include <sys/mman.h>
  #include "syscall.h"
@@ -6624,7 +6720,7 @@ diff -Nur musl-0.9.15/src/linux/remap_file_pages.c musl-git/src/linux/remap_file
  }
 diff -Nur musl-0.9.15/src/linux/stime.c musl-git/src/linux/stime.c
 --- musl-0.9.15/src/linux/stime.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/linux/stime.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/linux/stime.c	2014-03-07 14:03:57.000000000 +0100
 @@ -2,7 +2,7 @@
  #include <time.h>
  #include <sys/time.h>
@@ -6634,9 +6730,18 @@ diff -Nur musl-0.9.15/src/linux/stime.c musl-git/src/linux/stime.c
  {
  	struct timeval tv = { .tv_sec = *t, .tv_usec = 0 };
  	return settimeofday(&tv, (void *)0);
+diff -Nur musl-0.9.15/src/linux/x32/sysinfo.s musl-git/src/linux/x32/sysinfo.s
+--- musl-0.9.15/src/linux/x32/sysinfo.s	1970-01-01 01:00:00.000000000 +0100
++++ musl-git/src/linux/x32/sysinfo.s	2014-03-07 14:03:57.000000000 +0100
+@@ -0,0 +1,5 @@
++.text
++.global sysinfo
++.type   sysinfo,@function
++sysinfo:
++	jmp __x32_sysinfo
 diff -Nur musl-0.9.15/src/locale/wcsxfrm.c musl-git/src/locale/wcsxfrm.c
 --- musl-0.9.15/src/locale/wcsxfrm.c	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/src/locale/wcsxfrm.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/locale/wcsxfrm.c	2014-03-07 14:03:57.000000000 +0100
 @@ -6,10 +6,12 @@
  size_t __wcsxfrm_l(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, locale_t loc)
  {
@@ -6654,7 +6759,7 @@ diff -Nur musl-0.9.15/src/locale/wcsxfrm.c musl-git/src/locale/wcsxfrm.c
  
 diff -Nur musl-0.9.15/src/math/i386/remainderf.s musl-git/src/math/i386/remainderf.s
 --- musl-0.9.15/src/math/i386/remainderf.s	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/math/i386/remainderf.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/i386/remainderf.s	2014-03-07 14:03:57.000000000 +0100
 @@ -1,6 +1,9 @@
  .global remainderf
  .type remainderf,@function
@@ -6667,7 +6772,7 @@ diff -Nur musl-0.9.15/src/math/i386/remainderf.s musl-git/src/math/i386/remainde
  1:	fprem1
 diff -Nur musl-0.9.15/src/math/i386/remainder.s musl-git/src/math/i386/remainder.s
 --- musl-0.9.15/src/math/i386/remainder.s	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/math/i386/remainder.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/i386/remainder.s	2014-03-07 14:03:57.000000000 +0100
 @@ -1,6 +1,9 @@
  .global remainder
  .type remainder,@function
@@ -6680,7 +6785,7 @@ diff -Nur musl-0.9.15/src/math/i386/remainder.s musl-git/src/math/i386/remainder
  1:	fprem1
 diff -Nur musl-0.9.15/src/math/x32/acosl.s musl-git/src/math/x32/acosl.s
 --- musl-0.9.15/src/math/x32/acosl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/acosl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/acosl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,16 @@
 +# see ../i386/acos.s
 +
@@ -6700,7 +6805,7 @@ diff -Nur musl-0.9.15/src/math/x32/acosl.s musl-git/src/math/x32/acosl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/asinl.s musl-git/src/math/x32/asinl.s
 --- musl-0.9.15/src/math/x32/asinl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/asinl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/asinl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,12 @@
 +.global asinl
 +.type asinl,@function
@@ -6716,7 +6821,7 @@ diff -Nur musl-0.9.15/src/math/x32/asinl.s musl-git/src/math/x32/asinl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/atan2l.s musl-git/src/math/x32/atan2l.s
 --- musl-0.9.15/src/math/x32/atan2l.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/atan2l.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/atan2l.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global atan2l
 +.type atan2l,@function
@@ -6727,7 +6832,7 @@ diff -Nur musl-0.9.15/src/math/x32/atan2l.s musl-git/src/math/x32/atan2l.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/atanl.s musl-git/src/math/x32/atanl.s
 --- musl-0.9.15/src/math/x32/atanl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/atanl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/atanl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global atanl
 +.type atanl,@function
@@ -6738,12 +6843,12 @@ diff -Nur musl-0.9.15/src/math/x32/atanl.s musl-git/src/math/x32/atanl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/ceill.s musl-git/src/math/x32/ceill.s
 --- musl-0.9.15/src/math/x32/ceill.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/ceill.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/ceill.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +# see floorl.s
 diff -Nur musl-0.9.15/src/math/x32/exp2l.s musl-git/src/math/x32/exp2l.s
 --- musl-0.9.15/src/math/x32/exp2l.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/exp2l.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/exp2l.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,90 @@
 +.global expm1l
 +.type expm1l,@function
@@ -6837,7 +6942,7 @@ diff -Nur musl-0.9.15/src/math/x32/exp2l.s musl-git/src/math/x32/exp2l.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/expl.s musl-git/src/math/x32/expl.s
 --- musl-0.9.15/src/math/x32/expl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/expl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/expl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,101 @@
 +# exp(x) = 2^hi + 2^hi (2^lo - 1)
 +# where hi+lo = log2e*x with 128bit precision
@@ -6942,12 +7047,12 @@ diff -Nur musl-0.9.15/src/math/x32/expl.s musl-git/src/math/x32/expl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/expm1l.s musl-git/src/math/x32/expm1l.s
 --- musl-0.9.15/src/math/x32/expm1l.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/expm1l.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/expm1l.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +# see exp2l.s
 diff -Nur musl-0.9.15/src/math/x32/fabsf.s musl-git/src/math/x32/fabsf.s
 --- musl-0.9.15/src/math/x32/fabsf.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/fabsf.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/fabsf.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global fabsf
 +.type fabsf,@function
@@ -6958,7 +7063,7 @@ diff -Nur musl-0.9.15/src/math/x32/fabsf.s musl-git/src/math/x32/fabsf.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/fabsl.s musl-git/src/math/x32/fabsl.s
 --- musl-0.9.15/src/math/x32/fabsl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/fabsl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/fabsl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,6 @@
 +.global fabsl
 +.type fabsl,@function
@@ -6968,7 +7073,7 @@ diff -Nur musl-0.9.15/src/math/x32/fabsl.s musl-git/src/math/x32/fabsl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/fabs.s musl-git/src/math/x32/fabs.s
 --- musl-0.9.15/src/math/x32/fabs.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/fabs.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/fabs.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,9 @@
 +.global fabs
 +.type fabs,@function
@@ -6981,7 +7086,7 @@ diff -Nur musl-0.9.15/src/math/x32/fabs.s musl-git/src/math/x32/fabs.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/floorl.s musl-git/src/math/x32/floorl.s
 --- musl-0.9.15/src/math/x32/floorl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/floorl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/floorl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,27 @@
 +.global floorl
 +.type floorl,@function
@@ -7012,7 +7117,7 @@ diff -Nur musl-0.9.15/src/math/x32/floorl.s musl-git/src/math/x32/floorl.s
 +	jmp 1b
 diff -Nur musl-0.9.15/src/math/x32/fmodl.s musl-git/src/math/x32/fmodl.s
 --- musl-0.9.15/src/math/x32/fmodl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/fmodl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/fmodl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,11 @@
 +.global fmodl
 +.type fmodl,@function
@@ -7027,7 +7132,7 @@ diff -Nur musl-0.9.15/src/math/x32/fmodl.s musl-git/src/math/x32/fmodl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/llrintf.s musl-git/src/math/x32/llrintf.s
 --- musl-0.9.15/src/math/x32/llrintf.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/llrintf.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/llrintf.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +.global llrintf
 +.type llrintf,@function
@@ -7036,7 +7141,7 @@ diff -Nur musl-0.9.15/src/math/x32/llrintf.s musl-git/src/math/x32/llrintf.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/llrintl.s musl-git/src/math/x32/llrintl.s
 --- musl-0.9.15/src/math/x32/llrintl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/llrintl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/llrintl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global llrintl
 +.type llrintl,@function
@@ -7047,7 +7152,7 @@ diff -Nur musl-0.9.15/src/math/x32/llrintl.s musl-git/src/math/x32/llrintl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/llrint.s musl-git/src/math/x32/llrint.s
 --- musl-0.9.15/src/math/x32/llrint.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/llrint.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/llrint.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +.global llrint
 +.type llrint,@function
@@ -7056,7 +7161,7 @@ diff -Nur musl-0.9.15/src/math/x32/llrint.s musl-git/src/math/x32/llrint.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/log10l.s musl-git/src/math/x32/log10l.s
 --- musl-0.9.15/src/math/x32/log10l.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/log10l.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/log10l.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global log10l
 +.type log10l,@function
@@ -7067,7 +7172,7 @@ diff -Nur musl-0.9.15/src/math/x32/log10l.s musl-git/src/math/x32/log10l.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/log1pl.s musl-git/src/math/x32/log1pl.s
 --- musl-0.9.15/src/math/x32/log1pl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/log1pl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/log1pl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,15 @@
 +.global log1pl
 +.type log1pl,@function
@@ -7086,7 +7191,7 @@ diff -Nur musl-0.9.15/src/math/x32/log1pl.s musl-git/src/math/x32/log1pl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/log2l.s musl-git/src/math/x32/log2l.s
 --- musl-0.9.15/src/math/x32/log2l.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/log2l.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/log2l.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global log2l
 +.type log2l,@function
@@ -7097,7 +7202,7 @@ diff -Nur musl-0.9.15/src/math/x32/log2l.s musl-git/src/math/x32/log2l.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/logl.s musl-git/src/math/x32/logl.s
 --- musl-0.9.15/src/math/x32/logl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/logl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/logl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global logl
 +.type logl,@function
@@ -7108,7 +7213,7 @@ diff -Nur musl-0.9.15/src/math/x32/logl.s musl-git/src/math/x32/logl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/lrintf.s musl-git/src/math/x32/lrintf.s
 --- musl-0.9.15/src/math/x32/lrintf.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/lrintf.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/lrintf.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +.global lrintf
 +.type lrintf,@function
@@ -7117,7 +7222,7 @@ diff -Nur musl-0.9.15/src/math/x32/lrintf.s musl-git/src/math/x32/lrintf.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/lrintl.s musl-git/src/math/x32/lrintl.s
 --- musl-0.9.15/src/math/x32/lrintl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/lrintl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/lrintl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,7 @@
 +.global lrintl
 +.type lrintl,@function
@@ -7128,7 +7233,7 @@ diff -Nur musl-0.9.15/src/math/x32/lrintl.s musl-git/src/math/x32/lrintl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/lrint.s musl-git/src/math/x32/lrint.s
 --- musl-0.9.15/src/math/x32/lrint.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/lrint.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/lrint.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +.global lrint
 +.type lrint,@function
@@ -7137,7 +7242,7 @@ diff -Nur musl-0.9.15/src/math/x32/lrint.s musl-git/src/math/x32/lrint.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/remainderl.s musl-git/src/math/x32/remainderl.s
 --- musl-0.9.15/src/math/x32/remainderl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/remainderl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/remainderl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,11 @@
 +.global remainderl
 +.type remainderl,@function
@@ -7152,7 +7257,7 @@ diff -Nur musl-0.9.15/src/math/x32/remainderl.s musl-git/src/math/x32/remainderl
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/rintl.s musl-git/src/math/x32/rintl.s
 --- musl-0.9.15/src/math/x32/rintl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/rintl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/rintl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,6 @@
 +.global rintl
 +.type rintl,@function
@@ -7162,7 +7267,7 @@ diff -Nur musl-0.9.15/src/math/x32/rintl.s musl-git/src/math/x32/rintl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/sqrtf.s musl-git/src/math/x32/sqrtf.s
 --- musl-0.9.15/src/math/x32/sqrtf.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/sqrtf.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/sqrtf.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,4 @@
 +.global sqrtf
 +.type sqrtf,@function
@@ -7170,7 +7275,7 @@ diff -Nur musl-0.9.15/src/math/x32/sqrtf.s musl-git/src/math/x32/sqrtf.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/sqrtl.s musl-git/src/math/x32/sqrtl.s
 --- musl-0.9.15/src/math/x32/sqrtl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/sqrtl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/sqrtl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +.global sqrtl
 +.type sqrtl,@function
@@ -7179,7 +7284,7 @@ diff -Nur musl-0.9.15/src/math/x32/sqrtl.s musl-git/src/math/x32/sqrtl.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/sqrt.s musl-git/src/math/x32/sqrt.s
 --- musl-0.9.15/src/math/x32/sqrt.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/sqrt.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/sqrt.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,4 @@
 +.global sqrt
 +.type sqrt,@function
@@ -7187,12 +7292,12 @@ diff -Nur musl-0.9.15/src/math/x32/sqrt.s musl-git/src/math/x32/sqrt.s
 +	ret
 diff -Nur musl-0.9.15/src/math/x32/truncl.s musl-git/src/math/x32/truncl.s
 --- musl-0.9.15/src/math/x32/truncl.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/math/x32/truncl.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/math/x32/truncl.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +# see floorl.s
 diff -Nur musl-0.9.15/src/misc/nftw.c musl-git/src/misc/nftw.c
 --- musl-0.9.15/src/misc/nftw.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/misc/nftw.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/misc/nftw.c	2014-03-07 14:03:57.000000000 +0100
 @@ -46,8 +46,7 @@
  		type = FTW_F;
  	}
@@ -7205,7 +7310,7 @@ diff -Nur musl-0.9.15/src/misc/nftw.c musl-git/src/misc/nftw.c
  	new.chain = h;
 diff -Nur musl-0.9.15/src/network/accept4.c musl-git/src/network/accept4.c
 --- musl-0.9.15/src/network/accept4.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/network/accept4.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/network/accept4.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,9 +1,20 @@
  #define _GNU_SOURCE
  #include <sys/socket.h>
@@ -7230,7 +7335,7 @@ diff -Nur musl-0.9.15/src/network/accept4.c musl-git/src/network/accept4.c
  }
 diff -Nur musl-0.9.15/src/network/inet_legacy.c musl-git/src/network/inet_legacy.c
 --- musl-0.9.15/src/network/inet_legacy.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/network/inet_legacy.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/network/inet_legacy.c	2014-03-07 14:03:57.000000000 +0100
 @@ -16,9 +16,8 @@
  	return 1;
  }
@@ -7244,7 +7349,7 @@ diff -Nur musl-0.9.15/src/network/inet_legacy.c musl-git/src/network/inet_legacy
  	else h |= n<<8;
 diff -Nur musl-0.9.15/src/network/proto.c musl-git/src/network/proto.c
 --- musl-0.9.15/src/network/proto.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/network/proto.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/network/proto.c	2014-03-07 14:03:57.000000000 +0100
 @@ -4,7 +4,7 @@
  /* do we really need all these?? */
  
@@ -7267,7 +7372,7 @@ diff -Nur musl-0.9.15/src/network/proto.c musl-git/src/network/proto.c
  
 diff -Nur musl-0.9.15/src/prng/random.c musl-git/src/prng/random.c
 --- musl-0.9.15/src/prng/random.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/prng/random.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/prng/random.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,10 +1,3 @@
 -/*
 - * random.c - Copyright © 2011 Szabolcs Nagy
@@ -7302,7 +7407,7 @@ diff -Nur musl-0.9.15/src/prng/random.c musl-git/src/prng/random.c
  }
 diff -Nur musl-0.9.15/src/process/posix_spawn.c musl-git/src/process/posix_spawn.c
 --- musl-0.9.15/src/process/posix_spawn.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/process/posix_spawn.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/process/posix_spawn.c	2014-03-07 14:03:57.000000000 +0100
 @@ -166,7 +166,7 @@
  
  	close(args.p[0]);
@@ -7314,7 +7419,7 @@ diff -Nur musl-0.9.15/src/process/posix_spawn.c musl-git/src/process/posix_spawn
  	pthread_setcancelstate(cs, 0);
 diff -Nur musl-0.9.15/src/process/x32/vfork.s musl-git/src/process/x32/vfork.s
 --- musl-0.9.15/src/process/x32/vfork.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/process/x32/vfork.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/process/x32/vfork.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,12 @@
 +.global __vfork
 +.weak vfork
@@ -7330,17 +7435,17 @@ diff -Nur musl-0.9.15/src/process/x32/vfork.s musl-git/src/process/x32/vfork.s
 +	jmp __syscall_ret
 diff -Nur musl-0.9.15/src/setjmp/mipsel-sf/longjmp.sub musl-git/src/setjmp/mipsel-sf/longjmp.sub
 --- musl-0.9.15/src/setjmp/mipsel-sf/longjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/mipsel-sf/longjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/mipsel-sf/longjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../mips-sf/longjmp.s
 diff -Nur musl-0.9.15/src/setjmp/mipsel-sf/setjmp.sub musl-git/src/setjmp/mipsel-sf/setjmp.sub
 --- musl-0.9.15/src/setjmp/mipsel-sf/setjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/mipsel-sf/setjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/mipsel-sf/setjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../mips-sf/setjmp.s
 diff -Nur musl-0.9.15/src/setjmp/mips-sf/longjmp.s musl-git/src/setjmp/mips-sf/longjmp.s
 --- musl-0.9.15/src/setjmp/mips-sf/longjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/mips-sf/longjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/longjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,25 @@
 +.set noreorder
 +
@@ -7369,12 +7474,12 @@ diff -Nur musl-0.9.15/src/setjmp/mips-sf/longjmp.s musl-git/src/setjmp/mips-sf/l
 +	lw      $28, 44($4)
 diff -Nur musl-0.9.15/src/setjmp/mips-sf/longjmp.sub musl-git/src/setjmp/mips-sf/longjmp.sub
 --- musl-0.9.15/src/setjmp/mips-sf/longjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/mips-sf/longjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/longjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +longjmp.s
 diff -Nur musl-0.9.15/src/setjmp/mips-sf/setjmp.s musl-git/src/setjmp/mips-sf/setjmp.s
 --- musl-0.9.15/src/setjmp/mips-sf/setjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/mips-sf/setjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/setjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,25 @@
 +.set noreorder
 +
@@ -7403,12 +7508,12 @@ diff -Nur musl-0.9.15/src/setjmp/mips-sf/setjmp.s musl-git/src/setjmp/mips-sf/se
 +	li      $2, 0
 diff -Nur musl-0.9.15/src/setjmp/mips-sf/setjmp.sub musl-git/src/setjmp/mips-sf/setjmp.sub
 --- musl-0.9.15/src/setjmp/mips-sf/setjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/mips-sf/setjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/setjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +setjmp.s
 diff -Nur musl-0.9.15/src/setjmp/sh/longjmp.s musl-git/src/setjmp/sh/longjmp.s
 --- musl-0.9.15/src/setjmp/sh/longjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sh/longjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sh/longjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,26 @@
 +.global _longjmp
 +.global longjmp
@@ -7438,7 +7543,7 @@ diff -Nur musl-0.9.15/src/setjmp/sh/longjmp.s musl-git/src/setjmp/sh/longjmp.s
 +	 nop
 diff -Nur musl-0.9.15/src/setjmp/sh/setjmp.s musl-git/src/setjmp/sh/setjmp.s
 --- musl-0.9.15/src/setjmp/sh/setjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sh/setjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sh/setjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,25 @@
 +.global __setjmp
 +.global _setjmp
@@ -7467,17 +7572,17 @@ diff -Nur musl-0.9.15/src/setjmp/sh/setjmp.s musl-git/src/setjmp/sh/setjmp.s
 +	 mov  #0, r0
 diff -Nur musl-0.9.15/src/setjmp/sheb-nofpu/longjmp.sub musl-git/src/setjmp/sheb-nofpu/longjmp.sub
 --- musl-0.9.15/src/setjmp/sheb-nofpu/longjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sheb-nofpu/longjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sheb-nofpu/longjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../sh-nofpu/longjmp.s
 diff -Nur musl-0.9.15/src/setjmp/sheb-nofpu/setjmp.sub musl-git/src/setjmp/sheb-nofpu/setjmp.sub
 --- musl-0.9.15/src/setjmp/sheb-nofpu/setjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sheb-nofpu/setjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sheb-nofpu/setjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +../sh-nofpu/setjmp.s
 diff -Nur musl-0.9.15/src/setjmp/sh-nofpu/longjmp.s musl-git/src/setjmp/sh-nofpu/longjmp.s
 --- musl-0.9.15/src/setjmp/sh-nofpu/longjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sh-nofpu/longjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/longjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +.global _longjmp
 +.global longjmp
@@ -7503,12 +7608,12 @@ diff -Nur musl-0.9.15/src/setjmp/sh-nofpu/longjmp.s musl-git/src/setjmp/sh-nofpu
 +	 nop
 diff -Nur musl-0.9.15/src/setjmp/sh-nofpu/longjmp.sub musl-git/src/setjmp/sh-nofpu/longjmp.sub
 --- musl-0.9.15/src/setjmp/sh-nofpu/longjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sh-nofpu/longjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/longjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +longjmp.s
 diff -Nur musl-0.9.15/src/setjmp/sh-nofpu/setjmp.s musl-git/src/setjmp/sh-nofpu/setjmp.s
 --- musl-0.9.15/src/setjmp/sh-nofpu/setjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sh-nofpu/setjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/setjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,21 @@
 +.global __setjmp
 +.global _setjmp
@@ -7533,12 +7638,12 @@ diff -Nur musl-0.9.15/src/setjmp/sh-nofpu/setjmp.s musl-git/src/setjmp/sh-nofpu/
 +	 mov  #0, r0
 diff -Nur musl-0.9.15/src/setjmp/sh-nofpu/setjmp.sub musl-git/src/setjmp/sh-nofpu/setjmp.sub
 --- musl-0.9.15/src/setjmp/sh-nofpu/setjmp.sub	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/sh-nofpu/setjmp.sub	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/setjmp.sub	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1 @@
 +setjmp.s
 diff -Nur musl-0.9.15/src/setjmp/x32/longjmp.s musl-git/src/setjmp/x32/longjmp.s
 --- musl-0.9.15/src/setjmp/x32/longjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/x32/longjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/x32/longjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 +.global _longjmp
@@ -7564,7 +7669,7 @@ diff -Nur musl-0.9.15/src/setjmp/x32/longjmp.s musl-git/src/setjmp/x32/longjmp.s
 +	jmp *%rdx               /* goto saved address without altering rsp */
 diff -Nur musl-0.9.15/src/setjmp/x32/setjmp.s musl-git/src/setjmp/x32/setjmp.s
 --- musl-0.9.15/src/setjmp/x32/setjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/setjmp/x32/setjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/setjmp/x32/setjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 +.global __setjmp
@@ -7590,7 +7695,7 @@ diff -Nur musl-0.9.15/src/setjmp/x32/setjmp.s musl-git/src/setjmp/x32/setjmp.s
 +	ret
 diff -Nur musl-0.9.15/src/signal/sh/restore.s musl-git/src/signal/sh/restore.s
 --- musl-0.9.15/src/signal/sh/restore.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/signal/sh/restore.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/signal/sh/restore.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,24 @@
 +.global __restore
 +.type   __restore, @function
@@ -7618,7 +7723,7 @@ diff -Nur musl-0.9.15/src/signal/sh/restore.s musl-git/src/signal/sh/restore.s
 +	or    r0, r0
 diff -Nur musl-0.9.15/src/signal/sh/sigsetjmp.s musl-git/src/signal/sh/sigsetjmp.s
 --- musl-0.9.15/src/signal/sh/sigsetjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/signal/sh/sigsetjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/signal/sh/sigsetjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,27 @@
 +.global sigsetjmp
 +.type   sigsetjmp, @function
@@ -7649,7 +7754,7 @@ diff -Nur musl-0.9.15/src/signal/sh/sigsetjmp.s musl-git/src/signal/sh/sigsetjmp
 +L2:	.long setjmp@PLT-(3b-.)
 diff -Nur musl-0.9.15/src/signal/sigandset.c musl-git/src/signal/sigandset.c
 --- musl-0.9.15/src/signal/sigandset.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/signal/sigandset.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/signal/sigandset.c	2014-03-07 14:03:57.000000000 +0100
 @@ -3,7 +3,7 @@
  
  #define SST_SIZE (_NSIG/8/sizeof(long))
@@ -7661,7 +7766,7 @@ diff -Nur musl-0.9.15/src/signal/sigandset.c musl-git/src/signal/sigandset.c
  	for(; i < SST_SIZE; i++) d[i] = l[i] & r[i];
 diff -Nur musl-0.9.15/src/signal/sigorset.c musl-git/src/signal/sigorset.c
 --- musl-0.9.15/src/signal/sigorset.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/signal/sigorset.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/signal/sigorset.c	2014-03-07 14:03:57.000000000 +0100
 @@ -3,7 +3,7 @@
  
  #define SST_SIZE (_NSIG/8/sizeof(long))
@@ -7673,7 +7778,7 @@ diff -Nur musl-0.9.15/src/signal/sigorset.c musl-git/src/signal/sigorset.c
  	for(; i < SST_SIZE; i++) d[i] = l[i] | r[i];
 diff -Nur musl-0.9.15/src/signal/x32/restore.s musl-git/src/signal/x32/restore.s
 --- musl-0.9.15/src/signal/x32/restore.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/signal/x32/restore.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/signal/x32/restore.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,8 @@
 +.global __restore_rt
 +.global __restore
@@ -7685,7 +7790,7 @@ diff -Nur musl-0.9.15/src/signal/x32/restore.s musl-git/src/signal/x32/restore.s
 +	syscall
 diff -Nur musl-0.9.15/src/signal/x32/sigsetjmp.s musl-git/src/signal/x32/sigsetjmp.s
 --- musl-0.9.15/src/signal/x32/sigsetjmp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/signal/x32/sigsetjmp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/signal/x32/sigsetjmp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,14 @@
 +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 +.global sigsetjmp
@@ -7703,7 +7808,7 @@ diff -Nur musl-0.9.15/src/signal/x32/sigsetjmp.s musl-git/src/signal/x32/sigsetj
 +1:	jmp setjmp
 diff -Nur musl-0.9.15/src/stdio/__fdopen.c musl-git/src/stdio/__fdopen.c
 --- musl-0.9.15/src/stdio/__fdopen.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/stdio/__fdopen.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/stdio/__fdopen.c	2014-03-07 14:03:57.000000000 +0100
 @@ -32,7 +32,9 @@
  	/* Set append mode on fd if opened for append */
  	if (*mode == 'a') {
@@ -7717,7 +7822,7 @@ diff -Nur musl-0.9.15/src/stdio/__fdopen.c musl-git/src/stdio/__fdopen.c
  	f->fd = fd;
 diff -Nur musl-0.9.15/src/stdio/ftell.c musl-git/src/stdio/ftell.c
 --- musl-0.9.15/src/stdio/ftell.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/stdio/ftell.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/stdio/ftell.c	2014-03-07 14:03:57.000000000 +0100
 @@ -4,7 +4,9 @@
  
  off_t __ftello_unlocked(FILE *f)
@@ -7731,7 +7836,7 @@ diff -Nur musl-0.9.15/src/stdio/ftell.c musl-git/src/stdio/ftell.c
  	/* Adjust for data in buffer. */
 diff -Nur musl-0.9.15/src/stdio/vfscanf.c musl-git/src/stdio/vfscanf.c
 --- musl-0.9.15/src/stdio/vfscanf.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/stdio/vfscanf.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/stdio/vfscanf.c	2014-03-07 14:03:57.000000000 +0100
 @@ -328,3 +328,5 @@
  	FUNLOCK(f);
  	return matches;
@@ -7740,7 +7845,7 @@ diff -Nur musl-0.9.15/src/stdio/vfscanf.c musl-git/src/stdio/vfscanf.c
 +weak_alias(vfscanf,__isoc99_vfscanf);
 diff -Nur musl-0.9.15/src/thread/arm/clone.s musl-git/src/thread/arm/clone.s
 --- musl-0.9.15/src/thread/arm/clone.s	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/arm/clone.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/arm/clone.s	2014-03-07 14:03:57.000000000 +0100
 @@ -1,10 +1,7 @@
  .text
  .global __clone
@@ -7754,7 +7859,7 @@ diff -Nur musl-0.9.15/src/thread/arm/clone.s musl-git/src/thread/arm/clone.s
  	mov r6,r3
 diff -Nur musl-0.9.15/src/thread/cancel_dummy.c musl-git/src/thread/cancel_dummy.c
 --- musl-0.9.15/src/thread/cancel_dummy.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/cancel_dummy.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/cancel_dummy.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,6 +1,9 @@
  #include "pthread_impl.h"
 +#include "syscall.h"
@@ -7768,7 +7873,7 @@ diff -Nur musl-0.9.15/src/thread/cancel_dummy.c musl-git/src/thread/cancel_dummy
  }
 diff -Nur musl-0.9.15/src/thread/cancel_impl.c musl-git/src/thread/cancel_impl.c
 --- musl-0.9.15/src/thread/cancel_impl.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/cancel_impl.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/cancel_impl.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,4 +1,5 @@
  #include "pthread_impl.h"
 +#include "syscall.h"
@@ -7793,7 +7898,7 @@ diff -Nur musl-0.9.15/src/thread/cancel_impl.c musl-git/src/thread/cancel_impl.c
  	long r;
 diff -Nur musl-0.9.15/src/thread/clone.c musl-git/src/thread/clone.c
 --- musl-0.9.15/src/thread/clone.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/clone.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/clone.c	2014-03-07 14:03:57.000000000 +0100
 @@ -1,10 +1,7 @@
  #include <errno.h>
 -#include "libc.h"
@@ -7809,7 +7914,7 @@ diff -Nur musl-0.9.15/src/thread/clone.c musl-git/src/thread/clone.c
 -weak_alias(__clone, clone);
 diff -Nur musl-0.9.15/src/thread/i386/clone.s musl-git/src/thread/i386/clone.s
 --- musl-0.9.15/src/thread/i386/clone.s	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/i386/clone.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/i386/clone.s	2014-03-07 14:03:57.000000000 +0100
 @@ -1,10 +1,7 @@
  .text
  .global __clone
@@ -7823,7 +7928,7 @@ diff -Nur musl-0.9.15/src/thread/i386/clone.s musl-git/src/thread/i386/clone.s
  	push %ebx
 diff -Nur musl-0.9.15/src/thread/microblaze/clone.s musl-git/src/thread/microblaze/clone.s
 --- musl-0.9.15/src/thread/microblaze/clone.s	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/microblaze/clone.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/microblaze/clone.s	2014-03-07 14:03:57.000000000 +0100
 @@ -1,14 +1,11 @@
  .global __clone
 -.weak clone
@@ -7850,7 +7955,7 @@ diff -Nur musl-0.9.15/src/thread/microblaze/clone.s musl-git/src/thread/microbla
  	brald   r15, r3
 diff -Nur musl-0.9.15/src/thread/sh/clone.s musl-git/src/thread/sh/clone.s
 --- musl-0.9.15/src/thread/sh/clone.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/sh/clone.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/sh/clone.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,47 @@
 +.text
 +.global __clone
@@ -7901,7 +8006,7 @@ diff -Nur musl-0.9.15/src/thread/sh/clone.s musl-git/src/thread/sh/clone.s
 +	or   r0, r0
 diff -Nur musl-0.9.15/src/thread/sh/__set_thread_area.s musl-git/src/thread/sh/__set_thread_area.s
 --- musl-0.9.15/src/thread/sh/__set_thread_area.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/sh/__set_thread_area.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/sh/__set_thread_area.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,5 @@
 +.global __set_thread_area
 +.type   __set_thread_area, @function
@@ -7910,7 +8015,7 @@ diff -Nur musl-0.9.15/src/thread/sh/__set_thread_area.s musl-git/src/thread/sh/_
 +	 ldc r4, gbr
 diff -Nur musl-0.9.15/src/thread/sh/syscall_cp.s musl-git/src/thread/sh/syscall_cp.s
 --- musl-0.9.15/src/thread/sh/syscall_cp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/sh/syscall_cp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/sh/syscall_cp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,39 @@
 +.text
 +.global __syscall_cp_asm
@@ -7953,7 +8058,7 @@ diff -Nur musl-0.9.15/src/thread/sh/syscall_cp.s musl-git/src/thread/sh/syscall_
 +	 nop
 diff -Nur musl-0.9.15/src/thread/sh/__unmapself.s musl-git/src/thread/sh/__unmapself.s
 --- musl-0.9.15/src/thread/sh/__unmapself.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/sh/__unmapself.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/sh/__unmapself.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,22 @@
 +.text
 +.global __unmapself
@@ -7979,7 +8084,7 @@ diff -Nur musl-0.9.15/src/thread/sh/__unmapself.s musl-git/src/thread/sh/__unmap
 +	or    r0, r0
 diff -Nur musl-0.9.15/src/thread/__wait.c musl-git/src/thread/__wait.c
 --- musl-0.9.15/src/thread/__wait.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/__wait.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/__wait.c	2014-03-07 14:03:57.000000000 +0100
 @@ -10,6 +10,6 @@
  	}
  	if (waiters) a_inc(waiters);
@@ -7990,7 +8095,7 @@ diff -Nur musl-0.9.15/src/thread/__wait.c musl-git/src/thread/__wait.c
  }
 diff -Nur musl-0.9.15/src/thread/x32/clone.s musl-git/src/thread/x32/clone.s
 --- musl-0.9.15/src/thread/x32/clone.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/x32/clone.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/x32/clone.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,25 @@
 +.text
 +.global __clone
@@ -8019,7 +8124,7 @@ diff -Nur musl-0.9.15/src/thread/x32/clone.s musl-git/src/thread/x32/clone.s
 +1:	ret
 diff -Nur musl-0.9.15/src/thread/x32/__set_thread_area.s musl-git/src/thread/x32/__set_thread_area.s
 --- musl-0.9.15/src/thread/x32/__set_thread_area.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/x32/__set_thread_area.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/x32/__set_thread_area.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,10 @@
 +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 +.text
@@ -8033,7 +8138,7 @@ diff -Nur musl-0.9.15/src/thread/x32/__set_thread_area.s musl-git/src/thread/x32
 +	ret
 diff -Nur musl-0.9.15/src/thread/x32/syscall_cp.s musl-git/src/thread/x32/syscall_cp.s
 --- musl-0.9.15/src/thread/x32/syscall_cp.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/x32/syscall_cp.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/x32/syscall_cp.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,23 @@
 +.text
 +.global __syscall_cp_internal
@@ -8060,7 +8165,7 @@ diff -Nur musl-0.9.15/src/thread/x32/syscall_cp.s musl-git/src/thread/x32/syscal
 +	ret
 diff -Nur musl-0.9.15/src/thread/x32/__unmapself.s musl-git/src/thread/x32/__unmapself.s
 --- musl-0.9.15/src/thread/x32/__unmapself.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/thread/x32/__unmapself.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/x32/__unmapself.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,10 @@
 +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
 +.text
@@ -8074,7 +8179,7 @@ diff -Nur musl-0.9.15/src/thread/x32/__unmapself.s musl-git/src/thread/x32/__unm
 +	syscall         /* exit(0) */
 diff -Nur musl-0.9.15/src/thread/x86_64/clone.s musl-git/src/thread/x86_64/clone.s
 --- musl-0.9.15/src/thread/x86_64/clone.s	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/thread/x86_64/clone.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/thread/x86_64/clone.s	2014-03-07 14:03:57.000000000 +0100
 @@ -1,10 +1,7 @@
  .text
  .global __clone
@@ -8088,7 +8193,7 @@ diff -Nur musl-0.9.15/src/thread/x86_64/clone.s musl-git/src/thread/x86_64/clone
  	mov %rdi,%r11
 diff -Nur musl-0.9.15/src/time/timer_delete.c musl-git/src/time/timer_delete.c
 --- musl-0.9.15/src/time/timer_delete.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/time/timer_delete.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/time/timer_delete.c	2014-03-07 14:03:57.000000000 +0100
 @@ -10,5 +10,5 @@
  		__wake(&td->timer_id, 1, 1);
  		return 0;
@@ -8098,7 +8203,7 @@ diff -Nur musl-0.9.15/src/time/timer_delete.c musl-git/src/time/timer_delete.c
  }
 diff -Nur musl-0.9.15/src/time/timer_getoverrun.c musl-git/src/time/timer_getoverrun.c
 --- musl-0.9.15/src/time/timer_getoverrun.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/time/timer_getoverrun.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/time/timer_getoverrun.c	2014-03-07 14:03:57.000000000 +0100
 @@ -8,5 +8,5 @@
  		pthread_t td = (void *)((uintptr_t)t << 1);
  		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
@@ -8108,7 +8213,7 @@ diff -Nur musl-0.9.15/src/time/timer_getoverrun.c musl-git/src/time/timer_getove
  }
 diff -Nur musl-0.9.15/src/time/timer_gettime.c musl-git/src/time/timer_gettime.c
 --- musl-0.9.15/src/time/timer_gettime.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/time/timer_gettime.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/time/timer_gettime.c	2014-03-07 14:03:57.000000000 +0100
 @@ -8,5 +8,5 @@
  		pthread_t td = (void *)((uintptr_t)t << 1);
  		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
@@ -8118,7 +8223,7 @@ diff -Nur musl-0.9.15/src/time/timer_gettime.c musl-git/src/time/timer_gettime.c
  }
 diff -Nur musl-0.9.15/src/time/timer_settime.c musl-git/src/time/timer_settime.c
 --- musl-0.9.15/src/time/timer_settime.c	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/src/time/timer_settime.c	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/time/timer_settime.c	2014-03-07 14:03:57.000000000 +0100
 @@ -8,5 +8,5 @@
  		pthread_t td = (void *)((uintptr_t)t << 1);
  		t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
@@ -8128,7 +8233,7 @@ diff -Nur musl-0.9.15/src/time/timer_settime.c musl-git/src/time/timer_settime.c
  }
 diff -Nur musl-0.9.15/src/unistd/sh/pipe.s musl-git/src/unistd/sh/pipe.s
 --- musl-0.9.15/src/unistd/sh/pipe.s	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/src/unistd/sh/pipe.s	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/src/unistd/sh/pipe.s	2014-03-07 14:03:57.000000000 +0100
 @@ -0,0 +1,27 @@
 +.global pipe
 +.type   pipe, @function
@@ -8159,7 +8264,7 @@ diff -Nur musl-0.9.15/src/unistd/sh/pipe.s musl-git/src/unistd/sh/pipe.s
 +L1:	.long __syscall_ret@PLT-(1b-.)
 diff -Nur musl-0.9.15/tools/install.sh musl-git/tools/install.sh
 --- musl-0.9.15/tools/install.sh	2014-01-03 21:12:18.000000000 +0100
-+++ musl-git/tools/install.sh	2014-03-01 08:58:14.000000000 +0100
++++ musl-git/tools/install.sh	2014-03-07 14:03:57.000000000 +0100
 @@ -51,6 +51,7 @@
  ln -s "$1" "$tmp"
  else
diff --git a/toolchain/musl/patches/xxx-hotfix-sh.patch b/toolchain/musl/patches/xxx-hotfix-sh.patch
new file mode 100644
index 000000000..0c60604d0
--- /dev/null
+++ b/toolchain/musl/patches/xxx-hotfix-sh.patch
@@ -0,0 +1,80 @@
+* thx to nsz from #musl
+diff -Nur musl-git/arch/sh/bits/user.h musl-sh/arch/sh/bits/user.h
+--- musl-git/arch/sh/bits/user.h	1970-01-01 01:00:00.000000000 +0100
++++ musl-sh/arch/sh/bits/user.h	2014-03-07 15:08:42.000000000 +0100
+@@ -0,0 +1,75 @@
++#undef __WORDSIZE
++#define __WORDSIZE 32
++
++#define REG_REG0	 0
++#define REG_REG15	15
++#define REG_PC		16
++#define REG_PR		17
++#define REG_SR		18
++#define REG_GBR		19
++#define REG_MACH	20
++#define REG_MACL	21
++#define REG_SYSCALL	22
++#define REG_FPREG0	23
++#define REG_FPREG15	38
++#define REG_XFREG0	39
++#define REG_XFREG15	54
++#define REG_FPSCR	55
++#define REG_FPUL	56
++
++struct pt_regs {
++	unsigned long regs[16];
++	unsigned long pc;
++	unsigned long pr;
++	unsigned long sr;
++	unsigned long gbr;
++	unsigned long mach;
++	unsigned long macl;
++	long tra;
++};
++
++struct pt_dspregs {
++	unsigned long a1;
++	unsigned long a0g;
++	unsigned long a1g;
++	unsigned long m0;
++	unsigned long m1;
++	unsigned long a0;
++	unsigned long x0;
++	unsigned long x1;
++	unsigned long y0;
++	unsigned long y1;
++	unsigned long dsr;
++	unsigned long rs;
++	unsigned long re;
++	unsigned long mod;
++};
++
++struct user_fpu_struct {
++	unsigned long fp_regs[16];
++	unsigned long xfp_regs[16];
++	unsigned long fpscr;
++	unsigned long fpul;
++};
++
++#define ELF_NGREG 23
++typedef unsigned long elf_greg_t;
++typedef elf_greg_t elf_gregset_t[ELF_NGREG];
++typedef struct user_fpu_struct elf_fpregset_t;
++
++struct user {
++	struct pt_regs regs;
++	struct user_fpu_struct fpu;
++	int u_fpvalid;
++	unsigned long u_tsize;
++	unsigned long u_dsize;
++	unsigned long u_ssize;
++	unsigned long start_code;
++	unsigned long start_data;
++	unsigned long start_stack;
++	long int signal;
++	unsigned long u_ar0;
++	struct user_fpu_struct *u_fpstate;
++	unsigned long magic;
++	char u_comm[32];
++};
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index e5f1d8cac..18b94916f 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -36,17 +36,17 @@ else
 	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TARGET_ABI_N64),y)
+ifeq ($(ADK_n64),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TARGET_ABI_N32),y)
+ifeq ($(ADK_n32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TARGET_ABI_O32),y)
+ifeq ($(ADK_o32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
diff --git a/tools/m4/Makefile b/tools/m4/Makefile
index 996132510..f4a1bae1a 100644
--- a/tools/m4/Makefile
+++ b/tools/m4/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		m4
 PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
-PKG_SITES:=		http://www.gnu.org/software/m4/
+PKG_SITES:=		${MASTER_SITE_GNU:=m4/}
 
 include ../rules.mk
 
diff --git a/tools/mksh/Makefile b/tools/mksh/Makefile
index 8cb7c29b7..2c912e52b 100644
--- a/tools/mksh/Makefile
+++ b/tools/mksh/Makefile
@@ -17,8 +17,7 @@ include ../rules.mk
 install: ${STAGING_HOST_DIR}/usr/bin/mksh
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
-	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
-	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	cd ${WRKBUILD} && CC='${CC_FOR_BUILD}' CFLAGS='${CFLAGS_FOR_BUILD}' \
 	    HAVE_CAN_FSTACKPROTECTORALL=0 \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
 	touch $@
author	Waldemar Brodkorb <wbx@openadk.org>	2014-03-08 18:31:42 +0100
committer	Waldemar Brodkorb <wbx@openadk.org>	2014-03-08 18:31:42 +0100
commit	ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (patch)
tree	1b2ea8ee4b80c2e2e8c28a65a41cb90648d571ca
parent	3fe732e577313be28abbb99a636779a9debe400c (diff)
parent	bd228e8c35627f71a4a15a05424dbd178fcb31e8 (diff)