summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/kernel-build.mk16
-rw-r--r--mk/modules.mk7
-rw-r--r--mk/pkg-bottom.mk5
-rw-r--r--package/base-files/src/etc/fstab1
-rw-r--r--package/base-files/src/etc/group9
-rw-r--r--package/base-files/src/etc/init.d/fs69
-rw-r--r--package/base-files/src/etc/inittab4
-rw-r--r--package/musl/Makefile6
-rw-r--r--target/linux/config/Config.in.watchdog2
-rw-r--r--toolchain/musl/patches/musl-git-20140310.patch (renamed from toolchain/musl/patches/musl-git-20140307.patch)612
-rw-r--r--toolchain/musl/patches/xxx-hotfix-sh.patch80
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)
+{
@@ -3209,7 +3288,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/ipc.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,14 @@
+struct ipc_perm
+{
@@ -3227,7 +3306,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/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)
@@ -3239,7 +3318,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/mman.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,62 @@
+#define MAP_FAILED ((void *) -1)
+
@@ -3305,7 +3384,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/msg.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,16 @@
+struct msqid_ds
+{
@@ -3325,13 +3404,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/posix.h 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/reg.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,29 @@
+#undef __WORDSIZE
+#define __WORDSIZE 32
@@ -3364,12 +3443,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/setjmp.h 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/shm.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,33 @@
+#define SHMLBA 4096
+
@@ -3406,7 +3485,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/signal.h 2014-03-10 16:52:06.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 +3608,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/socket.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,18 @@
+struct msghdr
+{
@@ -3551,7 +3630,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/statfs.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+struct statfs {
+ unsigned long f_type, f_bsize;
@@ -3562,7 +3641,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/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. */
@@ -3588,7 +3667,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/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)
@@ -3596,7 +3675,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/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;
@@ -3620,7 +3699,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/syscall.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,634 @@
+#define __X32_SYSCALL_BIT 0x40000000
+#define __NR_read (__X32_SYSCALL_BIT + 0)
@@ -4258,7 +4337,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/termios.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,160 @@
+struct termios
+{
@@ -4422,7 +4501,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/bits/user.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,44 @@
+#undef __WORDSIZE
+#define __WORDSIZE 64
@@ -4470,7 +4549,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/crt_arch.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,9 @@
+__asm__("\
+.text \n\
@@ -4483,7 +4562,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/pthread_arch.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,10 @@
+static inline struct pthread *__pthread_self()
+{
@@ -4497,7 +4576,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/reloc.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,46 @@
+#include <stdint.h>
+#include <string.h>
@@ -4547,7 +4626,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/src/syscall_cp_fixup.c 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,31 @@
+#include <sys/syscall.h>
+long __syscall_cp_internal(volatile void*, long long, long long, long long, long long,
@@ -4582,7 +4661,7 @@ diff -Nur musl-0.9.15/arch/x32/src/syscall_cp_fixup.c musl-git/arch/x32/src/sysc
+
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
++++ musl-git/arch/x32/src/sysinfo.c 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,47 @@
+#include <sys/sysinfo.h>
+#include "syscall.h"
@@ -4633,7 +4712,7 @@ diff -Nur musl-0.9.15/arch/x32/src/sysinfo.c musl-git/arch/x32/src/sysinfo.c
+}
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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x32/syscall_arch.h 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,117 @@
+#define __SYSCALL_LL_E(x) (x)
+#define __SYSCALL_LL_O(x) (x)
@@ -4754,7 +4833,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x86_64/atomic.h 2014-03-10 16:52:06.000000000 +0100
@@ -5,38 +5,36 @@
static inline int a_ctz_64(uint64_t x)
@@ -4840,7 +4919,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x86_64/bits/shm.h 2014-03-10 16:52:06.000000000 +0100
@@ -13,3 +13,14 @@
unsigned long __pad1;
unsigned long __pad2;
@@ -4858,7 +4937,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x86_64/bits/stat.h 2014-03-10 16:52:06.000000000 +0100
@@ -2,7 +2,7 @@
* by the corresponding correctly-sized userspace types. */
@@ -4870,7 +4949,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x86_64/bits/termios.h 2014-03-10 16:52:06.000000000 +0100
@@ -42,6 +42,7 @@
#define IXANY 0004000
#define IXOFF 0010000
@@ -4926,7 +5005,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-07 14:03:57.000000000 +0100
++++ musl-git/arch/x86_64/pthread_arch.h 2014-03-10 16:52:06.000000000 +0100
@@ -1,7 +1,7 @@
static inline struct pthread *__pthread_self()
{
@@ -4938,7 +5017,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-07 14:03:57.000000000 +0100
++++ musl-git/configure 2014-03-10 16:52:06.000000000 +0100
@@ -222,12 +222,16 @@
# Convert to just ARCH
#
@@ -5005,7 +5084,7 @@ diff -Nur musl-0.9.15/configure musl-git/configure
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
++++ musl-git/COPYRIGHT 2014-03-10 16:52:06.000000000 +0100
@@ -1,6 +1,6 @@
musl as a whole is licensed under the following standard MIT license:
@@ -5025,7 +5104,7 @@ diff -Nur musl-0.9.15/COPYRIGHT musl-git/COPYRIGHT
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-07 14:03:57.000000000 +0100
++++ musl-git/crt/superh/crti.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,13 @@
+.section .init
+.global _init
@@ -5042,7 +5121,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-07 14:03:57.000000000 +0100
++++ musl-git/crt/superh/crtn.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,9 @@
+.section .init
+ lds.l @r15+, pr
@@ -5055,7 +5134,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-07 14:03:57.000000000 +0100
++++ musl-git/crt/x32/crti.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,9 @@
+.section .init
+.global _init
@@ -5068,7 +5147,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-07 14:03:57.000000000 +0100
++++ musl-git/crt/x32/crtn.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.section .init
+ pop %rax
@@ -5079,7 +5158,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-07 14:03:57.000000000 +0100
++++ musl-git/.gitignore 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,11 @@
+*.o
+*.lo
@@ -5094,7 +5173,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-07 14:03:57.000000000 +0100
++++ musl-git/include/arpa/inet.h 2014-03-10 16:52:06.000000000 +0100
@@ -20,7 +20,7 @@
const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t);
@@ -5106,7 +5185,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-07 14:03:57.000000000 +0100
++++ musl-git/include/dlfcn.h 2014-03-10 16:52:06.000000000 +0100
@@ -31,7 +31,7 @@
const char *dli_sname;
void *dli_saddr;
@@ -5118,7 +5197,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-07 14:03:57.000000000 +0100
++++ musl-git/include/elf.h 2014-03-10 16:52:06.000000000 +0100
@@ -1153,6 +1153,7 @@
#define EF_MIPS_64BIT_WHIRL 16
#define EF_MIPS_ABI2 32
@@ -5247,7 +5326,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-07 14:03:57.000000000 +0100
++++ musl-git/include/fcntl.h 2014-03-10 16:52:06.000000000 +0100
@@ -148,6 +148,7 @@
#define SPLICE_F_MORE 4
#define SPLICE_F_GIFT 8
@@ -5264,9 +5343,29 @@ diff -Nur musl-0.9.15/include/fcntl.h musl-git/include/fcntl.h
#define open64 open
#define openat64 openat
#define creat64 creat
+diff -Nur musl-0.9.15/include/math.h musl-git/include/math.h
+--- musl-0.9.15/include/math.h 2014-01-03 21:12:17.000000000 +0100
++++ musl-git/include/math.h 2014-03-10 16:52:06.000000000 +0100
+@@ -42,12 +42,14 @@
+
+ static __inline unsigned __FLOAT_BITS(float __f)
+ {
+- union {float __f; unsigned __i;} __u = {__f};
++ union {float __f; unsigned __i;} __u;
++ __u.__f = __f;
+ return __u.__i;
+ }
+ static __inline unsigned long long __DOUBLE_BITS(double __f)
+ {
+- union {double __f; unsigned long long __i;} __u = {__f};
++ union {double __f; unsigned long long __i;} __u;
++ __u.__f = __f;
+ return __u.__i;
+ }
+
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-07 14:03:57.000000000 +0100
++++ musl-git/include/netdb.h 2014-03-10 16:52:06.000000000 +0100
@@ -131,6 +131,7 @@
#define TRY_AGAIN 2
#define NO_RECOVERY 3
@@ -5277,7 +5376,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-07 14:03:57.000000000 +0100
++++ musl-git/include/netinet/if_ether.h 2014-03-10 16:52:06.000000000 +0100
@@ -54,6 +54,7 @@
#define ETH_P_8021AH 0x88E7
#define ETH_P_MVRP 0x88F5
@@ -5288,7 +5387,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-07 14:03:57.000000000 +0100
++++ musl-git/include/netinet/in.h 2014-03-10 16:52:06.000000000 +0100
@@ -149,7 +149,7 @@
(IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe))
@@ -5397,7 +5496,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-07 14:03:57.000000000 +0100
++++ musl-git/include/netinet/tcp.h 2014-03-10 16:52:06.000000000 +0100
@@ -44,42 +44,80 @@
#define SOL_TCP 6
#include <sys/types.h>
@@ -5595,7 +5694,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-07 14:03:57.000000000 +0100
++++ musl-git/include/netinet/udp.h 2014-03-10 16:52:06.000000000 +0100
@@ -5,19 +5,22 @@
extern "C" {
#endif
@@ -5628,7 +5727,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sched.h 2014-03-10 16:52:06.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 *);
@@ -5640,7 +5739,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-07 14:03:57.000000000 +0100
++++ musl-git/include/signal.h 2014-03-10 16:52:06.000000000 +0100
@@ -227,8 +227,8 @@
typedef void (*sighandler_t)(int);
void (*bsd_signal(int, void (*)(int)))(int);
@@ -5654,7 +5753,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-07 14:03:57.000000000 +0100
++++ musl-git/include/stdlib.h 2014-03-10 16:52:06.000000000 +0100
@@ -93,7 +93,7 @@
#define WSTOPSIG(s) WEXITSTATUS(s)
#define WIFEXITED(s) (!WTERMSIG(s))
@@ -5666,7 +5765,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/inotify.h 2014-03-10 16:52:06.000000000 +0100
@@ -48,7 +48,7 @@
int inotify_init(void);
int inotify_init1(int);
@@ -5678,7 +5777,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/mman.h 2014-03-10 16:52:06.000000000 +0100
@@ -33,7 +33,7 @@
#ifdef _GNU_SOURCE
@@ -5688,9 +5787,21 @@ diff -Nur musl-0.9.15/include/sys/mman.h musl-git/include/sys/mman.h
#endif
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+diff -Nur musl-0.9.15/include/sys/procfs.h musl-git/include/sys/procfs.h
+--- musl-0.9.15/include/sys/procfs.h 2014-01-03 21:12:17.000000000 +0100
++++ musl-git/include/sys/procfs.h 2014-03-10 16:52:06.000000000 +0100
+@@ -40,7 +40,7 @@
+ char pr_zomb;
+ char pr_nice;
+ unsigned long int pr_flag;
+-#if __WORDSIZE == 32
++#if UINTPTR_MAX == 0xffffffff
+ unsigned short int pr_uid;
+ unsigned short int pr_gid;
+ #else
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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/sem.h 2014-03-10 16:52:06.000000000 +0100
@@ -29,19 +29,19 @@
struct semid_ds {
@@ -5721,7 +5832,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/shm.h 2014-03-10 16:52:06.000000000 +0100
@@ -14,6 +14,13 @@
#include <bits/alltypes.h>
@@ -5759,7 +5870,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/socket.h 2014-03-10 16:52:06.000000000 +0100
@@ -202,11 +202,16 @@
#define SO_LOCK_FILTER 44
#define SO_SELECT_ERR_QUEUE 45
@@ -5800,7 +5911,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/time.h 2014-03-10 16:52:06.000000000 +0100
@@ -51,6 +51,17 @@
((a)->tv_usec += 1000000, (a)->tv_sec--) )
#endif
@@ -5821,7 +5932,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-07 14:03:57.000000000 +0100
++++ musl-git/include/sys/wait.h 2014-03-10 16:52:06.000000000 +0100
@@ -50,7 +50,7 @@
#define WCOREDUMP(s) ((s) & 0x80)
#define WIFEXITED(s) (!WTERMSIG(s))
@@ -5833,7 +5944,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-07 14:03:57.000000000 +0100
++++ musl-git/include/syslog.h 2014-03-10 16:52:06.000000000 +0100
@@ -21,7 +21,7 @@
#define LOG_MAKEPRI(f, p) (((f)<<3)|(p))
@@ -5845,7 +5956,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-07 14:03:57.000000000 +0100
++++ musl-git/include/time.h 2014-03-10 16:52:06.000000000 +0100
@@ -125,7 +125,7 @@
@@ -5857,7 +5968,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-07 14:03:57.000000000 +0100
++++ musl-git/include/utmp.h 2014-03-10 16:52:06.000000000 +0100
@@ -10,6 +10,7 @@
#define ACCOUNTING 9
#define UT_NAMESIZE 32
@@ -5877,7 +5988,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-07 14:03:57.000000000 +0100
++++ musl-git/include/utmpx.h 2014-03-10 16:52:06.000000000 +0100
@@ -5,6 +5,8 @@
extern "C" {
#endif
@@ -5924,7 +6035,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-07 14:03:57.000000000 +0100
++++ musl-git/src/crypt/crypt_des.c 2014-03-10 16:52:06.000000000 +0100
@@ -692,7 +692,7 @@
return saltbits;
}
@@ -5981,7 +6092,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-07 14:03:57.000000000 +0100
++++ musl-git/src/crypt/encrypt.c 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,60 @@
+#include <stdint.h>
+#include <stdlib.h>
@@ -6045,7 +6156,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-07 14:03:57.000000000 +0100
++++ musl-git/src/dirent/readdir.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,5 +1,7 @@
#include <dirent.h>
+#include <errno.h>
@@ -6070,7 +6181,7 @@ diff -Nur musl-0.9.15/src/dirent/readdir.c musl-git/src/dirent/readdir.c
}
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
++++ musl-git/src/errno/strerror.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,7 +1,7 @@
#include <errno.h>
#include <string.h>
@@ -6095,9 +6206,17 @@ diff -Nur musl-0.9.15/src/errno/strerror.c musl-git/src/errno/strerror.c
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-07 14:03:57.000000000 +0100
-@@ -13,11 +13,11 @@
- arg = va_arg(ap, long);
++++ musl-git/src/fcntl/fcntl.c 2014-03-10 16:52:06.000000000 +0100
+@@ -7,17 +7,17 @@
+
+ int fcntl(int fd, int cmd, ...)
+ {
+- long arg;
++ unsigned long arg;
+ va_list ap;
+ va_start(ap, cmd);
+- arg = va_arg(ap, long);
++ arg = va_arg(ap, unsigned long);
va_end(ap);
if (cmd == F_SETFL) arg |= O_LARGEFILE;
- if (cmd == F_SETLKW) return syscall_cp(SYS_fcntl, fd, cmd, arg);
@@ -6128,7 +6247,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-07 14:03:57.000000000 +0100
++++ musl-git/src/fcntl/posix_fadvise.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,8 +1,11 @@
#include <fcntl.h>
#include "syscall.h"
@@ -6143,7 +6262,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-07 14:03:57.000000000 +0100
++++ musl-git/src/fcntl/posix_fallocate.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,8 +1,11 @@
#include <fcntl.h>
#include "syscall.h"
@@ -6158,7 +6277,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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/i386/fenv.s 2014-03-10 16:52:06.000000000 +0100
@@ -126,7 +126,7 @@
push %eax
push %eax
@@ -6170,17 +6289,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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/mipsel-sf/fenv.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/mips-sf/fenv.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/sh/fenv.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,74 @@
+.global fegetround
+.type fegetround, @function
@@ -6258,17 +6377,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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/sheb-nofpu/fenv.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/sh-nofpu/fenv.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/x32/fenv.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,97 @@
+.global feclearexcept
+.type feclearexcept,@function
@@ -6369,7 +6488,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-07 14:03:57.000000000 +0100
++++ musl-git/src/fenv/x86_64/fenv.s 2014-03-10 16:52:06.000000000 +0100
@@ -76,7 +76,7 @@
ret
1: push %rax
@@ -6381,7 +6500,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-07 14:03:57.000000000 +0100
++++ musl-git/src/internal/sh/syscall.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,22 @@
+.global __syscall
+.type __syscall, @function
@@ -6407,7 +6526,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-07 14:03:57.000000000 +0100
++++ musl-git/src/internal/stdio_impl.h 2014-03-10 16:52:06.000000000 +0100
@@ -17,6 +17,7 @@
#define F_EOF 16
#define F_ERR 32
@@ -6418,7 +6537,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-07 14:03:57.000000000 +0100
++++ musl-git/src/internal/syscall.h 2014-03-10 16:52:06.000000000 +0100
@@ -1,22 +1,28 @@
#ifndef _INTERNAL_SYSCALL_H
#define _INTERNAL_SYSCALL_H
@@ -6482,7 +6601,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-07 14:03:57.000000000 +0100
++++ musl-git/src/internal/x32/syscall.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,12 @@
+.global __syscall
+.type __syscall,@function
@@ -6498,7 +6617,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ipc/semctl.c 2014-03-10 16:52:06.000000000 +0100
@@ -3,16 +3,22 @@
#include "syscall.h"
#include "ipc.h"
@@ -6528,7 +6647,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ldso/dladdr.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,9 +1,9 @@
#define _GNU_SOURCE
#include <dlfcn.h>
@@ -6543,7 +6662,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ldso/dynlink.c 2014-03-10 16:52:06.000000000 +0100
@@ -253,7 +253,8 @@
name = strings + sym->st_name;
ctx = IS_COPY(type) ? head->next : head;
@@ -6574,7 +6693,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ldso/sh/dlsym.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,10 @@
+.text
+.global dlsym
@@ -6588,7 +6707,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ldso/sh/start.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,26 @@
+.text
+.global _start
@@ -6618,7 +6737,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ldso/x32/dlsym.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,6 @@
+.text
+.global dlsym
@@ -6628,7 +6747,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-07 14:03:57.000000000 +0100
++++ musl-git/src/ldso/x32/start.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,24 @@
+.text
+.global _start
@@ -6656,7 +6775,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-07 14:03:57.000000000 +0100
++++ musl-git/src/linux/clone.c 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <unistd.h>
@@ -6679,7 +6798,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-07 14:03:57.000000000 +0100
++++ musl-git/src/linux/fallocate.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,9 +1,13 @@
#define _GNU_SOURCE
#include <fcntl.h>
@@ -6696,7 +6815,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-07 14:03:57.000000000 +0100
++++ musl-git/src/linux/inotify.c 2014-03-10 16:52:06.000000000 +0100
@@ -15,7 +15,7 @@
return syscall(SYS_inotify_add_watch, fd, pathname, mask);
}
@@ -6708,7 +6827,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-07 14:03:57.000000000 +0100
++++ musl-git/src/linux/remap_file_pages.c 2014-03-10 16:52:06.000000000 +0100
@@ -2,7 +2,7 @@
#include <sys/mman.h>
#include "syscall.h"
@@ -6720,7 +6839,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-07 14:03:57.000000000 +0100
++++ musl-git/src/linux/stime.c 2014-03-10 16:52:06.000000000 +0100
@@ -2,7 +2,7 @@
#include <time.h>
#include <sys/time.h>
@@ -6732,7 +6851,7 @@ diff -Nur musl-0.9.15/src/linux/stime.c musl-git/src/linux/stime.c
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
++++ musl-git/src/linux/x32/sysinfo.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.text
+.global sysinfo
@@ -6741,7 +6860,7 @@ diff -Nur musl-0.9.15/src/linux/x32/sysinfo.s musl-git/src/linux/x32/sysinfo.s
+ 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-07 14:03:57.000000000 +0100
++++ musl-git/src/locale/wcsxfrm.c 2014-03-10 16:52:06.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)
{
@@ -6759,7 +6878,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/i386/remainderf.s 2014-03-10 16:52:06.000000000 +0100
@@ -1,6 +1,9 @@
.global remainderf
.type remainderf,@function
@@ -6772,7 +6891,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/i386/remainder.s 2014-03-10 16:52:06.000000000 +0100
@@ -1,6 +1,9 @@
.global remainder
.type remainder,@function
@@ -6785,7 +6904,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/acosl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,16 @@
+# see ../i386/acos.s
+
@@ -6805,7 +6924,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/asinl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,12 @@
+.global asinl
+.type asinl,@function
@@ -6821,7 +6940,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/atan2l.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global atan2l
+.type atan2l,@function
@@ -6832,7 +6951,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/atanl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global atanl
+.type atanl,@function
@@ -6843,12 +6962,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/ceill.s 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/exp2l.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,90 @@
+.global expm1l
+.type expm1l,@function
@@ -6942,7 +7061,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/expl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,101 @@
+# exp(x) = 2^hi + 2^hi (2^lo - 1)
+# where hi+lo = log2e*x with 128bit precision
@@ -7047,12 +7166,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/expm1l.s 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/fabsf.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global fabsf
+.type fabsf,@function
@@ -7063,7 +7182,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/fabsl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,6 @@
+.global fabsl
+.type fabsl,@function
@@ -7073,7 +7192,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/fabs.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,9 @@
+.global fabs
+.type fabs,@function
@@ -7086,7 +7205,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/floorl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,27 @@
+.global floorl
+.type floorl,@function
@@ -7117,7 +7236,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/fmodl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,11 @@
+.global fmodl
+.type fmodl,@function
@@ -7132,7 +7251,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/llrintf.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.global llrintf
+.type llrintf,@function
@@ -7141,7 +7260,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/llrintl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global llrintl
+.type llrintl,@function
@@ -7152,7 +7271,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/llrint.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.global llrint
+.type llrint,@function
@@ -7161,7 +7280,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/log10l.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global log10l
+.type log10l,@function
@@ -7172,7 +7291,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/log1pl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,15 @@
+.global log1pl
+.type log1pl,@function
@@ -7191,7 +7310,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/log2l.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global log2l
+.type log2l,@function
@@ -7202,7 +7321,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/logl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global logl
+.type logl,@function
@@ -7213,7 +7332,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/lrintf.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.global lrintf
+.type lrintf,@function
@@ -7222,7 +7341,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/lrintl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,7 @@
+.global lrintl
+.type lrintl,@function
@@ -7233,7 +7352,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/lrint.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.global lrint
+.type lrint,@function
@@ -7242,7 +7361,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/remainderl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,11 @@
+.global remainderl
+.type remainderl,@function
@@ -7257,7 +7376,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/rintl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,6 @@
+.global rintl
+.type rintl,@function
@@ -7267,7 +7386,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/sqrtf.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,4 @@
+.global sqrtf
+.type sqrtf,@function
@@ -7275,7 +7394,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/sqrtl.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.global sqrtl
+.type sqrtl,@function
@@ -7284,7 +7403,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/sqrt.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,4 @@
+.global sqrt
+.type sqrt,@function
@@ -7292,12 +7411,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-07 14:03:57.000000000 +0100
++++ musl-git/src/math/x32/truncl.s 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/misc/nftw.c 2014-03-10 16:52:06.000000000 +0100
@@ -46,8 +46,7 @@
type = FTW_F;
}
@@ -7310,7 +7429,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-07 14:03:57.000000000 +0100
++++ musl-git/src/network/accept4.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,9 +1,20 @@
#define _GNU_SOURCE
#include <sys/socket.h>
@@ -7335,7 +7454,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-07 14:03:57.000000000 +0100
++++ musl-git/src/network/inet_legacy.c 2014-03-10 16:52:06.000000000 +0100
@@ -16,9 +16,8 @@
return 1;
}
@@ -7349,7 +7468,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-07 14:03:57.000000000 +0100
++++ musl-git/src/network/proto.c 2014-03-10 16:52:06.000000000 +0100
@@ -4,7 +4,7 @@
/* do we really need all these?? */
@@ -7372,7 +7491,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-07 14:03:57.000000000 +0100
++++ musl-git/src/prng/random.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,10 +1,3 @@
-/*
- * random.c - Copyright © 2011 Szabolcs Nagy
@@ -7407,7 +7526,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-07 14:03:57.000000000 +0100
++++ musl-git/src/process/posix_spawn.c 2014-03-10 16:52:06.000000000 +0100
@@ -166,7 +166,7 @@
close(args.p[0]);
@@ -7419,7 +7538,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-07 14:03:57.000000000 +0100
++++ musl-git/src/process/x32/vfork.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,12 @@
+.global __vfork
+.weak vfork
@@ -7435,17 +7554,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/mipsel-sf/longjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/mipsel-sf/setjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/longjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,25 @@
+.set noreorder
+
@@ -7474,12 +7593,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/longjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/setjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,25 @@
+.set noreorder
+
@@ -7508,12 +7627,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/mips-sf/setjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sh/longjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,26 @@
+.global _longjmp
+.global longjmp
@@ -7543,7 +7662,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sh/setjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,25 @@
+.global __setjmp
+.global _setjmp
@@ -7572,17 +7691,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sheb-nofpu/longjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sheb-nofpu/setjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/longjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,22 @@
+.global _longjmp
+.global longjmp
@@ -7608,12 +7727,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/longjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/setjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,21 @@
+.global __setjmp
+.global _setjmp
@@ -7638,12 +7757,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/sh-nofpu/setjmp.sub 2014-03-10 16:52:06.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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/x32/longjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,22 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global _longjmp
@@ -7669,7 +7788,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-07 14:03:57.000000000 +0100
++++ musl-git/src/setjmp/x32/setjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,22 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global __setjmp
@@ -7695,7 +7814,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-07 14:03:57.000000000 +0100
++++ musl-git/src/signal/sh/restore.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,24 @@
+.global __restore
+.type __restore, @function
@@ -7723,7 +7842,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-07 14:03:57.000000000 +0100
++++ musl-git/src/signal/sh/sigsetjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,27 @@
+.global sigsetjmp
+.type sigsetjmp, @function
@@ -7754,7 +7873,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-07 14:03:57.000000000 +0100
++++ musl-git/src/signal/sigandset.c 2014-03-10 16:52:06.000000000 +0100
@@ -3,7 +3,7 @@
#define SST_SIZE (_NSIG/8/sizeof(long))
@@ -7766,7 +7885,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-07 14:03:57.000000000 +0100
++++ musl-git/src/signal/sigorset.c 2014-03-10 16:52:06.000000000 +0100
@@ -3,7 +3,7 @@
#define SST_SIZE (_NSIG/8/sizeof(long))
@@ -7778,7 +7897,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-07 14:03:57.000000000 +0100
++++ musl-git/src/signal/x32/restore.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,8 @@
+.global __restore_rt
+.global __restore
@@ -7790,7 +7909,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-07 14:03:57.000000000 +0100
++++ musl-git/src/signal/x32/sigsetjmp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,14 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.global sigsetjmp
@@ -7808,7 +7927,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-07 14:03:57.000000000 +0100
++++ musl-git/src/stdio/__fdopen.c 2014-03-10 16:52:06.000000000 +0100
@@ -32,7 +32,9 @@
/* Set append mode on fd if opened for append */
if (*mode == 'a') {
@@ -7822,7 +7941,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-07 14:03:57.000000000 +0100
++++ musl-git/src/stdio/ftell.c 2014-03-10 16:52:06.000000000 +0100
@@ -4,7 +4,9 @@
off_t __ftello_unlocked(FILE *f)
@@ -7834,9 +7953,40 @@ diff -Nur musl-0.9.15/src/stdio/ftell.c musl-git/src/stdio/ftell.c
if (pos < 0) return pos;
/* Adjust for data in buffer. */
+diff -Nur musl-0.9.15/src/stdio/vfprintf.c musl-git/src/stdio/vfprintf.c
+--- musl-0.9.15/src/stdio/vfprintf.c 2014-01-03 21:12:18.000000000 +0100
++++ musl-git/src/stdio/vfprintf.c 2014-03-10 16:52:06.000000000 +0100
+@@ -207,7 +207,8 @@
+
+ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t)
+ {
+- uint32_t big[(LDBL_MAX_EXP+LDBL_MANT_DIG)/9+1];
++ uint32_t big[(LDBL_MANT_DIG+28)/29 + 1 // mantissa expansion
++ + (LDBL_MAX_EXP+LDBL_MANT_DIG+28+8)/9]; // exponent expansion
+ uint32_t *a, *d, *r, *z;
+ int e2=0, e, i, j, l;
+ char buf[9+LDBL_MANT_DIG/4], *s;
+@@ -313,7 +314,7 @@
+ }
+ while (e2<0) {
+ uint32_t carry=0, *b;
+- int sh=MIN(9,-e2);
++ int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3+8)/9;
+ for (d=a; d<z; d++) {
+ uint32_t rm = *d & (1<<sh)-1;
+ *d = (*d>>sh) + carry;
+@@ -323,7 +324,7 @@
+ if (carry) *z++ = carry;
+ /* Avoid (slow!) computation past requested precision */
+ b = (t|32)=='f' ? r : a;
+- if (z-b > 2+p/9) z = b+2+p/9;
++ if (z-b > need) z = b+need;
+ e2+=sh;
+ }
+
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-07 14:03:57.000000000 +0100
++++ musl-git/src/stdio/vfscanf.c 2014-03-10 16:52:06.000000000 +0100
@@ -328,3 +328,5 @@
FUNLOCK(f);
return matches;
@@ -7845,7 +7995,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/arm/clone.s 2014-03-10 16:52:06.000000000 +0100
@@ -1,10 +1,7 @@
.text
.global __clone
@@ -7859,7 +8009,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/cancel_dummy.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,6 +1,9 @@
#include "pthread_impl.h"
+#include "syscall.h"
@@ -7873,7 +8023,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/cancel_impl.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,4 +1,5 @@
#include "pthread_impl.h"
+#include "syscall.h"
@@ -7898,7 +8048,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/clone.c 2014-03-10 16:52:06.000000000 +0100
@@ -1,10 +1,7 @@
#include <errno.h>
-#include "libc.h"
@@ -7914,7 +8064,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/i386/clone.s 2014-03-10 16:52:06.000000000 +0100
@@ -1,10 +1,7 @@
.text
.global __clone
@@ -7928,7 +8078,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/microblaze/clone.s 2014-03-10 16:52:06.000000000 +0100
@@ -1,14 +1,11 @@
.global __clone
-.weak clone
@@ -7955,7 +8105,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/sh/clone.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,47 @@
+.text
+.global __clone
@@ -8006,7 +8156,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/sh/__set_thread_area.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,5 @@
+.global __set_thread_area
+.type __set_thread_area, @function
@@ -8015,7 +8165,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/sh/syscall_cp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,39 @@
+.text
+.global __syscall_cp_asm
@@ -8058,7 +8208,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/sh/__unmapself.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,22 @@
+.text
+.global __unmapself
@@ -8084,7 +8234,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/__wait.c 2014-03-10 16:52:06.000000000 +0100
@@ -10,6 +10,6 @@
}
if (waiters) a_inc(waiters);
@@ -8095,7 +8245,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/x32/clone.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,25 @@
+.text
+.global __clone
@@ -8124,7 +8274,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/x32/__set_thread_area.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,10 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.text
@@ -8138,7 +8288,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/x32/syscall_cp.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,23 @@
+.text
+.global __syscall_cp_internal
@@ -8165,7 +8315,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/x32/__unmapself.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,10 @@
+/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */
+.text
@@ -8179,7 +8329,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-07 14:03:57.000000000 +0100
++++ musl-git/src/thread/x86_64/clone.s 2014-03-10 16:52:06.000000000 +0100
@@ -1,10 +1,7 @@
.text
.global __clone
@@ -8193,7 +8343,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-07 14:03:57.000000000 +0100
++++ musl-git/src/time/timer_delete.c 2014-03-10 16:52:06.000000000 +0100
@@ -10,5 +10,5 @@
__wake(&td->timer_id, 1, 1);
return 0;
@@ -8203,7 +8353,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-07 14:03:57.000000000 +0100
++++ musl-git/src/time/timer_getoverrun.c 2014-03-10 16:52:06.000000000 +0100
@@ -8,5 +8,5 @@
pthread_t td = (void *)((uintptr_t)t << 1);
t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
@@ -8213,7 +8363,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-07 14:03:57.000000000 +0100
++++ musl-git/src/time/timer_gettime.c 2014-03-10 16:52:06.000000000 +0100
@@ -8,5 +8,5 @@
pthread_t td = (void *)((uintptr_t)t << 1);
t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
@@ -8223,7 +8373,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-07 14:03:57.000000000 +0100
++++ musl-git/src/time/timer_settime.c 2014-03-10 16:52:06.000000000 +0100
@@ -8,5 +8,5 @@
pthread_t td = (void *)((uintptr_t)t << 1);
t = (void *)(uintptr_t)(td->timer_id & INT_MAX);
@@ -8233,7 +8383,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-07 14:03:57.000000000 +0100
++++ musl-git/src/unistd/sh/pipe.s 2014-03-10 16:52:06.000000000 +0100
@@ -0,0 +1,27 @@
+.global pipe
+.type pipe, @function
@@ -8264,7 +8414,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-07 14:03:57.000000000 +0100
++++ musl-git/tools/install.sh 2014-03-10 16:52:06.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
deleted file mode 100644
index 0c60604d0..000000000
--- a/toolchain/musl/patches/xxx-hotfix-sh.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-* 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];
-+};