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

11 files changed, 476 insertions, 335 deletions

diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 8fe0799a0..b2dc77d82 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -42,28 +42,30 @@ else
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
 	echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
 endif
-	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 
 $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
-	-rm $(LINUX_DIR)/$(KERNEL_TARGET) 2>/dev/null
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile
-	${KERNEL_MAKE_ENV} $(MAKE) V=1 ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) $(MAKE_TRACE)
+	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE)
+	touch -c $(LINUX_DIR)/$(KERNEL_FILE)
+
+$(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install
 	rm -rf $(LINUX_BUILD_DIR)/modules
 	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \
 		INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \
 		LOCALVERSION="" \
-		modules modules_install $(MAKE_TRACE)
+		modules_install $(MAKE_TRACE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-create-packages
 ifneq ($(strip $(TARGETS)),)
 	$(MAKE) $(TARGETS)
 endif
-	touch -c $(LINUX_DIR)/$(KERNEL_FILE)
+
+$(INSTALL_TARGETS): $(LINUX_BUILD_DIR)/modules
 
 prepare:
-compile: $(LINUX_DIR)/$(KERNEL_FILE)
-install: compile
+compile: $(LINUX_BUILD_DIR)/modules
+install: compile $(INSTALL_TARGETS)
 ifneq ($(strip $(INSTALL_TARGETS)),)
 	$(TRACE) target/${ADK_TARGET_ARCH}-modules-install
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
diff --git a/mk/modules.mk b/mk/modules.mk
index 32c9fe05c..428fe2700 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1218,7 +1218,6 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 
 $(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\
 	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \
-	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \
 	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \
 ,55, kmod-snd-soc))
 
@@ -1226,7 +1225,7 @@ $(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifibe
 	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \
 ,56, kmod-snd-bcm2709-soc-i2s))
 
-$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\
+$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2709-soc-hifiberry-digi,\
 	$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \
 ,56, kmod-snd-bcm2709-soc-i2s))
 
@@ -1418,8 +1417,8 @@ $(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\
 # Misc devices
 #
 
-$(eval $(call KMOD_template,SOFTDOG,softdog,\
-	$(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \
+$(eval $(call KMOD_template,SOFT_WATCHDOG,soft-watchdog,\
+	$(MODULES_DIR)/kernel/drivers/watchdog/softdog \
 ,95))
 
 $(eval $(call KMOD_template,FW_LOADER,fw-loader,\
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 941970cbc..3e454ee5a 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -213,11 +213,6 @@ endif
 	touch $@
 
 ${_IPKGS_COOKIE}:
-	@clean=0; \
-	for f in ${ALL_IPKGS}; do \
-		[[ -e $$f ]] && clean=1; \
-	done; \
-	[[ $$clean = 0 ]] || ${MAKE} clean
 	exec ${MAKE} package
 
 package: ${ALL_IPKGS}
diff --git a/package/base-files/src/etc/fstab b/package/base-files/src/etc/fstab
index fafa1d56e..5c09c2510 100644
--- a/package/base-files/src/etc/fstab
+++ b/package/base-files/src/etc/fstab
@@ -1,7 +1,6 @@
 # /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
diff --git a/package/base-files/src/etc/group b/package/base-files/src/etc/group
index bbf6c0603..51d78238c 100644
--- a/package/base-files/src/etc/group
+++ b/package/base-files/src/etc/group
@@ -1,4 +1,9 @@
 root:x:0:
-video:x:1:
-audio:x:2:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+video:x:6:
+audio:x:7:
 nogroup:x:65534:
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
new file mode 100644
index 000000000..f79d9348d
--- /dev/null
+++ b/package/base-files/src/etc/init.d/fs
@@ -0,0 +1,69 @@
+#!/bin/sh
+#INIT 60
+[[ $1 = autostart ]] || exit 0
+
+# activate swap
+[ -x /sbin/swapon ] && { swapon -a; }
+
+# activate any logical volumes
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
+
+# filesystem checks
+[ -x /sbin/fsck.ext2 ] && {
+	for i in $(grep ext2 /etc/fstab|awk '{ print $1}');do fsck.ext2 $i;done;
+}
+[ -x /sbin/fsck.ext3 ] && {
+	for i in $(grep ext3 /etc/fstab|awk '{ print $1}');do fsck.ext3 $i;done;
+}
+[ -x /sbin/fsck.ext4 ] && {
+	for i in $(grep ext4 /etc/fstab|awk '{ print $1}');do fsck.ext4 $i;done;
+}
+[ -x /sbin/fsck.xfs ] && {
+	for i in $(grep xfs /etc/fstab|awk '{ print $1}');do xfs_repair $i;done;
+}
+# local filesystems
+grep ext2 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep ext2 /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext2
+	fi
+fi
+grep ext3 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep ext3 /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext3
+	fi
+fi
+grep ext4 /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep ext4 /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t ext4
+	fi
+fi
+grep xfs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep xfs /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t xfs
+	fi
+fi
+
+# mount net filesystems (nfs/cifs)
+grep nfs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep nfs /etc/fstab  >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t nfs
+	fi
+fi
+grep cifs /proc/filesystems  >/dev/null 2>&1
+if [ $? -eq 0 ];then
+	grep cifs /etc/fstab >/dev/null 2>&1
+	if [ $? -eq 0 ];then
+		mount -a -t cifs
+	fi
+fi
+exit 0
diff --git a/package/base-files/src/etc/inittab b/package/base-files/src/etc/inittab
index eb00b00ef..f6183798e 100644
--- a/package/base-files/src/etc/inittab
+++ b/package/base-files/src/etc/inittab
@@ -1,7 +1,9 @@
 null::sysinit:/bin/mount -t proc proc /proc
+null::sysinit:/bin/mount -t sysfs sys /sys
 null::sysinit:/bin/mkdir -p /dev/pts
 null::sysinit:/bin/mkdir -p /dev/shm
-null::sysinit:/bin/mount -a
+null::sysinit:/bin/mount -a -t devpts
+null::sysinit:/bin/mount -a -t tmpfs
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/etc/init.d/rcK
 null::shutdown:/bin/umount -a -r
diff --git a/package/musl/Makefile b/package/musl/Makefile
index 3341c83a8..efb5404cb 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -55,13 +55,13 @@ endif
 
 # do nothing, musl is already build in toolchain directory
 do-install:
-	${INSTALL_DIR} $(IDIR_MUSL)/usr/bin
+	${INSTALL_DIR} $(IDIR_MUSL)/bin
 	${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
 	(cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \
 		ln -sf libc.so ld-musl-$(MARCH).so.1)
-	(cd $(IDIR_MUSL)/usr/bin && \
-		ln -sf ../../lib/ld-musl-$(MARCH).so.1 ldd)
+	(cd $(IDIR_MUSL)/bin && \
+		ln -sf ../lib/ld-musl-$(MARCH).so.1 ldd)
 	
 
 musl-dev-install:
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 08e884a01..4a727e7d6 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT
 	 Routerboard 532's SoC, the IDT RC32434.
 
 config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
-	prompt "kmod-softdog...................... Software watchdog"
+	prompt "kmod-soft-watchdog...................... Software watchdog"
 	tristate
 	default n
 	select ADK_KERNEL_WATCHDOG
diff --git a/toolchain/musl/patches/musl-git-20140307.patch b/toolchain/musl/patches/musl-git-20140310.patch
index 0cf790196..29b58b843 100644
--- a/toolchain/musl/patches/musl-git-20140307.patch
+++ b/toolchain/musl/patches/musl-git-20140310.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/arm/bits/shm.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/arm/bits/termios.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/arm/syscall_arch.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/i386/bits/shm.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/i386/bits/termios.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/microblaze/bits/shm.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/microblaze/bits/termios.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/microblaze/syscall_arch.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/mips/bits/fenv.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/mips/bits/shm.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/mips/bits/termios.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/mips/reloc.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/mips/syscall_arch.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/powerpc/bits/shm.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/powerpc/bits/termios.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/atomic.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/alltypes.h.in	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/endian.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/errno.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/fcntl.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/fenv.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/float.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/ioctl.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/ipc.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/limits.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/mman.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/msg.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/posix.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/setjmp.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/shm.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/signal.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/socket.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/statfs.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/stat.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/stdarg.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/stdint.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/syscall.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/bits/termios.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,160 @@
 +struct termios
 +{
@@ -2189,9 +2189,88 @@ diff -Nur musl-0.9.15/arch/sh/bits/termios.h musl-git/arch/sh/bits/termios.h
 +#define EXTPROC 0200000
 +#define XTABS  0014000
 +#endif
+diff -Nur musl-0.9.15/arch/sh/bits/user.h musl-git/arch/sh/bits/user.h
+--- musl-0.9.15/arch/sh/bits/user.h	1970-01-01 01:00:00.000000000 +0100
++++ musl-git/arch/sh/bits/user.h	2014-03-10 16:52:06.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 -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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/crt_arch.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,9 @@
 +__asm__("\
 +.global _start \n\
@@ -2204,7 +2283,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/pthread_arch.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,11 @@
 +static inline struct pthread *__pthread_self()
 +{
@@ -2219,7 +2298,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/reloc.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,47 @@
 +#if __BYTE_ORDER == __BIG_ENDIAN
 +#define ENDIAN_SUFFIX "eb"
@@ -2270,7 +2349,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/src/atomic.c	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,146 @@
 +#include "libc.h"
 +
@@ -2420,13 +2499,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/src/__fpsrc_values.c	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/sh/syscall_arch.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,87 @@
 +#define __SYSCALL_LL_E(x) \
 +((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
@@ -2517,7 +2596,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/atomic.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,125 @@
 +#ifndef _INTERNAL_ATOMIC_H
 +#define _INTERNAL_ATOMIC_H
@@ -2646,7 +2725,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/alltypes.h.in	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,28 @@
 +#define _Addr int
 +#define _Int64 long long
@@ -2678,12 +2757,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/endian.h	2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/errno.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,134 @@
 +#define EPERM            1
 +#define ENOENT           2
@@ -2821,7 +2900,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/fcntl.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,39 @@
 +#define O_CREAT        0100
 +#define O_EXCL         0200
@@ -2864,7 +2943,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/fenv.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,34 @@
 +#define FE_INVALID    1
 +#define __FE_DENORM   2
@@ -2902,7 +2981,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/float.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,21 @@
 +#define FLT_ROUNDS 1
 +#ifdef __FLT_EVAL_METHOD__
@@ -2927,7 +3006,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/ioctl.h	2014-03-10 16:52:06.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 +3207,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/io.h	2014-03-10 16:52:06.000000000 +0100
 @@ -0,0 +1,77 @@
 +static __inline void outb(unsigned char __val, unsigned short __port)
 +{</