summaryrefslogtreecommitdiff
path: root/toolchain/musl
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain/musl')
-rw-r--r--toolchain/musl/Makefile26
-rw-r--r--toolchain/musl/Makefile.inc5
-rw-r--r--toolchain/musl/patches/musl-git-20140310.patch8432
3 files changed, 14 insertions, 8449 deletions
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index aa5e8845c..7b0eeb104 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -9,15 +9,10 @@ include ${TOPDIR}/mk/buildhlp.mk
ifeq ($(CPU_ARCH),ppc)
GNU_TARGET_NAME:= $(subst ppc,powerpc,$(GNU_TARGET_NAME))
endif
-ifeq ($(CPU_ARCH),mips64el)
-GNU_TARGET_NAME:= $(subst mips64el,mips,$(GNU_TARGET_NAME))
-endif
-ifeq ($(CPU_ARCH),mips64)
-GNU_TARGET_NAME:= $(subst mips64,mips,$(GNU_TARGET_NAME))
-endif
$(WRKBUILD)/.headers:
(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+ CFLAGS='$(TARGET_CFLAGS)' \
./configure --prefix=/usr \
--target=$(GNU_TARGET_NAME) \
--disable-gcc-wrapper \
@@ -28,35 +23,38 @@ $(WRKBUILD)/.headers:
$(WRKBUILD)/.compiled:
# reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled
- $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
+ $(MAKE) -C $(WRKBUILD) clean
(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+ CFLAGS='$(TARGET_CFLAGS)' \
./configure --prefix=/usr \
--target=$(GNU_TARGET_NAME) \
--disable-gcc-wrapper \
)
- $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
+ $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all
touch $@
$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
- $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
+ $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
touch $@
$(WRKBUILD)/.fixup:
# reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled
- $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
+ $(MAKE) -C $(WRKBUILD) clean
(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+ CFLAGS='$(TARGET_CFLAGS)' \
./configure --prefix=/usr \
--target=$(GNU_TARGET_NAME) \
--disable-gcc-wrapper \
)
- $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
- $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
+ $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all
+ $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
# cleanup toolchain
-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
ifeq ($(ADK_TOOLCHAIN),y)
# strip target libs and host tools for toolchain builds
- PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
- debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
+ PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \
+ $(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME)
+ debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(TOOLCHAIN_DIR)/usr/bin
endif
touch $@
diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc
index 506280532..40cf4fcf0 100644
--- a/toolchain/musl/Makefile.inc
+++ b/toolchain/musl/Makefile.inc
@@ -2,8 +2,7 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= musl
-PKG_VERSION:= 0.9.15
+PKG_VERSION:= 1.0.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 06f590a38c85722ee9343db2416425f4
+PKG_MD5SUM:= e54664fdf211d27737e328c4462b545e
PKG_SITES:= http://www.musl-libc.org/releases/
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/toolchain/musl/patches/musl-git-20140310.patch b/toolchain/musl/patches/musl-git-20140310.patch
deleted file mode 100644
index 29b58b843..000000000
--- a/toolchain/musl/patches/musl-git-20140310.patch
+++ /dev/null
@@ -1,8432 +0,0 @@
-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-10 16:52:06.000000000 +0100
-@@ -16,3 +16,14 @@
- unsigned long __pad1;
- unsigned long __pad2;
- };
-+
-+struct shminfo {
-+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+ int __used_ids;
-+ unsigned long shm_tot, shm_rss, shm_swp;
-+ unsigned long __swap_attempts, __swap_successes;
-+};
-+
-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-10 16:52:06.000000000 +0100
-@@ -42,6 +42,7 @@
- #define IXANY 0004000
- #define IXOFF 0010000
- #define IMAXBEL 0020000
-+#define IUTF8 0040000
-
- #define OPOST 0000001
- #define OLCUC 0000002
-@@ -75,9 +76,6 @@
- #define VT0 0000000
- #define VT1 0040000
-
--/* ?? */
--#define XTABS 0014000
--
- #define B0 0000000
- #define B50 0000001
- #define B75 0000002
-@@ -125,8 +123,6 @@
- #define HUPCL 0002000
- #define CLOCAL 0004000
-
--#define CRTSCTS 020000000000
--
- #define ISIG 0000001
- #define ICANON 0000002
- #define ECHO 0000010
-@@ -137,14 +133,11 @@
- #define TOSTOP 0000400
- #define IEXTEN 0100000
-
--/* Extensions? */
--#define CBAUDEX 0010000
- #define ECHOCTL 0001000
- #define ECHOPRT 0002000
- #define ECHOKE 0004000
- #define FLUSHO 0010000
- #define PENDIN 0040000
--#define EXTPROC 0200000
-
- #define TCOOFF 0
- #define TCOON 1
-@@ -158,3 +151,10 @@
- #define TCSANOW 0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CRTSCTS 020000000000
-+#define EXTPROC 0200000
-+#define XTABS 0014000
-+#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-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))
-
-+long (__syscall)(long, ...);
-+
- #ifndef __clang__
-
- #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-10 16:52:06.000000000 +0100
-@@ -16,3 +16,14 @@
- unsigned long __pad1;
- unsigned long __pad2;
- };
-+
-+struct shminfo {
-+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+ int __used_ids;
-+ unsigned long shm_tot, shm_rss, shm_swp;
-+ unsigned long __swap_attempts, __swap_successes;
-+};
-+
-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-10 16:52:06.000000000 +0100
-@@ -42,6 +42,7 @@
- #define IXANY 0004000
- #define IXOFF 0010000
- #define IMAXBEL 0020000
-+#define IUTF8 0040000
-
- #define OPOST 0000001
- #define OLCUC 0000002
-@@ -75,9 +76,6 @@
- #define VT0 0000000
- #define VT1 0040000
-
--/* ?? */
--#define XTABS 0014000
--
- #define B0 0000000
- #define B50 0000001
- #define B75 0000002
-@@ -125,8 +123,6 @@
- #define HUPCL 0002000
- #define CLOCAL 0004000
-
--#define CRTSCTS 020000000000
--
- #define ISIG 0000001
- #define ICANON 0000002
- #define ECHO 0000010
-@@ -137,14 +133,11 @@
- #define TOSTOP 0000400
- #define IEXTEN 0100000
-
--/* Extensions? */
--#define CBAUDEX 0010000
- #define ECHOCTL 0001000
- #define ECHOPRT 0002000
- #define ECHOKE 0004000
- #define FLUSHO 0010000
- #define PENDIN 0040000
--#define EXTPROC 0200000
-
- #define TCOOFF 0
- #define TCOON 1
-@@ -158,3 +151,10 @@
- #define TCSANOW 0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CRTSCTS 020000000000
-+#define EXTPROC 0200000
-+#define XTABS 0014000
-+#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-10 16:52:06.000000000 +0100
-@@ -16,3 +16,14 @@
- unsigned long __pad1;
- unsigned long __pad2;
- };
-+
-+struct shminfo {
-+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+ int __used_ids;
-+ unsigned long shm_tot, shm_rss, shm_swp;
-+ unsigned long __swap_attempts, __swap_successes;
-+};
-+
-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-10 16:52:06.000000000 +0100
-@@ -42,6 +42,7 @@
- #define IXANY 0004000
- #define IXOFF 0010000
- #define IMAXBEL 0020000
-+#define IUTF8 0040000
-
- #define OPOST 0000001
- #define OLCUC 0000002
-@@ -75,9 +76,6 @@
- #define VT0 0000000
- #define VT1 0040000
-
--/* ?? */
--#define XTABS 0014000
--
- #define B0 0000000
- #define B50 0000001
- #define B75 0000002
-@@ -125,8 +123,6 @@
- #define HUPCL 0002000
- #define CLOCAL 0004000
-
--#define CRTSCTS 020000000000
--
- #define ISIG 0000001
- #define ICANON 0000002
- #define ECHO 0000010
-@@ -137,14 +133,11 @@
- #define TOSTOP 0000400
- #define IEXTEN 0100000
-
--/* Extensions? */
--#define CBAUDEX 0010000
- #define ECHOCTL 0001000
- #define ECHOPRT 0002000
- #define ECHOKE 0004000
- #define FLUSHO 0010000
- #define PENDIN 0040000
--#define EXTPROC 0200000
-
- #define TCOOFF 0
- #define TCOON 1
-@@ -158,3 +151,10 @@
- #define TCSANOW 0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CRTSCTS 020000000000
-+#define EXTPROC 0200000
-+#define XTABS 0014000
-+#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-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))
-
-+long (__syscall)(long, ...);
-+
- #ifndef __clang__
-
- 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-10 16:52:06.000000000 +0100
-@@ -1,3 +1,7 @@
-+#ifdef __mips_soft_float
-+#define FE_ALL_EXCEPT 0
-+#define FE_TONEAREST 0
-+#else
- #define FE_INEXACT 4
- #define FE_UNDERFLOW 8
- #define FE_OVERFLOW 16
-@@ -10,6 +14,7 @@
- #define FE_TOWARDZERO 1
- #define FE_UPWARD 2
- #define FE_DOWNWARD 3
-+#endif
-
- typedef unsigned short fexcept_t;
-
-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-10 16:52:06.000000000 +0100
-@@ -13,3 +13,14 @@
- unsigned long __pad1;
- unsigned long __pad2;
- };
-+
-+struct shminfo {
-+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+ int __used_ids;
-+ unsigned long shm_tot, shm_rss, shm_swp;
-+ unsigned long __swap_attempts, __swap_successes;
-+};
-+
-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-10 16:52:06.000000000 +0100
-@@ -77,9 +77,6 @@
- #define VT0 0000000
- #define VT1 0040000
-
--/* ?? */
--#define XTABS 0014000
--
- #define B0 0000000
- #define B50 0000001
- #define B75 0000002
-@@ -129,12 +126,6 @@
- #define PARODD 0001000
- #define HUPCL 0002000
- #define CLOCAL 0004000
--#define CBAUDEX 0010000
--
--#define CIBAUD 002003600000
--#define CMSPAR 010000000000
--#define CRTSCTS 020000000000
--#define IBSHIFT 16
-
- #define ISIG 0000001
- #define ICANON 0000002
-@@ -152,9 +143,6 @@
- #define PENDIN 0040000
- #define TOSTOP 0100000
- #define ITOSTOP 0100000
--#define EXTPROC 0200000
--
--#define TIOCSER_TEMT 1
-
- #define TCOOFF 0
- #define TCOON 1
-@@ -168,3 +156,14 @@
- #define TCSANOW 0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CIBAUD 002003600000
-+#define IBSHIFT 16
-+#define CMSPAR 010000000000
-+#define CRTSCTS 020000000000
-+#define EXTPROC 0200000
-+#define XTABS 0014000
-+#define TIOCSER_TEMT 1
-+#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-10 16:52:06.000000000 +0100
-@@ -8,7 +8,13 @@
- #define ENDIAN_SUFFIX ""
- #endif
-
--#define LDSO_ARCH "mips" ENDIAN_SUFFIX
-+#ifdef __mips_soft_float
-+#define FP_SUFFIX "-sf"
-+#else
-+#define FP_SUFFIX ""
-+#endif
-+
-+#define LDSO_ARCH "mips" ENDIAN_SUFFIX FP_SUFFIX
-
- #define IS_COPY(x) ((x)==R_MIPS_COPY)
- #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-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))
-
-+long (__syscall)(long, ...);
-+
- #ifndef __clang__
-
- #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-10 16:52:06.000000000 +0100
-@@ -16,3 +16,14 @@
- unsigned long __pad1;
- unsigned long __pad2;
- };
-+
-+struct shminfo {
-+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+ int __used_ids;
-+ unsigned long shm_tot, shm_rss, shm_swp;
-+ unsigned long __swap_attempts, __swap_successes;
-+};
-+
-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-10 16:52:06.000000000 +0100
-@@ -66,7 +66,6 @@
- #define TAB1 00002000
- #define TAB2 00004000
- #define TAB3 00006000
--#define XTABS 00006000
- #define CRDLY 00030000
- #define CR0 00000000
- #define CR1 00010000
-@@ -101,7 +100,6 @@
- #define B38400 0000017
- #define EXTA B19200
- #define EXTB B38400
--#define CBAUDEX 0000000
- #define B57600 00020
- #define B115200 00021
- #define B230400 00022
-@@ -120,9 +118,6 @@
- #define B4000000 00036
- #define BOTHER 00037
-
--#define CIBAUD 077600000
--#define IBSHIFT 16
--
- #define CSIZE 00001400
- #define CS5 00000000
- #define CS6 00000400
-@@ -136,8 +131,6 @@
- #define HUPCL 00040000
-
- #define CLOCAL 00100000
--#define CMSPAR 010000000000
--#define CRTSCTS 020000000000
-
- #define ISIG 0x00000080
- #define ICANON 0x00000100
-@@ -154,7 +147,6 @@
- #define FLUSHO 0x00800000
- #define PENDIN 0x20000000
- #define IEXTEN 0x00000400
--#define EXTPROC 0x10000000
-
- #define TCOOFF 0
- #define TCOON 1
-@@ -168,3 +160,13 @@
- #define TCSANOW 0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0000000
-+#define CIBAUD 077600000
-+#define IBSHIFT 16
-+#define CMSPAR 010000000000
-+#define CRTSCTS 020000000000
-+#define EXTPROC 0x10000000
-+#define XTABS 00006000
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,87 @@
-+#ifndef _INTERNAL_ATOMIC_H
-+#define _INTERNAL_ATOMIC_H
-+
-+#include <stdint.h>
-+
-+static inline int a_ctz_l(unsigned long x)
-+{
-+ static const char debruijn32[32] = {
-+ 0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-+ 31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-+ };
-+ return debruijn32[(x&-x)*0x076be629 >> 27];
-+}
-+
-+static inline int a_ctz_64(uint64_t x)
-+{
-+ uint32_t y = x;
-+ if (!y) {
-+ y = x>>32;
-+ return 32 + a_ctz_l(y);
-+ }
-+ return a_ctz_l(y);
-+}
-+
-+int __sh_cas(volatile int *, int, int);
-+int __sh_swap(volatile int *, int);
-+int __sh_fetch_add(volatile int *, int);
-+void __sh_store(volatile int *, int);
-+void __sh_and(volatile int *, int);
-+void __sh_or(volatile int *, int);
-+
-+#define a_cas(p,t,s) __sh_cas(p,t,s)
-+#define a_swap(x,v) __sh_swap(x,v)
-+#define a_fetch_add(x,v) __sh_fetch_add(x, v)
-+#define a_store(x,v) __sh_store(x, v)
-+#define a_and(x,v) __sh_and(x, v)
-+#define a_or(x,v) __sh_or(x, v)
-+
-+static inline void *a_cas_p(volatile void *p, void *t, void *s)
-+{
-+ return (void *)a_cas(p, (int)t, (int)s);
-+}
-+
-+static inline long a_cas_l(volatile void *p, long t, long s)
-+{
-+ return a_cas(p, t, s);
-+}
-+
-+static inline void a_inc(volatile int *x)
-+{
-+ a_fetch_add(x, 1);
-+}
-+
-+static inline void a_dec(volatile int *x)
-+{
-+ a_fetch_add(x, -1);
-+}
-+
-+static inline void a_spin()
-+{
-+}
-+
-+static inline void a_crash()
-+{
-+ *(volatile char *)0=0;
-+}
-+
-+static inline void a_or_l(volatile void *p, long v)
-+{
-+ a_or(p, v);
-+}
-+
-+static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-+{
-+ union { uint64_t v; uint32_t r[2]; } u = { v };
-+ a_and((int *)p, u.r[0]);
-+ a_and((int *)p+1, u.r[1]);
-+}
-+
-+static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-+{
-+ union { uint64_t v; uint32_t r[2]; } u = { v };
-+ a_or((int *)p, u.r[0]);
-+ a_or((int *)p+1, u.r[1]);
-+}
-+
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,23 @@
-+#define _Addr int
-+#define _Int64 long long
-+#define _Reg int
-+
-+TYPEDEF __builtin_va_list va_list;
-+TYPEDEF __builtin_va_list __isoc_va_list;
-+
-+#ifndef __cplusplus
-+TYPEDEF long wchar_t;
-+#endif
-+TYPEDEF unsigned wint_t;
-+
-+TYPEDEF float float_t;
-+TYPEDEF double double_t;
-+
-+TYPEDEF long time_t;
-+TYPEDEF long suseconds_t;
-+
-+TYPEDEF struct { union { int __i[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-+TYPEDEF struct { union { int __i[6]; void *__p[6]; } __u; } pthread_mutex_t;
-+TYPEDEF struct { union { int __i[12]; void *__p[12]; } __u; } pthread_cond_t;
-+TYPEDEF struct { union { int __i[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-+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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,5 @@
-+#if __BIG_ENDIAN__
-+#define __BYTE_ORDER __BIG_ENDIAN
-+#else
-+#define __BYTE_ORDER __LITTLE_ENDIAN
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,134 @@
-+#define EPERM 1
-+#define ENOENT 2
-+#define ESRCH 3
-+#define EINTR 4
-+#define EIO 5
-+#define ENXIO 6
-+#define E2BIG 7
-+#define ENOEXEC 8
-+#define EBADF 9
-+#define ECHILD 10
-+#define EAGAIN 11
-+#define ENOMEM 12
-+#define EACCES 13
-+#define EFAULT 14
-+#define ENOTBLK 15
-+#define EBUSY 16
-+#define EEXIST 17
-+#define EXDEV 18
-+#define ENODEV 19
-+#define ENOTDIR 20
-+#define EISDIR 21
-+#define EINVAL 22
-+#define ENFILE 23
-+#define EMFILE 24
-+#define ENOTTY 25
-+#define ETXTBSY 26
-+#define EFBIG 27
-+#define ENOSPC 28
-+#define ESPIPE 29
-+#define EROFS 30
-+#define EMLINK 31
-+#define EPIPE 32
-+#define EDOM 33
-+#define ERANGE 34
-+#define EDEADLK 35
-+#define ENAMETOOLONG 36
-+#define ENOLCK 37
-+#define ENOSYS 38
-+#define ENOTEMPTY 39
-+#define ELOOP 40
-+#define EWOULDBLOCK EAGAIN
-+#define ENOMSG 42
-+#define EIDRM 43
-+#define ECHRNG 44
-+#define EL2NSYNC 45
-+#define EL3HLT 46
-+#define EL3RST 47
-+#define ELNRNG 48
-+#define EUNATCH 49
-+#define ENOCSI 50
-+#define EL2HLT 51
-+#define EBADE 52
-+#define EBADR 53
-+#define EXFULL 54
-+#define ENOANO 55
-+#define EBADRQC 56
-+#define EBADSLT 57
-+#define EDEADLOCK EDEADLK
-+#define EBFONT 59
-+#define ENOSTR 60
-+#define ENODATA 61
-+#define ETIME 62
-+#define ENOSR 63
-+#define ENONET 64
-+#define ENOPKG 65
-+#define EREMOTE 66
-+#define ENOLINK 67
-+#define EADV 68
-+#define ESRMNT 69
-+#define ECOMM 70
-+#define EPROTO 71
-+#define EMULTIHOP 72
-+#define EDOTDOT 73
-+#define EBADMSG 74
-+#define EOVERFLOW 75
-+#define ENOTUNIQ 76
-+#define EBADFD 77
-+#define EREMCHG 78
-+#define ELIBACC 79
-+#define ELIBBAD 80
-+#define ELIBSCN 81
-+#define ELIBMAX 82
-+#define ELIBEXEC 83
-+#define EILSEQ 84
-+#define ERESTART 85
-+#define ESTRPIPE 86
-+#define EUSERS 87
-+#define ENOTSOCK 88
-+#define EDESTADDRREQ 89
-+#define EMSGSIZE 90
-+#define EPROTOTYPE 91
-+#define ENOPROTOOPT 92
-+#define EPROTONOSUPPORT 93
-+#define ESOCKTNOSUPPORT 94
-+#define EOPNOTSUPP 95
-+#define ENOTSUP EOPNOTSUPP
-+#define EPFNOSUPPORT 96
-+#define EAFNOSUPPORT 97
-+#define EADDRINUSE 98
-+#define EADDRNOTAVAIL 99
-+#define ENETDOWN 100
-+#define ENETUNREACH 101
-+#define ENETRESET 102
-+#define ECONNABORTED 103
-+#define ECONNRESET 104
-+#define ENOBUFS 105
-+#define EISCONN 106
-+#define ENOTCONN 107
-+#define ESHUTDOWN 108
-+#define ETOOMANYREFS 109
-+#define ETIMEDOUT 110
-+#define ECONNREFUSED 111
-+#define EHOSTDOWN 112
-+#define EHOSTUNREACH 113
-+#define EALREADY 114
-+#define EINPROGRESS 115
-+#define ESTALE 116
-+#define EUCLEAN 117
-+#define ENOTNAM 118
-+#define ENAVAIL 119
-+#define EISNAM 120
-+#define EREMOTEIO 121
-+#define EDQUOT 122
-+#define ENOMEDIUM 123
-+#define EMEDIUMTYPE 124
-+#define ECANCELED 125
-+#define ENOKEY 126
-+#define EKEYEXPIRED 127
-+#define EKEYREVOKED 128
-+#define EKEYREJECTED 129
-+#define EOWNERDEAD 130
-+#define ENOTRECOVERABLE 131
-+#define ERFKILL 132
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,39 @@
-+#define O_CREAT 0100
-+#define O_EXCL 0200
-+#define O_NOCTTY 0400
-+#define O_TRUNC 01000
-+#define O_APPEND 02000
-+#define O_NONBLOCK 04000
-+#define O_DSYNC 010000
-+#define O_SYNC 04010000
-+#define O_RSYNC 04010000
-+#define O_DIRECTORY 0200000
-+#define O_NOFOLLOW 0400000
-+#define O_CLOEXEC 02000000
-+
-+#define O_ASYNC 020000
-+#define O_DIRECT 040000
-+#define O_LARGEFILE 0100000
-+#define O_NOATIME 01000000
-+#define O_TMPFILE 020200000
-+#define O_NDELAY O_NONBLOCK
-+
-+#define F_DUPFD 0
-+#define F_GETFD 1
-+#define F_SETFD 2
-+#define F_GETFL 3
-+#define F_SETFL 4
-+
-+#define F_SETOWN 8
-+#define F_GETOWN 9
-+#define F_SETSIG 10
-+#define F_GETSIG 11
-+
-+#define F_GETLK 12
-+#define F_SETLK 13
-+#define F_SETLKW 14
-+
-+#define F_SETOWN_EX 15
-+#define F_GETOWN_EX 16
-+
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,26 @@
-+#ifndef __SH_FPU_ANY__
-+
-+#define FE_ALL_EXCEPT 0
-+#define FE_TONEAREST 0
-+
-+#else
-+
-+#define FE_TONEAREST 0
-+#define FE_TOWARDZERO 1
-+
-+#define FE_INEXACT 0x04
-+#define FE_UNDERFLOW 0x08
-+#define FE_OVERFLOW 0x10
-+#define FE_DIVBYZERO 0x20
-+#define FE_INVALID 0x40
-+#define FE_ALL_EXCEPT 0x7c
-+
-+#endif
-+
-+typedef unsigned long fexcept_t;
-+
-+typedef struct {
-+ unsigned long __cw;
-+} fenv_t;
-+
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,17 @@
-+#define FLT_ROUNDS 1
-+#define FLT_EVAL_METHOD 0
-+
-+#define LDBL_TRUE_MIN 4.94065645841246544177e-324L
-+#define LDBL_MIN 2.22507385850720138309e-308L
-+#define LDBL_MAX 1.79769313486231570815e+308L
-+#define LDBL_EPSILON 2.22044604925031308085e-16L
-+
-+#define LDBL_MANT_DIG 53
-+#define LDBL_MIN_EXP (-1021)
-+#define LDBL_MAX_EXP 1024
-+
-+#define LDBL_DIG 15
-+#define LDBL_MIN_10_EXP (-307)
-+#define LDBL_MAX_10_EXP 308
-+
-+#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-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
-+#define _IOC_WRITE 1U
-+#define _IOC_READ 2U
-+
-+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-+
-+#define FIOCLEX _IO('f', 1)
-+#define FIONCLEX _IO('f', 2)
-+#define FIOASYNC _IOW('f', 125, int)
-+#define FIONBIO _IOW('f', 126, int)
-+#define FIONREAD _IOR('f', 127, int)
-+#define TIOCINQ FIONREAD
-+#define FIOQSIZE _IOR('f', 128, char[8])
-+
-+#define TCGETA _IOR('t', 23, char[18])
-+#define TCSETA _IOW('t', 24, char[18])
-+#define TCSETAW _IOW('t', 25, char[18])
-+#define TCSETAF _IOW('t', 28, char[18])
-+
-+#define TCSBRK _IO('t', 29)
-+#define TCXONC _IO('t', 30)
-+#define TCFLSH _IO('t', 31)
-+
-+#define TIOCSWINSZ _IOW('t', 103, char[8])
-+#define TIOCGWINSZ _IOR('t', 104, char[8])
-+#define TIOCSTART _IO('t', 110)
-+#define TIOCSTOP _IO('t', 111)
-+#define TIOCOUTQ _IOR('t', 115, int)
-+
-+#define TIOCSPGRP _IOW('t', 118, int)
-+#define TIOCGPGRP _IOR('t', 119, int)
-+
-+#define TIOCEXCL _IO('T', 12)
-+#define TIOCNXCL _IO('T', 13)
-+#define TIOCSCTTY _IO('T', 14)
-+
-+#define TIOCSTI _IOW('T', 18, char)
-+#define TIOCMGET _IOR('T', 21, unsigned int)
-+#define TIOCMBIS _IOW('T', 22, unsigned int)
-+#define TIOCMBIC _IOW('T', 23, unsigned int)
-+#define TIOCMSET _IOW('T', 24, unsigned int)
-+#define TIOCM_LE 0x001
-+#define TIOCM_DTR 0x002
-+#define TIOCM_RTS 0x004
-+#define TIOCM_ST 0x008
-+#define TIOCM_SR 0x010
-+#define TIOCM_CTS 0x020
-+#define TIOCM_CAR 0x040
-+#define TIOCM_RNG 0x080
-+#define TIOCM_DSR 0x100
-+#define TIOCM_CD TIOCM_CAR
-+#define TIOCM_RI TIOCM_RNG
-+#define TIOCM_OUT1 0x2000
-+#define TIOCM_OUT2 0x4000
-+#define TIOCM_LOOP 0x8000
-+
-+#define TIOCGSOFTCAR _IOR('T', 25, unsigned int)
-+#define TIOCSSOFTCAR _IOW('T', 26, unsigned int)
-+#define TIOCLINUX _IOW('T', 28, char)
-+#define TIOCCONS _IO('T', 29)
-+#define TIOCGSERIAL _IOR('T', 30, char[60])
-+#define TIOCSSERIAL _IOW('T', 31, char[60])
-+#define TIOCPKT _IOW('T', 32, int)
-+#define TIOCPKT_DATA 0
-+#define TIOCPKT_FLUSHREAD 1
-+#define TIOCPKT_FLUSHWRITE 2
-+#define TIOCPKT_STOP 4
-+#define TIOCPKT_START 8
-+#define TIOCPKT_NOSTOP 16
-+#define TIOCPKT_DOSTOP 32
-+#define TIOCPKT_IOCTL 64
-+
-+#define TIOCNOTTY _IO('T', 34)
-+#define TIOCSETD _IOW('T', 35, int)
-+#define TIOCGETD _IOR('T', 36, int)
-+#define TCSBRKP _IOW('T', 37, int)
-+#define TIOCSBRK _IO('T', 39)
-+#define TIOCCBRK _IO('T', 40)
-+#define TIOCGSID _IOR('T', 41, int)
-+#define TCGETS _IOR('T', 42, char[44])
-+#define TCSETS _IOW('T', 43, char[44])
-+#define TCSETSW _IOW('T', 44, char[44])
-+#define TCSETSF _IOW('T', 45, char[44])
-+#define TIOCGPTN _IOR('T', 48, unsigned int)
-+#define TIOCSPTLCK _IOW('T', 49, int)
-+#define TIOCGDEV _IOR('T', 50, unsigned int)
-+#define TIOCSIG _IOW('T', 54, int)
-+#define TIOCVHANGUP _IO('T', 55)
-+#define TIOCGPKT _IOR('T', 56, int)
-+#define TIOCGPTLCK _IOR('T', 57, int)
-+#define TIOCGEXCL _IOR('T', 64, int)
-+
-+#define TIOCSERCONFIG _IO('T', 83)
-+#define TIOCSERGWILD _IOR('T', 84, int)
-+#define TIOCSERSWILD _IOW('T', 85, int)
-+#define TIOCGLCKTRMIOS _IO('T', 86)
-+#define TIOCSLCKTRMIOS _IO('T', 87)
-+#define TIOCSERGSTRUCT _IOR('T', 88, char[216])
-+#define TIOCSERGETLSR _IOR('T', 89, unsigned int)
-+#define TIOCSER_TEMT 0x01
-+#define TIOCSERGETMULTI _IOR('T', 90, char[168])
-+#define TIOCSERSETMULTI _IOW('T', 91, char[168])
-+
-+#define TIOCMIWAIT _IO('T', 92)
-+#define TIOCGICOUNT _IO('T', 93)
-+
-+struct winsize {
-+ unsigned short ws_row;
-+ unsigned short ws_col;
-+ unsigned short ws_xpixel;
-+ unsigned short ws_ypixel;
-+};
-+
-+#define TIOCM_MODEM_BITS TIOCM_OUT2
-+
-+#define N_TTY 0
-+#define N_SLIP 1
-+#define N_MOUSE 2
-+#define N_PPP 3
-+#define N_STRIP 4
-+#define N_AX25 5
-+#define N_X25 6
-+#define N_6PACK 7
-+#define N_MASC 8
-+#define N_R3964 9
-+#define N_PROFIBUS_FDL 10
-+#define N_IRDA 11
-+#define N_SMSBLOCK 12
-+#define N_HDLC 13
-+#define N_SYNC_PPP 14
-+#define N_HCI 15
-+
-+#define FIOGETOWN _IOR('f', 123, int)
-+#define FIOSETOWN _IOW('f', 124, int)
-+
-+#define SIOCATMARK _IOR('s', 7, int)
-+#define SIOCSPGRP _IOW('s', 8, int)
-+#define SIOCGPGRP _IOW('s', 9, int)
-+#define SIOCGSTAMP _IOR('s', 100, char[8])
-+
-+#define SIOCADDRT 0x890B
-+#define SIOCDELRT 0x890C
-+#define SIOCRTMSG 0x890D
-+
-+#define SIOCGIFNAME 0x8910
-+#define SIOCSIFLINK 0x8911
-+#define SIOCGIFCONF 0x8912
-+#define SIOCGIFFLAGS 0x8913
-+#define SIOCSIFFLAGS 0x8914
-+#define SIOCGIFADDR 0x8915
-+#define SIOCSIFADDR 0x8916
-+#define SIOCGIFDSTADDR 0x8917
-+#define SIOCSIFDSTADDR 0x8918
-+#define SIOCGIFBRDADDR 0x8919
-+#define SIOCSIFBRDADDR 0x891a
-+#define SIOCGIFNETMASK 0x891b
-+#define SIOCSIFNETMASK 0x891c
-+#define SIOCGIFMETRIC 0x891d
-+#define SIOCSIFMETRIC 0x891e
-+#define SIOCGIFMEM 0x891f
-+#define SIOCSIFMEM 0x8920
-+#define SIOCGIFMTU 0x8921
-+#define SIOCSIFMTU 0x8922
-+#define SIOCSIFHWADDR 0x8924
-+#define SIOCGIFENCAP 0x8925
-+#define SIOCSIFENCAP 0x8926
-+#define SIOCGIFHWADDR 0x8927
-+#define SIOCGIFSLAVE 0x8929
-+#define SIOCSIFSLAVE 0x8930
-+#define SIOCADDMULTI 0x8931
-+#define SIOCDELMULTI 0x8932
-+#define SIOCGIFINDEX 0x8933
-+#define SIOGIFINDEX SIOCGIFINDEX
-+#define SIOCSIFPFLAGS 0x8934
-+#define SIOCGIFPFLAGS 0x8935
-+#define SIOCDIFADDR 0x8936
-+#define SIOCSIFHWBROADCAST 0x8937
-+#define SIOCGIFCOUNT 0x8938
-+
-+#define SIOCGIFBR 0x8940
-+#define SIOCSIFBR 0x8941
-+
-+#define SIOCGIFTXQLEN 0x8942
-+#define SIOCSIFTXQLEN 0x8943
-+
-+#define SIOCDARP 0x8953
-+#define SIOCGARP 0x8954
-+#define SIOCSARP 0x8955
-+
-+#define SIOCDRARP 0x8960
-+#define SIOCGRARP 0x8961
-+#define SIOCSRARP 0x8962
-+
-+#define SIOCGIFMAP 0x8970
-+#define SIOCSIFMAP 0x8971
-+
-+#define SIOCADDDLCI 0x8980
-+#define SIOCDELDLCI 0x8981
-+
-+#define SIOCDEVPRIVATE 0x89F0
-+#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-10 16:52:06.000000000 +0100
-@@ -0,0 +1,14 @@
-+struct ipc_perm
-+{
-+ key_t __ipc_perm_key;
-+ uid_t uid;
-+ gid_t gid;
-+ uid_t cuid;
-+ gid_t cgid;
-+ mode_t mode;
-+ int __ipc_perm_seq;
-+ long __pad1;
-+ long __pad2;
-+};
-+
-+#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-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)
-+#define PAGE_SIZE 4096
-+#define LONG_BIT 32
-+#endif
-+
-+#define LONG_MAX 0x7fffffffL
-+#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: