summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk5
-rw-r--r--mk/modules.mk2
-rw-r--r--package/MesaLib/patches/patch-bin_mklib8
-rw-r--r--package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h45
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_imports_h13
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_querymatrix_c11
-rw-r--r--package/libxml2/Makefile1
-rw-r--r--package/php/files/php.ini6
-rw-r--r--package/uclibc++/Makefile2
-rw-r--r--package/uclibc++/patches/patch-include_unwind-cxx_h21
-rw-r--r--package/xbmc/Makefile4
-rw-r--r--target/linux/patches/3.9.11/arm-spitz.patch27
-rw-r--r--toolchain/binutils/patches/2.23.2/arm-whitespace.patch23
-rw-r--r--toolchain/musl/Makefile.inc4
-rw-r--r--toolchain/musl/patches/0.9.13/musl-git.patch8837
15 files changed, 158 insertions, 8851 deletions
diff --git a/mk/build.mk b/mk/build.mk
index e69821db0..d6e21fa85 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -32,6 +32,7 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PACKAGE_PACEMAKER_MGMTD=n \
ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
ADK_PACKAGE_OPENJDK=n \
+ ADK_PACKAGE_OPENJDK7=n \
ADK_PACKAGE_CLASSPATH=n \
ADK_PACKAGE_GPSD=n \
ADK_PACKAGE_GPSD_CLIENTS=n \
@@ -590,7 +591,7 @@ bulk:
done
bulkall:
- for libc in uclibc eglibc glibc;do \
+ for libc in uclibc eglibc glibc musl;do \
while read arch; do \
systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
for system in $$systems;do \
@@ -608,7 +609,7 @@ bulkall:
done
bulkallmod:
- for libc in uclibc eglibc glibc;do \
+ for libc in uclibc eglibc glibc musl;do \
while read arch; do \
systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
for system in $$systems;do \
diff --git a/mk/modules.mk b/mk/modules.mk
index ca1bf178c..5722d9800 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1204,7 +1204,7 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
#,65))
$(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
- $(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \
+ $(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \
,70))
$(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib
index 2f53c152c..a361c1105 100644
--- a/package/MesaLib/patches/patch-bin_mklib
+++ b/package/MesaLib/patches/patch-bin_mklib
@@ -1,7 +1,7 @@
diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
--- Mesa-8.0.5.orig/bin/mklib 2012-10-24 21:03:58.000000000 +0200
-+++ Mesa-8.0.5/bin/mklib 2013-04-30 13:06:28.000000000 +0200
-@@ -333,12 +333,6 @@
++++ Mesa-8.0.5/bin/mklib 2013-09-19 11:59:49.000000000 +0200
+@@ -333,12 +333,6 @@ case $ARCH in
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
@@ -14,7 +14,7 @@ diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
-@@ -392,12 +386,6 @@
+@@ -392,12 +386,6 @@ case $ARCH in
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
@@ -27,7 +27,7 @@ diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
fi
-@@ -466,12 +454,6 @@
+@@ -466,12 +454,6 @@ case $ARCH in
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
new file mode 100644
index 000000000..5726c5c91
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
@@ -0,0 +1,45 @@
+--- Mesa-8.0.5.orig/src/gallium/include/pipe/p_config.h 2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/include/pipe/p_config.h 2013-09-19 12:27:54.000000000 +0200
+@@ -111,7 +111,6 @@
+ * Endian detection.
+ */
+
+-#ifdef __GLIBC__
+ #include <endian.h>
+
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+@@ -120,34 +119,6 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+
+-#elif defined(__APPLE__)
+-#include <machine/endian.h>
+-
+-#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
+-# define PIPE_ARCH_LITTLE_ENDIAN
+-#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
+-# define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#elif defined(__sun)
+-#include <sys/isa_defs.h>
+-
+-#if defined(_LITTLE_ENDIAN)
+-# define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(_BIG_ENDIAN)
+-# define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#else
+-
+-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
+-#define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64)
+-#define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#endif
+-
+ #if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN)
+ #error Unknown Endianness
+ #endif
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_h b/package/MesaLib/patches/patch-src_mesa_main_imports_h
new file mode 100644
index 000000000..43896c847
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_h
@@ -0,0 +1,13 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.h 2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.h 2013-09-19 12:39:53.000000000 +0200
+@@ -568,10 +568,8 @@ _mesa_init_sqrt_table(void);
+
+ #ifdef __GNUC__
+
+-#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID) || defined(__APPLE__)
+ #define ffs __builtin_ffs
+ #define ffsll __builtin_ffsll
+-#endif
+
+ #define _mesa_ffs(i) ffs(i)
+ #define _mesa_ffsll(i) ffsll(i)
diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
new file mode 100644
index 000000000..f178bfef0
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
@@ -0,0 +1,11 @@
+--- Mesa-8.0.5.orig/src/mesa/main/querymatrix.c 2012-03-30 18:19:03.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/querymatrix.c 2013-09-19 12:19:01.000000000 +0200
+@@ -70,7 +70,7 @@ fpclassify(double x)
+ }
+ }
+
+-#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
++#elif defined(fpclassify) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
+ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
+ (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
+ (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__)
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index d8b994ab1..2ecd71dd5 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -30,6 +30,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE
include $(TOPDIR)/mk/python.mk
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+= -lpthread
ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),)
CONFIGURE_ARGS+= --with-python=${STAGING_DIR}/usr
else
diff --git a/package/php/files/php.ini b/package/php/files/php.ini
index 903bb432e..c9b395ac1 100644
--- a/package/php/files/php.ini
+++ b/package/php/files/php.ini
@@ -106,7 +106,7 @@ error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
; instead (see below). Keeping display_errors enabled on a production web site
; may reveal security information to end users, such as file paths on your Web
; server, your database schema or other information.
-display_errors = On
+display_errors = Off
; Even when display_errors is on, errors that occur during PHP's startup
; sequence are not displayed. It's strongly recommended to keep
@@ -116,7 +116,7 @@ display_startup_errors = Off
; Log errors into a log file (server-specific log, stderr, or error_log (below))
; As stated above, you're strongly advised to use error logging in place of
; error displaying on production web sites.
-log_errors = Off
+log_errors = On
; Set maximum length of log_errors. In error_log information about the source is
; added. The default is 1024 and 0 allows to not apply any maximum length at all.
@@ -163,7 +163,7 @@ track_errors = Off
;error_log = filename
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-;error_log = syslog
+error_log = syslog
;;;;;;;;;;;;;;;;;
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 6c1097e19..c51819429 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= uClibc++
PKG_VERSION:= 0.2.4
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 394c119363dd8b469fb898442a6764b8
PKG_DESCR:= A standard c++ library for embedded systems
PKG_SECTION:= libs
diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h
new file mode 100644
index 000000000..a81d44cc7
--- /dev/null
+++ b/package/uclibc++/patches/patch-include_unwind-cxx_h
@@ -0,0 +1,21 @@
+http://git.uclibc.org/uClibc++/commit/?id=cf73cb907c03ca2fb22bfe7fe2f732c10714b9ad
+--- uClibc++-0.2.4.orig/include/unwind-cxx.h 2012-05-25 23:15:31.000000000 +0200
++++ uClibc++-0.2.4/include/unwind-cxx.h 2013-09-24 11:48:52.000000000 +0200
+@@ -173,6 +173,7 @@ extern std::unexpected_handler __unexpec
+
+ // This is the exception class we report -- "GNUCC++\0".
+ const _Unwind_Exception_Class __gxx_exception_class
++#ifndef __ARM_EABI_UNWINDER__
+ = ((((((((_Unwind_Exception_Class) 'G'
+ << 8 | (_Unwind_Exception_Class) 'N')
+ << 8 | (_Unwind_Exception_Class) 'U')
+@@ -181,6 +182,9 @@ const _Unwind_Exception_Class __gxx_exce
+ << 8 | (_Unwind_Exception_Class) '+')
+ << 8 | (_Unwind_Exception_Class) '+')
+ << 8 | (_Unwind_Exception_Class) '\0');
++#else
++= "GNUCC++";
++#endif
+
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index cdffe1852..5efdbfb40 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= boost-shared libffmpeg python2 libstdcxx
+PKG_DEPENDS:= boost boost-shared libffmpeg python2 libstdcxx
PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad
PKG_DEPENDS+= libjpeg libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
@@ -21,10 +21,12 @@ PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
+PKG_BUILDDEP+= bcm2835-vc libgpg-error
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://mirrors.xbmc.org/releases/source/
PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_LIBC_DEPENDS:= eglibc glibc
include $(TOPDIR)/mk/package.mk
diff --git a/target/linux/patches/3.9.11/arm-spitz.patch b/target/linux/patches/3.9.11/arm-spitz.patch
new file mode 100644
index 000000000..aea848244
--- /dev/null
+++ b/target/linux/patches/3.9.11/arm-spitz.patch
@@ -0,0 +1,27 @@
+http://lists.infradead.org/pipermail/linux-arm-kernel/2013-September/198444.html
+
+diff -Nur linux-3.9.11.orig/arch/arm/common/sharpsl_param.c linux-3.9.11/arch/arm/common/sharpsl_param.c
+--- linux-3.9.11.orig/arch/arm/common/sharpsl_param.c 2013-07-21 02:16:17.000000000 +0200
++++ linux-3.9.11/arch/arm/common/sharpsl_param.c 2013-09-18 16:27:10.000000000 +0200
+@@ -26,6 +26,7 @@
+ #ifdef CONFIG_ARCH_SA1100
+ #define PARAM_BASE 0xe8ffc000
+ #else
++#include <asm/memory.h>
+ #define PARAM_BASE 0xa0000a00
+ #endif
+ #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 ) | ( b << 8 ) | a )
+@@ -41,7 +42,12 @@
+
+ void sharpsl_save_param(void)
+ {
+- memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info));
++#ifdef CONFIG_ARCH_SA1100
++ void *param_start = (void *)PARAM_BASE;
++#else
++ void *param_start = phys_to_virt(PARAM_BASE);
++#endif
++ memcpy(&sharpsl_param, param_start, sizeof(struct sharpsl_param_info));
+
+ if (sharpsl_param.comadj_keyword != COMADJ_MAGIC)
+ sharpsl_param.comadj=-1;
diff --git a/toolchain/binutils/patches/2.23.2/arm-whitespace.patch b/toolchain/binutils/patches/2.23.2/arm-whitespace.patch
new file mode 100644
index 000000000..0bc560166
--- /dev/null
+++ b/toolchain/binutils/patches/2.23.2/arm-whitespace.patch
@@ -0,0 +1,23 @@
+diff -Nur binutils-2.23.2.orig/gas/config/tc-arm.c binutils-2.23.2/gas/config/tc-arm.c
+--- binutils-2.23.2.orig/gas/config/tc-arm.c 2013-03-25 09:06:21.000000000 +0100
++++ binutils-2.23.2/gas/config/tc-arm.c 2013-09-24 13:26:32.000000000 +0200
+@@ -885,6 +885,9 @@
+ static inline int
+ skip_past_char (char ** str, char c)
+ {
++ /* PR gas/14987: Allow for whitespace before the expected character. */
++ skip_whitespace (*str);
++
+ if (**str == c)
+ {
+ (*str)++;
+@@ -5168,6 +5171,9 @@
+ return PARSE_OPERAND_SUCCESS;
+ }
+
++ /* PR gas/14887: Allow for whitespace after the opening bracket. */
++ skip_whitespace (p);
++
+ if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
+ {
+ inst.error = _(reg_expected_msgs[REG_TYPE_RN]);
diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc
index 83dc75168..37bd7a981 100644
--- a/toolchain/musl/Makefile.inc
+++ b/toolchain/musl/Makefile.inc
@@ -2,8 +2,8 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= musl
-PKG_VERSION:= 0.9.13
+PKG_VERSION:= 0.9.14
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6af97d6157a2f4ee7a17af2316389fd7
+PKG_MD5SUM:= bfb685695aa942e64c63170589e575b2
PKG_SITES:= http://www.musl-libc.org/releases/
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/toolchain/musl/patches/0.9.13/musl-git.patch b/toolchain/musl/patches/0.9.13/musl-git.patch
deleted file mode 100644
index a6a87390f..000000000
--- a/toolchain/musl/patches/0.9.13/musl-git.patch
+++ /dev/null
@@ -1,8837 +0,0 @@
-diff -Nur musl-0.9.13/.gitignore musl-git/.gitignore
---- musl-0.9.13/.gitignore 1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/.gitignore 2013-09-16 20:31:39.000000000 +0200
-@@ -0,0 +1,10 @@
-+*.o
-+*.lo
-+*.a
-+*.so
-+*.so.1
-+arch/*/bits/alltypes.h
-+config.mak
-+include/bits
-+tools/musl-gcc
-+lib/musl-gcc.specs
-diff -Nur musl-0.9.13/Makefile musl-git/Makefile
---- musl-0.9.13/Makefile 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/Makefile 2013-09-16 20:31:39.000000000 +0200
-@@ -157,7 +157,7 @@
- $(INSTALL) -D -m 644 $< $@
-
- $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
-- $(INSTALL) -D -l $< $@ || true
-+ $(INSTALL) -D -l $(libdir)/libc.so $@ || true
-
- install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
-
-diff -Nur musl-0.9.13/arch/microblaze/bits/limits.h musl-git/arch/microblaze/bits/limits.h
---- musl-0.9.13/arch/microblaze/bits/limits.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/microblaze/bits/limits.h 2013-09-16 20:31:39.000000000 +0200
-@@ -1,6 +1,5 @@
- #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
-
-diff -Nur musl-0.9.13/arch/microblaze/reloc.h musl-git/arch/microblaze/reloc.h
---- musl-0.9.13/arch/microblaze/reloc.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/microblaze/reloc.h 2013-09-16 20:31:39.000000000 +0200
-@@ -49,7 +49,7 @@
- for (a+=c+1; *a; a++);
- for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
- base = (char *)t[AT_BASE];
-- if (!base) base = (char *)(t[AT_PHDR] & -4096);
-+ if (!base) base = (char *)(t[AT_PHDR] & -t[AT_PAGESZ]);
- for (a=dynv; *a; a+=2) if (*a<20) t[*a] = a[1];
- n = t[DT_RELASZ];
- for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)
-diff -Nur musl-0.9.13/arch/mips/bits/limits.h musl-git/arch/mips/bits/limits.h
---- musl-0.9.13/arch/mips/bits/limits.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/mips/bits/limits.h 2013-09-16 20:31:39.000000000 +0200
-@@ -1,6 +1,5 @@
- #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
-
-diff -Nur musl-0.9.13/arch/mips/bits/msg.h musl-git/arch/mips/bits/msg.h
---- musl-0.9.13/arch/mips/bits/msg.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/mips/bits/msg.h 2013-09-16 20:31:39.000000000 +0200
-@@ -1,12 +1,21 @@
- struct msqid_ds
- {
- struct ipc_perm msg_perm;
-+#if _MIPSEL || __MIPSEL || __MIPSEL__
- time_t msg_stime;
- int __unused1;
- time_t msg_rtime;
- int __unused2;
- time_t msg_ctime;
- int __unused3;
-+#else
-+ int __unused1;
-+ time_t msg_stime;
-+ int __unused2;
-+ time_t msg_rtime;
-+ int __unused3;
-+ time_t msg_ctime;
-+#endif
- unsigned long msg_cbytes;
- msgqnum_t msg_qnum;
- msglen_t msg_qbytes;
-diff -Nur musl-0.9.13/arch/mips/bits/shm.h musl-git/arch/mips/bits/shm.h
---- musl-0.9.13/arch/mips/bits/shm.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/mips/bits/shm.h 2013-09-16 20:31:39.000000000 +0200
-@@ -5,11 +5,8 @@
- struct ipc_perm shm_perm;
- size_t shm_segsz;
- time_t shm_atime;
-- int __unused1;
- time_t shm_dtime;
-- int __unused2;
- time_t shm_ctime;
-- int __unused3;
- pid_t shm_cpid;
- pid_t shm_lpid;
- unsigned long shm_nattch;
-diff -Nur musl-0.9.13/arch/mips/reloc.h musl-git/arch/mips/reloc.h
---- musl-0.9.13/arch/mips/reloc.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/mips/reloc.h 2013-09-16 20:31:39.000000000 +0200
-@@ -51,7 +51,7 @@
- for (a+=c+1; *a; a++);
- for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
- base = (char *)t[AT_BASE];
-- if (!base) base = (char *)(t[AT_PHDR] & -4096);
-+ if (!base) base = (char *)(t[AT_PHDR] & -t[AT_PAGESZ]);
- for (a=dynv; *a; a+=2) if (*a-0x70000000UL<20) t[*a&31] = a[1];
- n = t[DT_MIPS_LOCAL_GOTNO - 0x70000000];
- for (a=got; n; a++, n--) *a += (size_t)base;
-diff -Nur musl-0.9.13/arch/powerpc/bits/limits.h musl-git/arch/powerpc/bits/limits.h
---- musl-0.9.13/arch/powerpc/bits/limits.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/powerpc/bits/limits.h 2013-09-16 20:31:39.000000000 +0200
-@@ -1,6 +1,5 @@
- #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
-
-diff -Nur musl-0.9.13/arch/powerpc/reloc.h musl-git/arch/powerpc/reloc.h
---- musl-0.9.13/arch/powerpc/reloc.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/arch/powerpc/reloc.h 2013-09-16 20:31:39.000000000 +0200
-@@ -46,7 +46,7 @@
- for (a+=c+1; *a; a++);
- for (a++; *a; a+=2) if (*a<20) t[*a] = a[1];
- base = (char *)t[AT_BASE];
-- if (!base) base = (char *)(t[AT_PHDR] & -4096);
-+ if (!base) base = (char *)(t[AT_PHDR] & -t[AT_PAGESZ]);
- for (a=dynv; *a; a+=2) if (*a<20) t[*a] = a[1];
- n = t[DT_RELASZ];
- for (a=(void *)(base+t[DT_RELA]); n; a+=3, n-=12)
-diff -Nur musl-0.9.13/include/elf.h musl-git/include/elf.h
---- musl-0.9.13/include/elf.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/elf.h 2013-09-16 20:31:39.000000000 +0200
-@@ -105,6 +105,7 @@
- #define ELFOSABI_HPUX 1
- #define ELFOSABI_NETBSD 2
- #define ELFOSABI_LINUX 3
-+#define ELFOSABI_GNU 3
- #define ELFOSABI_SOLARIS 6
- #define ELFOSABI_AIX 7
- #define ELFOSABI_IRIX 8
-@@ -211,7 +212,11 @@
- #define EM_OPENRISC 92
- #define EM_ARC_A5 93
- #define EM_XTENSA 94
--#define EM_NUM 95
-+#define EM_AARCH64 183
-+#define EM_TILEPRO 188
-+#define EM_MICROBLAZE 189
-+#define EM_TILEGX 191
-+#define EM_NUM 192
- #define EM_ALPHA 0x9026
-
- #define EV_NONE 0
-@@ -487,6 +492,8 @@
- #define PT_HIPROC 0x7fffffff
-
-
-+#define PN_XNUM 0xffff
-+
-
- #define PF_X (1 << 0)
- #define PF_W (1 << 1)
-@@ -512,12 +519,31 @@
- #define NT_LWPSTATUS 16
- #define NT_LWPSINFO 17
- #define NT_PRFPXREG 20
-+#define NT_SIGINFO 0x53494749
-+#define NT_FILE 0x46494c45
- #define NT_PRXFPREG 0x46e62b7f
- #define NT_PPC_VMX 0x100
- #define NT_PPC_SPE 0x101
- #define NT_PPC_VSX 0x102
- #define NT_386_TLS 0x200
- #define NT_386_IOPERM 0x201
-+#define NT_X86_XSTATE 0x202
-+#define NT_S390_HIGH_GPRS 0x300
-+#define NT_S390_TIMER 0x301
-+#define NT_S390_TODCMP 0x302
-+#define NT_S390_TODPREG 0x303
-+#define NT_S390_CTRS 0x304
-+#define NT_S390_PREFIX 0x305
-+#define NT_S390_LAST_BREAK 0x306
-+#define NT_S390_SYSTEM_CALL 0x307
-+#define NT_S390_TDB 0x308
-+#define NT_ARM_VFP 0x400
-+#define NT_ARM_TLS 0x401
-+#define NT_ARM_HW_BREAK 0x402
-+#define NT_ARM_HW_WATCH 0x403
-+#define NT_METAG_CBUF 0x500
-+#define NT_METAG_RPIPE 0x501
-+#define NT_METAG_TLS 0x502
- #define NT_VERSION 1
-
-
-@@ -666,7 +692,15 @@
- #define DF_1_ENDFILTEE 0x00004000
- #define DF_1_DISPRELDNE 0x00008000
- #define DF_1_DISPRELPND 0x00010000
--
-+#define DF_1_NODIRECT 0x00020000
-+#define DF_1_IGNMULDEF 0x00040000
-+#define DF_1_NOKSYMS 0x00080000
-+#define DF_1_NOHDR 0x00100000
-+#define DF_1_EDITED 0x00200000
-+#define DF_1_NORELOC 0x00400000
-+#define DF_1_SYMINTPOSE 0x00800000
-+#define DF_1_GLOBAUDIT 0x01000000
-+#define DF_1_SINGLETON 0x02000000
-
- #define DTF_1_PARINIT 0x00000001
- #define DTF_1_CONFEXP 0x00000002
-@@ -832,6 +866,8 @@
-
- #define AT_RANDOM 25
-
-+#define AT_HWCAP2 26
-+
- #define AT_EXECFN 31
-
-
-@@ -979,6 +1015,7 @@
- #define R_386_TLS_DTPMOD32 35
- #define R_386_TLS_DTPOFF32 36
- #define R_386_TLS_TPOFF32 37
-+#define R_386_SIZE32 38
- #define R_386_TLS_GOTDESC 39
- #define R_386_TLS_DESC_CALL 40
- #define R_386_TLS_DESC 41
-@@ -1109,20 +1146,6 @@
- #define DT_SPARC_NUM 2
-
-
--
--#define HWCAP_SPARC_FLUSH 1
--#define HWCAP_SPARC_STBAR 2
--#define HWCAP_SPARC_SWAP 4
--#define HWCAP_SPARC_MULDIV 8
--#define HWCAP_SPARC_V9 16
--#define HWCAP_SPARC_ULTRA3 32
--#define HWCAP_SPARC_BLKINIT 64
--#define HWCAP_SPARC_N2 128
--
--
--
--
--
- #define EF_MIPS_NOREORDER 1
- #define EF_MIPS_PIC 2
- #define EF_MIPS_CPIC 4
-@@ -1139,9 +1162,10 @@
- #define EF_MIPS_ARCH_3 0x20000000
- #define EF_MIPS_ARCH_4 0x30000000
- #define EF_MIPS_ARCH_5 0x40000000
--#define EF_MIPS_ARCH_32 0x60000000
--#define EF_MIPS_ARCH_64 0x70000000
--
-+#define EF_MIPS_ARCH_32 0x50000000
-+#define EF_MIPS_ARCH_64 0x60000000
-+#define EF_MIPS_ARCH_32R2 0x70000000
-+#define EF_MIPS_ARCH_64R2 0x80000000
-
-
- #define E_MIPS_ARCH_1 0x00000000
-@@ -1149,8 +1173,8 @@
- #define E_MIPS_ARCH_3 0x20000000
- #define E_MIPS_ARCH_4 0x30000000
- #define E_MIPS_ARCH_5 0x40000000
--#define E_MIPS_ARCH_32 0x60000000
--#define E_MIPS_ARCH_64 0x70000000
-+#define E_MIPS_ARCH_32 0x50000000
-+#define E_MIPS_ARCH_64 0x60000000
-
-
-
-@@ -2020,7 +2044,8 @@
- #define EF_ARM_VFP_FLOAT 0x400
- #define EF_ARM_MAVERICK_FLOAT 0x800
-
--
-+#define EF_ARM_ABI_FLOAT_SOFT 0x200
-+#define EF_ARM_ABI_FLOAT_HARD 0x400
-
-
- #define EF_ARM_SYMSARESORTED 0x04
-@@ -2064,6 +2089,17 @@
- #define SHT_ARM_ATTRIBUTES (SHT_LOPROC + 3)
-
-
-+#define R_AARCH64_NONE 0
-+#define R_AARCH64_ABS64 257
-+#define R_AARCH64_ABS32 258
-+#define R_AARCH64_COPY 1024
-+#define R_AARCH64_GLOB_DAT 1025
-+#define R_AARCH64_JUMP_SLOT 1026
-+#define R_AARCH64_RELATIVE 1027
-+#define R_AARCH64_TLS_DTPMOD64 1028
-+#define R_AARCH64_TLS_DTPREL64 1029
-+#define R_AARCH64_TLS_TPREL64 1030
-+#define R_AARCH64_TLSDESC 1031
-
-
- #define R_ARM_NONE 0
-@@ -2079,7 +2115,7 @@
- #define R_ARM_THM_PC22 10
- #define R_ARM_THM_PC8 11
- #define R_ARM_AMP_VCALL9 12
--#define R_ARM_SWI24 13
-+#define R_ARM_TLS_DESC 13
- #define R_ARM_THM_SWI8 14
- #define R_ARM_XPC25 15
- #define R_ARM_THM_XPC22 16
-@@ -2094,12 +2130,78 @@
- #define R_ARM_GOTPC 25
- #define R_ARM_GOT32 26
- #define R_ARM_PLT32 27
-+#define R_ARM_CALL 28
-+#define R_ARM_JUMP24 29
-+#define R_ARM_THM_JUMP24 30
-+#define R_ARM_BASE_ABS 31
- #define R_ARM_ALU_PCREL_7_0 32
- #define R_ARM_ALU_PCREL_15_8 33
- #define R_ARM_ALU_PCREL_23_15 34
- #define R_ARM_LDR_SBREL_11_0 35
- #define R_ARM_ALU_SBREL_19_12 36
- #define R_ARM_ALU_SBREL_27_20 37
-+#define R_ARM_TARGET1 38
-+#define R_ARM_SBREL31 39
-+#define R_ARM_V4BX 40
-+#define R_ARM_TARGET2 41
-+#define R_ARM_PREL31 42
-+#define R_ARM_MOVW_ABS_NC 43
-+#define R_ARM_MOVT_ABS 44
-+#define R_ARM_MOVW_PREL_NC 45
-+#define R_ARM_MOVT_PREL 46
-+#define R_ARM_THM_MOVW_ABS_NC 47
-+#define R_ARM_THM_MOVT_ABS 48
-+#define R_ARM_THM_MOVW_PREL_NC 49
-+#define R_ARM_THM_MOVT_PREL 50
-+#define R_ARM_THM_JUMP19 51
-+#define R_ARM_THM_JUMP6 52
-+#define R_ARM_THM_ALU_PREL_11_0 53
-+#define R_ARM_THM_PC12 54
-+#define R_ARM_ABS32_NOI 55
-+#define R_ARM_REL32_NOI 56
-+#define R_ARM_ALU_PC_G0_NC 57
-+#define R_ARM_ALU_PC_G0 58
-+#define R_ARM_ALU_PC_G1_NC 59
-+#define R_ARM_ALU_PC_G1 60
-+#define R_ARM_ALU_PC_G2 61
-+#define R_ARM_LDR_PC_G1 62
-+#define R_ARM_LDR_PC_G2 63
-+#define R_ARM_LDRS_PC_G0 64
-+#define R_ARM_LDRS_PC_G1 65
-+#define R_ARM_LDRS_PC_G2 66
-+#define R_ARM_LDC_PC_G0 67
-+#define R_ARM_LDC_PC_G1 68
-+#define R_ARM_LDC_PC_G2 69
-+#define R_ARM_ALU_SB_G0_NC 70
-+#define R_ARM_ALU_SB_G0 71
-+#define R_ARM_ALU_SB_G1_NC 72
-+#define R_ARM_ALU_SB_G1 73
-+#define R_ARM_ALU_SB_G2 74
-+#define R_ARM_LDR_SB_G0 75
-+#define R_ARM_LDR_SB_G1 76
-+#define R_ARM_LDR_SB_G2 77
-+#define R_ARM_LDRS_SB_G0 78
-+#define R_ARM_LDRS_SB_G1 79
-+#define R_ARM_LDRS_SB_G2 80
-+#define R_ARM_LDC_SB_G0 81
-+#define R_ARM_LDC_SB_G1 82
-+#define R_ARM_LDC_SB_G2 83
-+#define R_ARM_MOVW_BREL_NC 84
-+#define R_ARM_MOVT_BREL 85
-+#define R_ARM_MOVW_BREL 86
-+#define R_ARM_THM_MOVW_BREL_NC 87
-+#define R_ARM_THM_MOVT_BREL 88
-+#define R_ARM_THM_MOVW_BREL 89
-+#define R_ARM_TLS_GOTDESC 90
-+#define R_ARM_TLS_CALL 91
-+#define R_ARM_TLS_DESCSEQ 92
-+#define R_ARM_THM_TLS_CALL 93
-+#define R_ARM_PLT32_ABS 94
-+#define R_ARM_GOT_ABS 95
-+#define R_ARM_GOT_PREL 96
-+#define R_ARM_GOT_BREL12 97
-+#define R_ARM_GOTOFF12 98
-+#define R_ARM_GOTRELAX 99
- #define R_ARM_GNU_VTENTRY 100
- #define R_ARM_GNU_VTINHERIT 101
- #define R_ARM_THM_PC11 102
-@@ -2113,7 +2215,15 @@
- #define R_ARM_TLS_IE32 107
-
- #define R_ARM_TLS_LE32 108
--
-+#define R_ARM_TLS_LDO12 109
-+#define R_ARM_TLS_LE12 110
-+#define R_ARM_TLS_IE12GP 111
-+#define R_ARM_ME_TOO 128
-+#define R_ARM_THM_TLS_DESCSEQ 129
-+#define R_ARM_THM_TLS_DESCSEQ16 129
-+#define R_ARM_THM_TLS_DESCSEQ32 130
-+#define R_ARM_THM_GOT_BREL12 131
-+#define R_ARM_IRELATIVE 160
- #define R_ARM_RXPC25 249
- #define R_ARM_RSBREL32 250
- #define R_ARM_THM_RPC22 251
-@@ -2421,15 +2531,21 @@
- #define R_X86_64_PC64 24
- #define R_X86_64_GOTOFF64 25
- #define R_X86_64_GOTPC32 26
--
-+#define R_X86_64_GOT64 27
-+#define R_X86_64_GOTPCREL64 28
-+#define R_X86_64_GOTPC64 29
-+#define R_X86_64_GOTPLT64 30
-+#define R_X86_64_PLTOFF64 31
-+#define R_X86_64_SIZE32 32
-+#define R_X86_64_SIZE64 33
-
- #define R_X86_64_GOTPC32_TLSDESC 34
- #define R_X86_64_TLSDESC_CALL 35
-
- #define R_X86_64_TLSDESC 36
- #define R_X86_64_IRELATIVE 37
--
--#define R_X86_64_NUM 38
-+#define R_X86_64_RELATIVE64 38
-+#define R_X86_64_NUM 39
-
-
-
-diff -Nur musl-0.9.13/include/limits.h musl-git/include/limits.h
---- musl-0.9.13/include/limits.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/limits.h 2013-09-16 20:31:39.000000000 +0200
-@@ -40,7 +40,9 @@
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-
- #define PIPE_BUF 4096
-+#ifdef PAGE_SIZE
- #define PAGESIZE PAGE_SIZE
-+#endif
- #define FILESIZEBITS 64
- #define NAME_MAX 255
- #define SYMLINK_MAX 255
-diff -Nur musl-0.9.13/include/net/if_arp.h musl-git/include/net/if_arp.h
---- musl-0.9.13/include/net/if_arp.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/net/if_arp.h 2013-09-16 20:31:39.000000000 +0200
-@@ -52,6 +52,7 @@
- #define ARPHRD_ROSE 270
- #define ARPHRD_X25 271
- #define ARPHRD_HWX25 272
-+#define ARPHRD_CAN 280
- #define ARPHRD_PPP 512
- #define ARPHRD_CISCO 513
- #define ARPHRD_HDLC ARPHRD_CISCO
-@@ -84,7 +85,12 @@
- #define ARPHRD_IEEE80211_PRISM 802
- #define ARPHRD_IEEE80211_RADIOTAP 803
- #define ARPHRD_IEEE802154 804
--#define ARPHRD_IEEE802154_PHY 805
-+#define ARPHRD_IEEE802154_MONITOR 805
-+#define ARPHRD_PHONET 820
-+#define ARPHRD_PHONET_PIPE 821
-+#define ARPHRD_CAIF 822
-+#define ARPHRD_IP6GRE 823
-+#define ARPHRD_NETLINK 824
-
- #define ARPHRD_VOID 0xFFFF
- #define ARPHRD_NONE 0xFFFE
-diff -Nur musl-0.9.13/include/netinet/in.h musl-git/include/netinet/in.h
---- musl-0.9.13/include/netinet/in.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/netinet/in.h 2013-09-16 20:31:39.000000000 +0200
-@@ -91,10 +91,12 @@
- #define IPPROTO_NONE 59
- #define IPPROTO_DSTOPTS 60
- #define IPPROTO_MTP 92
-+#define IPPROTO_BEETPH 94
- #define IPPROTO_ENCAP 98
- #define IPPROTO_PIM 103
- #define IPPROTO_COMP 108
- #define IPPROTO_SCTP 132
-+#define IPPROTO_MH 135
- #define IPPROTO_UDPLITE 136
- #define IPPROTO_RAW 255
- #define IPPROTO_MAX 256
-diff -Nur musl-0.9.13/include/sys/ptrace.h musl-git/include/sys/ptrace.h
---- musl-0.9.13/include/sys/ptrace.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/sys/ptrace.h 2013-09-16 20:31:39.000000000 +0200
-@@ -37,6 +37,8 @@
- #define PTRACE_INTERRUPT 0x4207
- #define PTRACE_LISTEN 0x4208
- #define PTRACE_PEEKSIGINFO 0x4209
-+#define PTRACE_GETSIGMASK 0x420a
-+#define PTRACE_SETSIGMASK 0x420b
-
- #define PT_READ_I PTRACE_PEEKTEXT
- #define PT_READ_D PTRACE_PEEKDATA
-diff -Nur musl-0.9.13/include/sys/resource.h musl-git/include/sys/resource.h
---- musl-0.9.13/include/sys/resource.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/sys/resource.h 2013-09-16 20:31:39.000000000 +0200
-@@ -59,6 +59,9 @@
- #define prlimit64 prlimit
- #endif
-
-+#define PRIO_MIN (-20)
-+#define PRIO_MAX 20
-+
- #define PRIO_PROCESS 0
- #define PRIO_PGRP 1
- #define PRIO_USER 2
-diff -Nur musl-0.9.13/include/sys/socket.h musl-git/include/sys/socket.h
---- musl-0.9.13/include/sys/socket.h 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/include/sys/socket.h 2013-09-16 20:31:39.000000000 +0200
-@@ -199,6 +199,7 @@
- #define SO_NOFCS 43
- #define SO_LOCK_FILTER 44
- #define SO_SELECT_ERR_QUEUE 45
-+#define SO_BUSY_POLL 46
-
- #ifndef SOL_SOCKET
- #define SOL_SOCKET 1
-diff -Nur musl-0.9.13/include/wait.h musl-git/include/wait.h
---- musl-0.9.13/include/wait.h 1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/include/wait.h 2013-09-16 20:31:39.000000000 +0200
-@@ -0,0 +1,2 @@
-+#warning redirecting incorrect #include <wait.h> to <sys/wait.h>
-+#include <sys/wait.h>
-diff -Nur musl-0.9.13/src/aio/aio_readwrite.c musl-git/src/aio/aio_readwrite.c
---- musl-0.9.13/src/aio/aio_readwrite.c 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/src/aio/aio_readwrite.c 2013-09-16 20:31:39.000000000 +0200
-@@ -2,8 +2,8 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <unistd.h>
--#include <limits.h>
- #include "pthread_impl.h"
-+#include "libc.h"
-
- static void dummy(void)
- {
-diff -Nur musl-0.9.13/src/aio/lio_listio.c musl-git/src/aio/lio_listio.c
---- musl-0.9.13/src/aio/lio_listio.c 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/src/aio/lio_listio.c 2013-09-16 20:31:39.000000000 +0200
-@@ -1,9 +1,9 @@
- #include <aio.h>
- #include <errno.h>
--#include <limits.h>
- #include <unistd.h>
- #include <string.h>
- #include "pthread_impl.h"
-+#include "libc.h"
-
- struct lio_state {
- struct sigevent *sev;
-diff -Nur musl-0.9.13/src/conf/fpathconf.c musl-git/src/conf/fpathconf.c
---- musl-0.9.13/src/conf/fpathconf.c 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/src/conf/fpathconf.c 2013-09-16 20:31:39.000000000 +0200
-@@ -19,11 +19,11 @@
- [_PC_PRIO_IO] = -1,
- [_PC_SOCK_MAXBUF] = -1,
- [_PC_FILESIZEBITS] = FILESIZEBITS,
-- [_PC_REC_INCR_XFER_SIZE] = PAGE_SIZE,
-- [_PC_REC_MAX_XFER_SIZE] = PAGE_SIZE,
-- [_PC_REC_MIN_XFER_SIZE] = PAGE_SIZE,
-- [_PC_REC_XFER_ALIGN] = PAGE_SIZE,
-- [_PC_ALLOC_SIZE_MIN] = PAGE_SIZE,
-+ [_PC_REC_INCR_XFER_SIZE] = 4096,
-+ [_PC_REC_MAX_XFER_SIZE] = 4096,
-+ [_PC_REC_MIN_XFER_SIZE] = 4096,
-+ [_PC_REC_XFER_ALIGN] = 4096,
-+ [_PC_ALLOC_SIZE_MIN] = 4096,
- [_PC_SYMLINK_MAX] = SYMLINK_MAX,
- [_PC_2_SYMLINKS] = 1
- };
-diff -Nur musl-0.9.13/src/conf/sysconf.c musl-git/src/conf/sysconf.c
---- musl-0.9.13/src/conf/sysconf.c 2013-08-30 23:30:53.000000000 +0200
-+++ musl-git/src/conf/sysconf.c 2013-09-16 20:31:39.000000000 +0200
-@@ -3,6 +3,7 @@
- #include <errno.h>
- #include <s