diff options
38 files changed, 15044 insertions, 461 deletions
diff --git a/mk/package.mk b/mk/package.mk index e69b7866f..9e880d5ef 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -196,7 +196,7 @@ endif 'ramdisk location:' >&2; \ echo "$$$$x" | sed 's/^/- /' >&2; \ fi; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 6704c1abc..9f92f9349 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -167,7 +167,7 @@ ifeq (,$(filter noremove,${PKG_OPTS})) endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' @-cd ${WRKINST}; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 4d751a2b1..4a8e8ea68 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -38,12 +38,8 @@ BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \ HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ -C ${WRKBUILD} ifneq (${ADK_NATIVE},y) -ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y) BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' else -BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" -endif -else BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc" endif diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 5c902fc1e..159bd229b 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -26,9 +26,7 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIG_STYLE:= manual INSTALL_STYLE:= manual -ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y) TARGET_LDFLAGS+= -static-libgcc -endif do-install: ${INSTALL_DIR} ${IDIR_CFGFS}/sbin diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index b3756a8d9..a7c2356e0 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -32,9 +32,7 @@ ifeq ($(ADK_STATIC),y) TARGET_LDFLAGS+= -static endif -ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y) TARGET_LDFLAGS+= -static-libgcc -endif BUILD_STYLE:= manual INSTALL_STYLE:= manual CONFIGURE_ARGS+= --disable-pam \ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 85a40b195..3670f731e 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= debug -PKG_DEPENDS:= libthread-db libncurses libiconv libexpat +PKG_DEPENDS:= libthread-db libncurses libiconv libexpat libgcc PKG_BUILDDEP:= ncurses readline libiconv expat PKG_NOPARALLEL:= 1 @@ -18,6 +18,7 @@ $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}, ifeq ($(ADK_STATIC),y) TARGET_CFLAGS+= -static +CONFIGURE_ARGS+= --enable-static endif TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) @@ -27,14 +28,11 @@ CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \ --without-included-gettext --disable-sim \ --with-curses --disable-werror \ --disable-gdbserver \ - --enable-static --without-python + --without-python XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}' # disable honour cflags stuff XAKE_FLAGS+= GCC_HONOUR_COPTS:=s -pre-build: - @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a - post-install: ${INSTALL_DIR} ${IDIR_GDB}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/ diff --git a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h index 12ab8ebaf..ddcea422f 100644 --- a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h +++ b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h @@ -1,3 +1,5 @@ +* added from https://github.com/rofl0r/sabotage + --- gdb-7.6.orig/gdb/common/gdb_thread_db.h 2013-01-01 07:32:54.000000000 +0100 +++ gdb-7.6/gdb/common/gdb_thread_db.h 2013-08-13 16:37:40.000000000 +0200 @@ -1,17 +1,6 @@ diff --git a/package/gdb/patches/patch-gdb_common_linux-ptrace_h b/package/gdb/patches/patch-gdb_common_linux-ptrace_h index cc6556d0a..51e2c3637 100644 --- a/package/gdb/patches/patch-gdb_common_linux-ptrace_h +++ b/package/gdb/patches/patch-gdb_common_linux-ptrace_h @@ -1,3 +1,5 @@ +* added from https://github.com/rofl0r/sabotage + --- gdb-7.6.orig/gdb/common/linux-ptrace.h 2013-01-01 07:32:54.000000000 +0100 +++ gdb-7.6/gdb/common/linux-ptrace.h 2013-08-13 17:10:13.000000000 +0200 @@ -20,6 +20,7 @@ diff --git a/package/gdb/patches/patch-gdb_common_signals_c b/package/gdb/patches/patch-gdb_common_signals_c index 666e37430..114f5b867 100644 --- a/package/gdb/patches/patch-gdb_common_signals_c +++ b/package/gdb/patches/patch-gdb_common_signals_c @@ -1,3 +1,5 @@ +* added from https://github.com/rofl0r/sabotage + --- gdb-7.5.orig/gdb/common/signals.c 2012-05-24 18:51:37.000000000 +0200 +++ gdb-7.5/gdb/common/signals.c 2012-10-01 14:44:23.000000000 +0200 @@ -346,6 +346,8 @@ gdb_signal_from_host (int hostsig) diff --git a/package/gdb/patches/patch-gdb_linux-nat_c b/package/gdb/patches/patch-gdb_linux-nat_c index 50ba9bf6c..9ba7254ca 100644 --- a/package/gdb/patches/patch-gdb_linux-nat_c +++ b/package/gdb/patches/patch-gdb_linux-nat_c @@ -1,3 +1,5 @@ +* added from https://github.com/rofl0r/sabotage + --- gdb-7.6.orig/gdb/linux-nat.c 2013-02-13 15:59:49.000000000 +0100 +++ gdb-7.6/gdb/linux-nat.c 2013-08-13 17:01:09.000000000 +0200 @@ -79,6 +79,14 @@ diff --git a/package/gdb/src/gdb/sgidefs.h b/package/gdb/src/gdb/sgidefs.h new file mode 100644 index 000000000..a6d250ab7 --- /dev/null +++ b/package/gdb/src/gdb/sgidefs.h @@ -0,0 +1,30 @@ +#ifndef _SGIDEFS_H +#define _SGIDEFS_H + +/* MIPS ABI crap that GLIBC puts into /include +by default, and GDB depends on it happily. */ + +#define _MIPS_ISA_MIPS1 1 +#define _MIPS_ISA_MIPS2 2 +#define _MIPS_ISA_MIPS3 3 +#define _MIPS_ISA_MIPS4 4 +#define _MIPS_ISA_MIPS5 5 +#define _MIPS_ISA_MIPS32 6 +#define _MIPS_ISA_MIPS64 7 + +#ifndef _ABIO32 +#define _ABIO32 1 +#endif +#define _MIPS_SIM_ABI32 _ABIO32 + +#ifndef _ABIN32 +#define _ABIN32 2 +#endif +#define _MIPS_SIM_NABI32 _ABIN32 + +#ifndef _ABI64 +#define _ABI64 3 +#endif +#define _MIPS_SIM_ABI64 _ABI64 + +#endif diff --git a/package/libqb/Makefile b/package/libqb/Makefile index 6a3ddb3f2..a2d897bcd 100644 --- a/package/libqb/Makefile +++ b/package/libqb/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libqb -PKG_VERSION:= 0.14.1 +PKG_VERSION:= 0.16.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= c144a5e0cd5b69c8d46a051646609f11 +PKG_MD5SUM:= 88a256ce5217efa420598ade393879ff PKG_DESCR:= high performance client server reusable features PKG_SECTION:= libs PKG_URL:= https://github.com/asalkeld/libqb/wiki#wiki-Releases diff --git a/package/libqb/patches/patch-Makefile_in b/package/libqb/patches/patch-Makefile_in new file mode 100644 index 000000000..f73094833 --- /dev/null +++ b/package/libqb/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- libqb-0.16.0.orig/Makefile.in 2013-07-25 20:16:10.000000000 +0200 ++++ libqb-0.16.0/Makefile.in 2013-09-09 06:26:09.718825909 +0200 +@@ -352,7 +352,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc + + ACLOCAL_AMFLAGS = -I m4 + dist_doc_DATA = COPYING INSTALL README.markdown +-SUBDIRS = include lib docs tools tests examples ++SUBDIRS = include lib docs tools + RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \ + --define "_specdir $(abs_builddir)" \ + --define "_builddir $(abs_builddir)" \ diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual index a3881c1e8..19f590e61 100644 --- a/package/musl/Config.in.manual +++ b/package/musl/Config.in.manual @@ -4,7 +4,6 @@ config ADK_PACKAGE_MUSL default y if ADK_TARGET_LIB_MUSL && !ADK_TOOLCHAIN_ONLY default n depends on ADK_TARGET_LIB_MUSL - select ADK_PACKAGE_LIBGCC help Embedded C library. diff --git a/package/musl/Makefile b/package/musl/Makefile index e7526572f..86e75cc26 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -33,6 +33,12 @@ endif ifeq ($(CPU_ARCH),i486) MARCH:= i386 endif +ifeq ($(CPU_ARCH),mipsel) +MARCH:= mips +endif +ifeq ($(CPU_ARCH),ppc) +MARCH:= powerpc +endif # do nothing, musl is already build in toolchain directory do-install: diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 63451f041..054a5d641 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -18,6 +18,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RSYNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_STATIC),y) +TARGET_CFLAGS+= -static +TARGET_LDFLAGS+= -static +endif + post-install: ${INSTALL_DIR} ${IDIR_RSYNC}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/rsync ${IDIR_RSYNC}/usr/bin diff --git a/package/strace/Makefile b/package/strace/Makefile index 98647b555..c6880faa4 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= strace PKG_VERSION:= 4.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575 PKG_DESCR:= System call trace program PKG_SECTION:= debug +PKG_DEPENDS:= libgcc PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c index 041f7177b..27e3d0d77 100644 --- a/package/strace/patches/patch-signal_c +++ b/package/strace/patches/patch-signal_c @@ -1,6 +1,14 @@ --- strace-4.8.orig/signal.c 2013-05-23 15:41:23.000000000 +0200 -+++ strace-4.8/signal.c 2013-08-14 08:50:16.000000000 +0200 -@@ -815,7 +815,7 @@ sys_sigreturn(struct tcb *tcp) ++++ strace-4.8/signal.c 2013-09-13 16:20:20.000000000 +0200 +@@ -61,6 +61,7 @@ + #endif + + #if defined(SPARC) || defined(SPARC64) || defined(MIPS) ++#include <asm/ptrace.h> + typedef struct { + struct pt_regs si_regs; + int si_mask; +@@ -815,7 +816,7 @@ sys_sigreturn(struct tcb *tcp) { #if defined(ARM) if (entering(tcp)) { diff --git a/package/strace/src/sgidefs.h b/package/strace/src/sgidefs.h new file mode 100644 index 000000000..a6d250ab7 --- /dev/null +++ b/package/strace/src/sgidefs.h @@ -0,0 +1,30 @@ +#ifndef _SGIDEFS_H +#define _SGIDEFS_H + +/* MIPS ABI crap that GLIBC puts into /include +by default, and GDB depends on it happily. */ + +#define _MIPS_ISA_MIPS1 1 +#define _MIPS_ISA_MIPS2 2 +#define _MIPS_ISA_MIPS3 3 +#define _MIPS_ISA_MIPS4 4 +#define _MIPS_ISA_MIPS5 5 +#define _MIPS_ISA_MIPS32 6 +#define _MIPS_ISA_MIPS64 7 + +#ifndef _ABIO32 +#define _ABIO32 1 +#endif +#define _MIPS_SIM_ABI32 _ABIO32 + +#ifndef _ABIN32 +#define _ABIN32 2 +#endif +#define _MIPS_SIM_NABI32 _ABIN32 + +#ifndef _ABI64 +#define _ABI64 3 +#endif +#define _MIPS_SIM_ABI64 _ABI64 + +#endif diff --git a/target/config/Config.in b/target/config/Config.in index fc5c8d94a..a14ef5b7a 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -564,9 +564,6 @@ config ADK_musl config ADK_libc boolean -config ADK_TARGET_LIB_STATIC_LIBGCC - boolean - config ADK_TARGET_LIBC string default "uclibc" if ADK_uclibc @@ -588,7 +585,6 @@ config ADK_TARGET_LIB_UCLIBC !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ !ADK_LINUX_NATIVE - select ADK_TARGET_LIB_STATIC_LIBGCC help http://uclibc.org @@ -609,7 +605,6 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_SPARC64 || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 - select ADK_TARGET_LIB_STATIC_LIBGCC help http://www.eglibc.org @@ -630,7 +625,6 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_SPARC64 || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 - select ADK_TARGET_LIB_STATIC_LIBGCC help http://www.gnu.org/libc @@ -652,7 +646,6 @@ config ADK_TARGET_LIB_LIBC prompt "Native C library" boolean select ADK_libc - select ADK_TARGET_LIB_STATIC_LIBGCC depends on ADK_LINUX_NATIVE endchoice diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 59d31d38c..d806d9c78 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS select ADK_qemu_mips select ADK_KERNEL_MIPS_MALTA select ADK_KERNEL_CPU_BIG_ENDIAN + select ADK_KERNEL_PAGE_SIZE_4KB select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/ppc/target.mk b/target/ppc/target.mk index 3654b0d35..bd6624fe7 100644 --- a/target/ppc/target.mk +++ b/target/ppc/target.mk @@ -2,4 +2,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= powerpc CPU_ARCH:= ppc TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) +TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -Wl,--secure-plt diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 4448a7b51..06b5d3105 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -7,8 +7,8 @@ ifeq ($(ADK_LINUX_AVR32),y) PKG_VERSION:= 2.21 PKG_MD5SUM:= c84c5acc9d266f1a7044b51c85a823f5 else -PKG_VERSION:= 2.22 -PKG_MD5SUM:= ee0f10756c84979622b992a4a61ea3f5 +PKG_VERSION:= 2.23.2 +PKG_MD5SUM:= 4f8fa651e35ef262edc01d60fb45702e endif PKG_RELEASE:= 1 diff --git a/toolchain/binutils/patches/2.22/musl-cross.patch b/toolchain/binutils/patches/2.22/musl-cross.patch new file mode 100644 index 000000000..47af7bbb8 --- /dev/null +++ b/toolchain/binutils/patches/2.22/musl-cross.patch @@ -0,0 +1,81 @@ +diff -Nur binutils-2.22.orig/bfd/elf32-ppc.c binutils-2.22/bfd/elf32-ppc.c +--- binutils-2.22.orig/bfd/elf32-ppc.c 2011-11-21 10:29:21.000000000 +0100 ++++ binutils-2.22/bfd/elf32-ppc.c 2013-09-14 12:51:24.000000000 +0200 +@@ -2987,10 +2987,6 @@ + edir->elf.needs_plt |= eind->elf.needs_plt; + edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed; + +- /* If we were called to copy over info for a weak sym, that's all. */ +- if (eind->elf.root.type != bfd_link_hash_indirect) +- return; +- + if (eind->dyn_relocs != NULL) + { + if (edir->dyn_relocs != NULL) +@@ -3022,6 +3018,16 @@ + eind->dyn_relocs = NULL; + } + ++ /* If we were called to copy over info for a weak sym, that's all. ++ You might think dyn_relocs need not be copied over; After all, ++ both syms will be dynamic or both non-dynamic so we're just ++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS ++ code in ppc_elf_adjust_dynamic_symbol needs to check for ++ dyn_relocs in read-only sections, and it does so on what is the ++ DIR sym here. */ ++ if (eind->elf.root.type != bfd_link_hash_indirect) ++ return; ++ + /* Copy over the GOT refcount entries that we may have already seen to + the symbol which just became indirect. */ + edir->elf.got.refcount += eind->elf.got.refcount; +diff -Nur binutils-2.22.orig/bfd/elf64-ppc.c binutils-2.22/bfd/elf64-ppc.c +--- binutils-2.22.orig/bfd/elf64-ppc.c 2011-11-21 10:29:24.000000000 +0100 ++++ binutils-2.22/bfd/elf64-ppc.c 2013-09-14 12:51:24.000000000 +0200 +@@ -4435,10 +4435,6 @@ + edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; + edir->elf.needs_plt |= eind->elf.needs_plt; + +- /* If we were called to copy over info for a weak sym, that's all. */ +- if (eind->elf.root.type != bfd_link_hash_indirect) +- return; +- + /* Copy over any dynamic relocs we may have on the indirect sym. */ + if (eind->dyn_relocs != NULL) + { +@@ -4471,6 +4467,16 @@ + eind->dyn_relocs = NULL; + } + ++ /* If we were called to copy over info for a weak sym, that's all. ++ You might think dyn_relocs need not be copied over; After all, ++ both syms will be dynamic or both non-dynamic so we're just ++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS ++ code in ppc64_elf_adjust_dynamic_symbol needs to check for ++ dyn_relocs in read-only sections, and it does so on what is the ++ DIR sym here. */ ++ if (eind->elf.root.type != bfd_link_hash_indirect) ++ return; ++ + /* Copy over got entries that we may have already seen to the + symbol which just became indirect. */ + if (eind->elf.got.glist != NULL) +diff -Nur binutils-2.22.orig/config.sub binutils-2.22/config.sub +--- binutils-2.22.orig/config.sub 2011-06-06 12:36:06.000000000 +0200 ++++ binutils-2.22/config.sub 2013-09-14 12:51:24.000000000 +0200 +@@ -125,6 +125,7 @@ + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +@@ -1335,6 +1336,7 @@ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ ++ | -linux-musl* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/toolchain/binutils/patches/2.22/musl.patch b/toolchain/binutils/patches/2.22/musl.patch deleted file mode 100644 index 4ea53c18f..000000000 --- a/toolchain/binutils/patches/2.22/musl.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur binutils-2.22.orig/config.sub binutils-2.22/config.sub ---- binutils-2.22.orig/config.sub 2011-06-06 12:36:06.000000000 +0200 -+++ binutils-2.22/config.sub 2013-08-11 14:40:22.308115171 +0200 -@@ -126,6 +126,7 @@ - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1334,7 +1335,7 @@ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -linux-newlib* | -linux-uclibc* | -linux-musl* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/toolchain/binutils/patches/2.23.2/musl-cross.patch b/toolchain/binutils/patches/2.23.2/musl-cross.patch new file mode 100644 index 000000000..c1a4fbfec --- /dev/null +++ b/toolchain/binutils/patches/2.23.2/musl-cross.patch @@ -0,0 +1,19 @@ +diff -Nur binutils-2.23.2.orig/config.sub binutils-2.23.2/config.sub +--- binutils-2.23.2.orig/config.sub 2012-04-25 17:53:25.000000000 +0200 ++++ binutils-2.23.2/config.sub 2013-09-15 15:10:00.000000000 +0200 +@@ -123,6 +123,7 @@ + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +@@ -1361,6 +1362,7 @@ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ ++ | -linux-musl* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index 7fc25305c..e2aec51aa 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= eglibc -PKG_VERSION:= 2.17 +PKG_VERSION:= 2.18 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7bbee592be7d7fcacdc9dda931db9bec +PKG_MD5SUM:= 2e4aad1b953daa997debe48fe10862cc PKG_SITES:= http://openadk.org/distfiles/ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --without-cvs \ diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index b77801f37..893345f2b 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -1,6 +1,6 @@ -diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc/types.h eglibc-2.16/libc/sunrpc/rpc/types.h ---- eglibc-2.16.orig/libc/sunrpc/rpc/types.h 2012-07-31 09:00:24.000000000 +0200 -+++ eglibc-2.16/libc/sunrpc/rpc/types.h 2012-07-31 10:08:35.000000000 +0200 +diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc/types.h eglibc-2.18/libc/sunrpc/rpc/types.h +--- eglibc-2.18.orig/libc/sunrpc/rpc/types.h 2013-09-13 10:20:22.000000000 +0200 ++++ eglibc-2.18/libc/sunrpc/rpc/types.h 2013-09-13 10:49:06.000000000 +0200 @@ -69,19 +69,25 @@ #include <sys/types.h> #endif @@ -39,9 +39,9 @@ diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc/types.h eglibc-2.16/libc/sunrpc/rpc/t # define __daddr_t_defined #endif -diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_main.c eglibc-2.16/libc/sunrpc/rpc_main.c ---- eglibc-2.16.orig/libc/sunrpc/rpc_main.c 2012-07-31 09:00:24.000000000 +0200 -+++ eglibc-2.16/libc/sunrpc/rpc_main.c 2012-07-31 09:22:22.000000000 +0200 +diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_main.c eglibc-2.18/libc/sunrpc/rpc_main.c +--- eglibc-2.18.orig/libc/sunrpc/rpc_main.c 2013-09-13 10:20:22.000000000 +0200 ++++ eglibc-2.18/libc/sunrpc/rpc_main.c 2013-09-13 10:49:34.000000000 +0200 @@ -38,7 +38,11 @@ #include <stdio.h> #include <string.h> @@ -51,9 +51,9 @@ diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_main.c eglibc-2.16/libc/sunrpc/rpc_ma +#else #include <libintl.h> +#endif + #include <locale.h> #include <ctype.h> #include <sys/types.h> - #include <sys/param.h> @@ -958,10 +962,12 @@ abort (); temp = rindex (cmd->infile, '.'); @@ -70,9 +70,9 @@ diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_main.c eglibc-2.16/libc/sunrpc/rpc_ma } else -diff -Nur eglibc-2.16.orig/libc/sunrpc/rpc_scan.c eglibc-2.16/libc/sunrpc/rpc_scan.c ---- eglibc-2.16.orig/libc/sunrpc/rpc_scan.c 2012-07-31 09:00:24.000000000 +0200 -+++ eglibc-2.16/libc/sunrpc/rpc_scan.c 2012-07-31 09:22:22.000000000 +0200 +diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_scan.c eglibc-2.18/libc/sunrpc/rpc_scan.c +--- eglibc-2.18.orig/libc/sunrpc/rpc_scan.c 2013-09-13 10:20:22.000000000 +0200 ++++ eglibc-2.18/libc/sunrpc/rpc_scan.c 2013-09-13 10:49:06.000000000 +0200 @@ -37,7 +37,11 @@ #include <stdio.h> #include <ctype.h> diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b2ae0ea42..2bc954347 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -62,7 +62,7 @@ GCC_CONFOPTS+= --enable-tls endif ifeq ($(ARCH),powerpc) -GCC_CONFOPTS+= --disable-target-optspace +GCC_CONFOPTS+= --disable-target-optspace --with-long-double-64 --enable-secureplt else GCC_CONFOPTS+= --enable-target-optspace endif @@ -149,8 +149,6 @@ $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc install-target-libgcc - # -lgcc_eh workaround - (cd $(STAGING_HOST_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) && ln -sf libgcc.a libgcc_eh.a) touch $@ $(GCC_BUILD_DIR_FINAL)/.configured: diff --git a/toolchain/gcc/patches/4.7.3/musl-cross.patch b/toolchain/gcc/patches/4.7.3/musl-cross.patch new file mode 100644 index 000000000..bbba746b0 --- /dev/null +++ b/toolchain/gcc/patches/4.7.3/musl-cross.patch @@ -0,0 +1,861 @@ +diff -Nur gcc-4.7.3.orig/config.sub gcc-4.7.3/config.sub +--- gcc-4.7.3.orig/config.sub 2012-08-06 16:34:27.000000000 +0200 ++++ gcc-4.7.3/config.sub 2013-09-16 15:39:42.000000000 +0200 +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + # 2011 Free Software Foundation, Inc. + +-timestamp='2011-10-29' ++timestamp='2011-03-23' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -125,6 +125,7 @@ + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in |