From a2ba45bfccc6f7523e4a9c2ed88a7ec79302a7d0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 18 Mar 2014 09:16:17 +0100
Subject: start getty/login when shell requested

---
 package/adk-test-tools/Makefile        | 2 +-
 package/adk-test-tools/files/test.init | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile
index 0a60c5056..c92f0b378 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adk-test-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init
index bb8fca527..bcff55c04 100755
--- a/package/adk-test-tools/files/test.init
+++ b/package/adk-test-tools/files/test.init
@@ -3,6 +3,11 @@
 #INIT 90
 [[ $1 = autostart ]] || exit 0
 echo "Starting test script ..."
+grep shell /proc/cmdline > /dev/null 2&>1
+if [ $? -eq 0 ];then
+	echo "Use user root and password linux123 to login. And quit to finish."
+	exit 0
+fi
 if [ -x /run.sh ];then
 	/run.sh
 	quit
-- 
cgit v1.2.3


From 5618dc67c9b25d9eea4fad7294dda30375a66e41 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 19 Mar 2014 22:02:30 +0100
Subject: fixes for aranym

---
 target/config/Config.in        | 1 -
 target/m68k/kernel/aranym-m68k | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/target/config/Config.in b/target/config/Config.in
index 38004d7e3..75f41c0ca 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -736,7 +736,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	depends on !ADK_HARDWARE_VBOX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_KERNEL_BLK_DEV_INITRD
-	select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K
 	help
 	  create an read-only initramfs system.
 
diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k
index 93bf0022f..13757da5c 100644
--- a/target/m68k/kernel/aranym-m68k
+++ b/target/m68k/kernel/aranym-m68k
@@ -4,12 +4,7 @@ CONFIG_M68KCLASSIC=y
 CONFIG_M68040=y
 CONFIG_FPU=y
 CONFIG_ATARI=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_NET_CADENCE=y
+CONFIG_NFETH=y
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-- 
cgit v1.2.3


From 6f0464e8edacdd4d63da7ce556494c0c12520582 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 08:33:58 +0100
Subject: use system zlib

---
 toolchain/gcc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 98e150f7a..f0096d453 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -28,7 +28,7 @@ GCC_CONFOPTS:=		--prefix=$(TOOLCHAIN_DIR)/usr \
 			--disable-libstdcxx-pch \
 			--disable-ppl-version-check \
 			--disable-cloog-version-check \
-			--without-system-zlib \
+			--with-system-zlib \
 			--without-ppl \
 			--without-cloog \
 			--without-isl \
-- 
cgit v1.2.3


From 87ce0b70bf1d76cbeed5d152ecec7d88ec84a103 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 11:55:53 +0100
Subject: fix python2 host build

---
 mk/host-bottom.mk        |  9 +++++----
 package/python2/Makefile | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 43a622c0f..8ef4a868e 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -3,6 +3,7 @@
 
 host-extract: ${_HOST_PATCH_COOKIE}
 
+hostpre-configure:
 host-configure:
 ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE}
 	@mkdir -p ${WRKBUILD}
@@ -25,6 +26,7 @@ endif
 			${CP} ${SCRIPT_DIR}/config.guess $$i; \
 	        fi; \
 	    done;
+	@${MAKE} hostpre-configure $(MAKE_TRACE)
 ifneq (${HOST_STYLE},manual)
 ifeq ($(strip ${HOST_STYLE}),)
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
@@ -75,8 +77,7 @@ endif
 	touch $@
 
 hostpost-install:
-hpkg-install: ${ALL_HOSTINST}
-host-install:
+host-install: ${ALL_HOSTINST}
 ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
 	@$(CMD_TRACE) "host installing... "
 	@mkdir -p ${HOST_WRKINST}
@@ -84,13 +85,13 @@ ifneq (${HOST_STYLE},manual)
 ifeq ($(strip ${HOST_STYLE}),)
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	    DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
-	env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE)
+	env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
 else
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	    DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 endif
 else
-	env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE)
+	env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
 endif
 	env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE)
 	@touch $@
diff --git a/package/python2/Makefile b/package/python2/Makefile
index fe284da9d..b5aac2032 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		11
+PKG_RELEASE:=		12
 PKG_MD5SUM:=		b4f01a1d0ba0b46b05c73b2ac909b1df
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		autotool libffi bzip2-host python2-host 
+PKG_BUILDDEP:=		libffi python2-host 
+HOST_BUILDDEP:=		libffi-host bzip2-host autotool
 PKG_DEPENDS:=		libpthread libffi libgcc
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
@@ -96,18 +97,20 @@ CONFIGURE_ARGS:=	--with-threads \
 			--without-cxx-main
 
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS:=	--with-threads \
+HOST_CONFIGURE_ARGS+=	--with-threads \
 			--disable-ipv6 \
 			--disable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main
 CFLAGS_FOR_BUILD+=	-fPIC
 
-post-extract:
+hostpre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
-	(cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
+	(cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py)	
+	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
+		$(WRKBUILD)/Misc/python-config.in
 
 hostpost-install:
 	$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
@@ -119,6 +122,10 @@ hostpost-install:
 		patch -p0 < $(WRKBUILD)/python-config.patch)
 
 pre-configure:
+	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
+	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+	(cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
 
-- 
cgit v1.2.3


From 18331f23e50bc65e9f3c2f215d3a26dd8c79a561 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 11:56:04 +0100
Subject: udpate to latest upstream version

---
 package/gnutls/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index b160c1d5f..c75f02ea9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		3.2.9
+PKG_VERSION:=		3.2.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9ae2bfa55d4c12dd6005cfb7014977f9
+PKG_MD5SUM:=		f507365940de8f095e1d867c6f0842f6
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib libnettle libgmp
@@ -45,7 +45,6 @@ ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
 CONFIGURE_ARGS+= 	--enable-cryptodev
 endif
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_LDFLAGS+=	-pthread
 CONFIGURE_ARGS+=	--disable-rpath \
 			--without-libz-prefix \
-- 
cgit v1.2.3


From 6404d9a23730e33aadd2091e92657ed5089f6781 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 12:42:02 +0100
Subject: fix include path

---
 package/gcc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index c0c5f749a..76e58d954 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CPPFLAGS_FOR_BUILD:=	-I$(STAGING_HOST_DIR)/include
+CPPFLAGS_FOR_BUILD:=	-I$(STAGING_HOST_DIR)/usr/include
 CFLAGS_FOR_BUILD:=
 LDFLAGS_FOR_BUILD:=
 TARGET_CPPFLAGS:=
-- 
cgit v1.2.3


From 4058a9092df3b280e1330c1b6c35637eb967a1c1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 13:44:58 +0100
Subject: udpate to latest upstream version, remove gnutls flavour

---
 package/dovecot/Makefile                | 30 +++++++++---------------------
 package/dovecot/patches/patch-ltmain_sh | 11 -----------
 2 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 package/dovecot/patches/patch-ltmain_sh

diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 624d47672..0fd736e4d 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -4,21 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dovecot
-PKG_VERSION:=		2.0.5
+PKG_VERSION:=		2.2.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7168c5bf40fdd38cceb99114547699b8
-PKG_DESCR:=		A minimal and secure imap server
+PKG_MD5SUM:=		25395269fa2e0525e2d144d71d0450eb
+PKG_DESCR:=		minimal and secure imap server
+PKG_BUILDDEP:=		openssl
+PKG_DEPENDS:=		libopenssl
 PKG_SECTION:=		mail
 PKG_URL:=		http://www.dovecot.org/
-PKG_SITES:=		http://www.dovecot.org/releases/2.0/
-
-PKG_CHOICES_DOVECOT:=	WITH_GNUTLS WITH_OPENSSL
-PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
-PKGCS_WITH_OPENSSL:=	libopenssl
-PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
-PKGCS_WITH_GNUTLS:=	libgnutls
-PKGCB_WITH_GNUTLS:=	gnutls
+PKG_SITES:=		http://www.dovecot.org/releases/2.2/
 
 include ${TOPDIR}/mk/package.mk
 
@@ -45,16 +39,10 @@ CONFIGURE_ARGS+=	--with-notify=none \
 			--without-gssapi \
 			--without-pam \
 			--with-ioloop=epoll \
-                	--with-moduledir=/usr/lib/dovecot/modules
-
-ifeq (${ADK_PACKAGE_DOVECOT_WITH_GNUTLS},y)
-CONFIGURE_ARGS+=	--with-ssl=gnutls
-endif
-ifeq (${ADK_PACKAGE_DOVECOT_WITH_OPENSSL},y)
-CONFIGURE_ARGS+=	--with-ssl=openssl
-endif
+                	--with-moduledir=/usr/lib/dovecot/modules \
+			--with-ssl=openssl
 
-post-install:
+dovecot-install:
 	${INSTALL_DIR} ${IDIR_DOVECOT}/etc
 	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin
 	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/libexec/dovecot
diff --git a/package/dovecot/patches/patch-ltmain_sh b/package/dovecot/patches/patch-ltmain_sh
deleted file mode 100644
index 8c7c6bc7d..000000000
--- a/package/dovecot/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- dovecot-2.0.5.orig/ltmain.sh	2010-05-24 16:48:06.000000000 +0200
-+++ dovecot-2.0.5/ltmain.sh	2011-01-14 22:05:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-- 
cgit v1.2.3


From ad3bd9a98cddb728aef34eadd10b533c63bd474a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:04:17 +0100
Subject: create symlinks for usr/lib, too

---
 mk/build.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mk/build.mk b/mk/build.mk
index 4cdccd8fd..41d482272 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -172,6 +172,7 @@ ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
 		${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include}
 	for i in lib64 lib32 libx32;do \
 		cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \
+		cd ${STAGING_TARGET_DIR}/usr; ln -sf lib $$i; \
 	done
 
 ${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
-- 
cgit v1.2.3


From 64c3768a17e93e4788106d49e42e96f5c7a33450 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:04:27 +0100
Subject: need to remove any libiberty.a from toolchain build

---
 package/binutils/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 5734e198d..1a6014607 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -39,8 +39,8 @@ CONFIGURE_ARGS+=	--disable-werror \
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-post-build:
-	$(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib
+pre-build:
+	@-rm $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
 
 libbfd-install:
 	${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib
-- 
cgit v1.2.3


From 676259549621ff73676d0cda40371594da4ea079 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:06:02 +0100
Subject: add some aranym fine tuning

---
 .gitignore                      | 1 +
 target/config/Config.in.runtime | 3 ++-
 target/m68k/Makefile            | 8 ++++++++
 target/m68k/kernel/aranym-m68k  | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 55f82fdd7..b2a8d1a21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /target/config/Config.in.system
 /target/config/Config.in.native
 /target/config/Config.in.arch
+/target/m68k/aranym.cfg
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 721f623de..7acdd26ed 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -59,6 +59,7 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 	help
           Start getty on VGA console. (tty1-tty6)
@@ -69,6 +70,7 @@ config ADK_RUNTIME_GETTY_SERIAL
 	default n if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n if ADK_TARGET_SYSTEM_IBM_X40
+	default n if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y
 	help
 	  Start getty on serial console.
@@ -80,7 +82,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I
-	default "nfcon0" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ttyS0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
diff --git a/target/m68k/Makefile b/target/m68k/Makefile
index 0e7324c25..78206042c 100644
--- a/target/m68k/Makefile
+++ b/target/m68k/Makefile
@@ -26,6 +26,14 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
+	@sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \
+	    -e "s#@@INITRAMFS@@#${FW_DIR}/${INITRAMFS}#" \
+		$(TOPDIR)/target/m68k/aranym.cfg.in \
+		> $(TOPDIR)/target/m68k/aranym.cfg
+	@echo 'Start aranym with: aranym-mmu -l -c target/m68k/aranym.cfg'
+	@echo 'Ungrab mouse with middle mouse click'
+endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: createinitramfs
diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k
index 13757da5c..ac513fdc6 100644
--- a/target/m68k/kernel/aranym-m68k
+++ b/target/m68k/kernel/aranym-m68k
@@ -4,6 +4,7 @@ CONFIG_M68KCLASSIC=y
 CONFIG_M68040=y
 CONFIG_FPU=y
 CONFIG_ATARI=y
+CONFIG_NATFEAT=y
 CONFIG_NFETH=y
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
-- 
cgit v1.2.3


From 7f1edcf1ad7c4d291a3e8230132b7afcaef88424 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:06:28 +0100
Subject: add example config for aranym

---
 target/m68k/aranym.cfg.in | 195 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 target/m68k/aranym.cfg.in

diff --git a/target/m68k/aranym.cfg.in b/target/m68k/aranym.cfg.in
new file mode 100644
index 000000000..a2fd30170
--- /dev/null
+++ b/target/m68k/aranym.cfg.in
@@ -0,0 +1,195 @@
+[GLOBAL]
+FastRAM = 32
+Floppy = 
+TOS = ROM
+EmuTOS = etos512k.img
+Bootstrap = mintara.prg
+BootstrapArgs = 
+BootDrive =  
+GMTime = No
+
+[STARTUP]
+GrabMouse = No
+Debugger = No
+
+[IKBD]
+WheelEiffel = No
+AltGr = Yes
+
+[HOTKEYS]
+Setup = 19:0
+Quit = 19:0x1
+Reboot = 19:0x40
+Ungrab = 27:0x141
+Debug = 19:0x100
+Screenshot = 316:0
+Fullscreen = 302:0
+
+[JIT]
+JIT = Yes
+JITFPU = Yes
+JITCacheSize = 8192
+JITLazyFlush = 1
+JITBlackList = 
+JITInline = No
+
+[VIDEO]
+FullScreen = No
+BootColorDepth = -1
+VidelRefresh = 2
+VidelMonitor = -1
+SingleBlitComposing = No
+SingleBlitRefresh = No
+
+[TOS]
+Cookie_MCH = 50000
+RedirConsole = No
+
+[IDE0]
+Present = No
+IsCDROM = No
+ByteSwap = No
+ReadOnly = No
+Path = 
+Cylinders = 0
+Heads = 0
+SectorsPerTrack = 0
+ModelName = Master
+
+[IDE1]
+Present = No
+IsCDROM = No
+ByteSwap = No
+ReadOnly = No
+Path = 
+Cylinders = 0
+Heads = 0
+SectorsPerTrack = 0
+ModelName = Slave
+
+[PARTITION0]
+Path = 
+Present = No
+PartID = BGM
+ByteSwap = No
+ReadOnly = No
+
+[HOSTFS]
+A = 
+B = 
+C = 
+D = 
+E = 
+F = 
+G = 
+H = 
+I = 
+J = 
+K = 
+L = 
+M = 
+N = 
+O = 
+P = 
+Q = 
+R = 
+S = 
+T = 
+U = 
+V = 
+W = 
+X = 
+Y = 
+Z = 
+
+[OPENGL]
+Enabled = No
+Filtered = No
+Library = 
+
+[ETH0]
+Type = bridge
+Tunnel = tap0
+HostIP = 172.24.30.12
+AtariIP = 172.24.42.46
+Netmask = 255.255.0.0
+MAC = 00:41:45:54:48:30
+
+[LILO]
+Kernel = @@KERNEL@@
+Args = console=tty debug=par 
+Ramdisk = @@INITRAMFS@@
+
+[MIDI]
+Type = none
+File = 
+Sequencer = /dev/sequencer
+
+[CDROMS]
+A = -1
+B = -1
+C = -1
+D = -1
+E = -1
+F = -1
+G = -1
+H = -1
+I = -1
+J = -1
+K = -1
+L = -1
+M = -1
+N = -1
+O = -1
+P = -1
+Q = -1
+R = -1
+S = -1
+T = -1
+U = -1
+V = -1
+W = -1
+X = -1
+Y = -1
+Z = -1
+
+[AUTOZOOM]
+Enabled = No
+IntegerCoefs = No
+FixedSize = No
+Width = 640
+Height = 480
+
+[NFOSMESA]
+ChannelSize = 0
+LibGL = libGL.so
+LibOSMesa = libOSMesa.so
+
+[PARALLEL]
+Type = file
+File = stderr
+Parport = /dev/parport0
+
+[SERIAL]
+Serport = /dev/ttyS0
+
+[NATFEATS]
+CDROM = sdl
+Vdi = soft
+
+[NFVDI]
+UseHostMouseCursor = No
+
+[AUDIO]
+Frequency = 22050
+Channels = 2
+Bits = 16
+Samples = 1024
+
+[JOYSTICKS]
+Ikbd0 = -1
+Ikbd1 = 0
+JoypadA = -1
+JoypadAButtons = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+JoypadB = -1
+JoypadBButtons = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
-- 
cgit v1.2.3


From 094cc8184b8bbfe02fa05c34d4c83d036161eb4c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:12:08 +0100
Subject: DEVICE must be substituted more than once in the line

---
 package/base-files/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0dee1aa94..7c0a7f1a7 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		74
+PKG_RELEASE:=		75
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
@@ -61,7 +61,7 @@ endif
 	    cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_GETTY_SERIAL) || \
 	    cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab
-	$(SED) 's#@DEVICE@#$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)#' $(IDIR_BASE_FILES)/etc/inittab
+	$(SED) 's#@DEVICE@#$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)#g' $(IDIR_BASE_FILES)/etc/inittab
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
-- 
cgit v1.2.3


From 3a22b41909e8810e589cf03c73dbaa788bb5ce8a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 16:12:25 +0100
Subject: update musl to 1.0.0

---
 toolchain/musl/Makefile                        |    6 -
 toolchain/musl/Makefile.inc                    |    5 +-
 toolchain/musl/patches/musl-git-20140319.patch | 8864 ------------------------
 3 files changed, 2 insertions(+), 8873 deletions(-)
 delete mode 100644 toolchain/musl/patches/musl-git-20140319.patch

diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index f13a2613d..6701c502a 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -9,12 +9,6 @@ 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)' \
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-20140319.patch b/toolchain/musl/patches/musl-git-20140319.patch
deleted file mode 100644
index f319d904a..000000000
--- a/toolchain/musl/patches/musl-git-20140319.patch
+++ /dev/null
@@ -1,8864 +0,0 @@
-diff -Nur musl-0.9.15/arch/arm/bits/sem.h musl-git/arch/arm/bits/sem.h
---- musl-0.9.15/arch/arm/bits/sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/arm/bits/sem.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,16 @@
-+struct semid_ds {
-+	struct ipc_perm sem_perm;
-+	time_t sem_otime;
-+	time_t __unused1;
-+	time_t sem_ctime;
-+	time_t __unused2;
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+	unsigned short sem_nsems;
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+#else
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+	unsigned short sem_nsems;
-+#endif
-+	time_t __unused3;
-+	time_t __unused4;
-+};
-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-19 07:42:48.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/signal.h musl-git/arch/arm/bits/signal.h
---- musl-0.9.15/arch/arm/bits/signal.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/bits/signal.h	2014-03-19 07:42:48.000000000 +0100
-@@ -18,6 +18,12 @@
- } mcontext_t;
- #endif
- 
-+struct sigaltstack {
-+	void *ss_sp;
-+	int ss_flags;
-+	size_t ss_size;
-+};
-+
- typedef struct __ucontext {
- 	unsigned long uc_flags;
- 	struct __ucontext *uc_link;
-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-19 07:42:48.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-19 07:42:48.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/sem.h musl-git/arch/i386/bits/sem.h
---- musl-0.9.15/arch/i386/bits/sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/i386/bits/sem.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,16 @@
-+struct semid_ds {
-+	struct ipc_perm sem_perm;
-+	time_t sem_otime;
-+	time_t __unused1;
-+	time_t sem_ctime;
-+	time_t __unused2;
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+	unsigned short sem_nsems;
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+#else
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+	unsigned short sem_nsems;
-+#endif
-+	time_t __unused3;
-+	time_t __unused4;
-+};
-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-19 07:42:48.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/signal.h musl-git/arch/i386/bits/signal.h
---- musl-0.9.15/arch/i386/bits/signal.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/i386/bits/signal.h	2014-03-19 07:42:48.000000000 +0100
-@@ -53,6 +53,12 @@
- } mcontext_t;
- #endif
- 
-+struct sigaltstack {
-+	void *ss_sp;
-+	int ss_flags;
-+	size_t ss_size;
-+};
-+
- typedef struct __ucontext {
- 	unsigned long uc_flags;
- 	struct __ucontext *uc_link;
-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-19 07:42:48.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/sem.h musl-git/arch/microblaze/bits/sem.h
---- musl-0.9.15/arch/microblaze/bits/sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/microblaze/bits/sem.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,16 @@
-+struct semid_ds {
-+	struct ipc_perm sem_perm;
-+	time_t sem_otime;
-+	time_t __unused1;
-+	time_t sem_ctime;
-+	time_t __unused2;
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+	unsigned short sem_nsems;
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+#else
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+	unsigned short sem_nsems;
-+#endif
-+	time_t __unused3;
-+	time_t __unused4;
-+};
-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-19 07:42:48.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/signal.h musl-git/arch/microblaze/bits/signal.h
---- musl-0.9.15/arch/microblaze/bits/signal.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/bits/signal.h	2014-03-19 07:42:48.000000000 +0100
-@@ -21,6 +21,12 @@
- } mcontext_t;
- #endif
- 
-+struct sigaltstack {
-+	void *ss_sp;
-+	int ss_flags;
-+	size_t ss_size;
-+};
-+
- typedef struct __ucontext {
- 	unsigned long uc_flags;
- 	struct __ucontext *uc_link;
-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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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/sem.h musl-git/arch/mips/bits/sem.h
---- musl-0.9.15/arch/mips/bits/sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/mips/bits/sem.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,14 @@
-+struct semid_ds {
-+	struct ipc_perm sem_perm;
-+	time_t sem_otime;
-+	time_t sem_ctime;
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+	unsigned short sem_nsems;
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+#else
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+	unsigned short sem_nsems;
-+#endif
-+	time_t __unused3;
-+	time_t __unused4;
-+};
-diff -Nur musl-0.9.15/arch/mips/bits/setjmp.h musl-git/arch/mips/bits/setjmp.h
---- musl-0.9.15/arch/mips/bits/setjmp.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/setjmp.h	2014-03-19 07:42:48.000000000 +0100
-@@ -1 +1 @@
--typedef unsigned long long __jmp_buf[15];
-+typedef unsigned long long __jmp_buf[13];
-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-19 07:42:48.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/signal.h musl-git/arch/mips/bits/signal.h
---- musl-0.9.15/arch/mips/bits/signal.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/signal.h	2014-03-19 07:42:48.000000000 +0100
-@@ -38,13 +38,18 @@
- } mcontext_t;
- #endif
- 
-+struct sigaltstack {
-+	void *ss_sp;
-+	size_t ss_size;
-+	int ss_flags;
-+};
-+
- typedef struct __ucontext {
- 	unsigned long uc_flags;
- 	struct __ucontext *uc_link;
- 	stack_t uc_stack;
- 	mcontext_t uc_mcontext;
- 	sigset_t uc_sigmask;
--	unsigned long uc_regspace[128];
- } ucontext_t;
- 
- #define SA_NOCLDSTOP  1
-diff -Nur musl-0.9.15/arch/mips/bits/statfs.h musl-git/arch/mips/bits/statfs.h
---- musl-0.9.15/arch/mips/bits/statfs.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/statfs.h	2014-03-19 07:42:48.000000000 +0100
-@@ -1,7 +1,8 @@
- struct statfs {
--	unsigned long f_type, f_bsize;
--	fsblkcnt_t f_blocks, f_bfree, f_bavail;
-+	unsigned long f_type, f_bsize, f_frsize;
-+	fsblkcnt_t f_blocks, f_bfree;
- 	fsfilcnt_t f_files, f_ffree;
-+	fsblkcnt_t f_bavail;
- 	fsid_t f_fsid;
--	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
-+	unsigned long f_namelen, f_flags, f_spare[5];
- };
-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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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/ipc.h musl-git/arch/powerpc/bits/ipc.h
---- musl-0.9.15/arch/powerpc/bits/ipc.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/ipc.h	2014-03-19 07:42:48.000000000 +0100
-@@ -7,8 +7,9 @@
- 	gid_t cgid;
- 	mode_t mode;
- 	int __ipc_perm_seq;
--	long __pad1;
--	long __pad2;
-+	int __pad1;
-+	long long __pad2;
-+	long long __pad3;
- };
- 
- #define IPC_64 0x100
-diff -Nur musl-0.9.15/arch/powerpc/bits/msg.h musl-git/arch/powerpc/bits/msg.h
---- musl-0.9.15/arch/powerpc/bits/msg.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/msg.h	2014-03-19 07:42:48.000000000 +0100
-@@ -1,12 +1,12 @@
- struct msqid_ds
- {
- 	struct ipc_perm msg_perm;
--	time_t msg_stime;
- 	int __unused1;
--	time_t msg_rtime;
-+	time_t msg_stime;
- 	int __unused2;
--	time_t msg_ctime;
-+	time_t msg_rtime;
- 	int __unused3;
-+	time_t msg_ctime;
- 	unsigned long msg_cbytes;
- 	msgqnum_t msg_qnum;
- 	msglen_t msg_qbytes;
-diff -Nur musl-0.9.15/arch/powerpc/bits/sem.h musl-git/arch/powerpc/bits/sem.h
---- musl-0.9.15/arch/powerpc/bits/sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/powerpc/bits/sem.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,10 @@
-+struct semid_ds {
-+	struct ipc_perm sem_perm;
-+	int __unused1;
-+	time_t sem_otime;
-+	int  __unused2;
-+	time_t sem_ctime;
-+	unsigned short __sem_nsems_pad, sem_nsems;
-+	long __unused3;
-+	long __unused4;
-+};
-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-19 07:42:48.000000000 +0100
-@@ -3,16 +3,28 @@
- struct shmid_ds
- {
- 	struct ipc_perm shm_perm;
--	size_t shm_segsz;
--	time_t shm_atime;
- 	int __unused1;
--	time_t shm_dtime;
-+	time_t shm_atime;
- 	int __unused2;
--	time_t shm_ctime;
-+	time_t shm_dtime;
- 	int __unused3;
-+	time_t shm_ctime;
-+	int __unused4;
-+	size_t shm_segsz;
- 	pid_t shm_cpid;
- 	pid_t shm_lpid;
- 	unsigned long shm_nattch;
- 	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/signal.h musl-git/arch/powerpc/bits/signal.h
---- musl-0.9.15/arch/powerpc/bits/signal.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/signal.h	2014-03-19 07:42:48.000000000 +0100
-@@ -49,6 +49,12 @@
- 
- #endif
- 
-+struct sigaltstack {
-+	void *ss_sp;
-+	int ss_flags;
-+	size_t ss_size;
-+};
-+
- typedef struct __ucontext {
- 	unsigned long uc_flags;
- 	struct __ucontext *uc_link;
-diff -Nur musl-0.9.15/arch/powerpc/bits/socket.h musl-git/arch/powerpc/bits/socket.h
---- musl-0.9.15/arch/powerpc/bits/socket.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/socket.h	2014-03-19 07:42:48.000000000 +0100
-@@ -1,12 +1,12 @@
- struct msghdr
- {
- 	void *msg_name;
--	int msg_namelen;
-+	socklen_t msg_namelen;
- 	struct iovec *msg_iov;
--	unsigned long msg_iovlen;
-+	int msg_iovlen;
- 	void *msg_control;
--	unsigned long  msg_controllen;
--	unsigned msg_flags;
-+	socklen_t msg_controllen;
-+	int msg_flags;
- };
- 
- struct cmsghdr
-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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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-19 07:42:48.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:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/mman.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,62 @@
-+#define MAP_FAILED ((void *) -1)
-+
-+#define	PROT_NONE      0
-+#define	PROT_READ      1
-+#define	PROT_WRITE     2
-+#define	PROT_EXEC      4
-+#define	PROT_GROWSDOWN 0x01000000
-+#define	PROT_GROWSUP   0x02000000
-+
-+#define	MAP_SHARED     0x01
-+#define	MAP_PRIVATE    0x02
-+#define	MAP_FIXED      0x10
-+
-+#define MAP_TYPE       0x0f
-+#define MAP_FILE       0x00
-+#define MAP_ANON       0x20
-+#define MAP_ANONYMOUS  MAP_ANON
-+#define MAP_32BIT      0x40
-+#define MAP_NORESERVE  0x4000
-+#define MAP_GROWSDOWN  0x0100
-+#define MAP_DENYWRITE  0x0800
-+#define MAP_EXECUTABLE 0x1000
-+#define MAP_LOCKED     0x2000
-+#define MAP_POPULATE   0x8000
-+#define MAP_NONBLOCK   0x10000
-+#define MAP_STACK      0x20000
-+#define MAP_HUGETLB    0x40000
-+
-+#define POSIX_MADV_NORMAL       0
-+#define POSIX_MADV_RANDOM       1
-+#define POSIX_MADV_SEQUENTIAL   2
-+#define POSIX_MADV_WILLNEED     3
-+#define POSIX_MADV_DONTNEED     4
-+
-+#define MS_ASYNC        1
-+#define MS_INVALIDATE   2
-+#define MS_SYNC         4
-+
-+#define MCL_CURRENT     1
-+#define MCL_FUTURE      2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define MADV_NORMAL      0
-+#define MADV_RANDOM      1
-+#define MADV_SEQUENTIAL  2
-+#define MADV_WILLNEED    3
-+#define MADV_DONTNEED    4
-+#define MADV_REMOVE      9
-+#define MADV_DONTFORK    10
-+#define MADV_DOFORK      11
-+#define MADV_MERGEABLE   12
-+#define MADV_UNMERGEABLE 13
-+#define MADV_HUGEPAGE    14
-+#define MADV_NOHUGEPAGE  15
-+#define MADV_DONTDUMP    16
-+#define MADV_DODUMP      17
-+#define MADV_HWPOISON    100
-+#define MADV_SOFT_OFFLINE 101
-+
-+#define MREMAP_MAYMOVE  1
-+#define MREMAP_FIXED    2
-+#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-19 07:42:48.000000000 +0100
-@@ -0,0 +1,16 @@
-+struct msqid_ds
-+{
-+	struct ipc_perm msg_perm;
-+	time_t msg_stime;
-+	int __unused1;
-+	time_t msg_rtime;
-+	int __unused2;
-+	time_t msg_ctime;
-+	int __unused3;
-+	unsigned long msg_cbytes;
-+	msgqnum_t msg_qnum;
-+	msglen_t msg_qbytes;
-+	pid_t msg_lspid;
-+	pid_t msg_lrpid;
-+	unsigned long __unused[2];
-+};
-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-19 07:42:48.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/sem.h musl-git/arch/sh/bits/sem.h
---- musl-0.9.15/arch/sh/bits/sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/sem.h	2014-03-19 07:42:48.000000000 +0100
-@@ -0,0 +1,16 @@
-+struct semid_ds {
-+	struct ipc_perm sem_perm;
-+	time_t sem_otime;
-+	time_t __unused1;
-+	time_t sem_ctime;
-+	time_t __unused2;
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+	unsigned short sem_nsems;
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+#else
-+	char __sem_nsems_pad[sizeof(time_t)-sizeof(short)];
-+	unsigned short sem_n