diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Makefile.inc | 7 | ||||
| -rw-r--r-- | toolchain/elf2flt/Makefile | 3 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/gdb/Makefile.inc | 4 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 12 | ||||
| -rw-r--r-- | toolchain/glibc/patches/2.19/glibc-cross.patch | 86 | ||||
| -rw-r--r-- | toolchain/glibc/patches/2.19/i686_define_bug.patch | 23 | ||||
| -rw-r--r-- | toolchain/glibc/patches/2.19/sparc-darwin.patch | 12 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Makefile | 2 |
10 files changed, 25 insertions, 130 deletions
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index f81e5a80c..ae6320db0 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -2,6 +2,13 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= binutils +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_25),y) +PKG_VERSION:= 2.25 +PKG_RELEASE:= 1 +PKG_HASH:= cccf377168b41a52a76f46df18feb8f7285654b3c1bd69fc8265cb0fc6902f2d +PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y) PKG_VERSION:= 2.24 PKG_RELEASE:= 1 diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index 0b07d4dc0..27d0942a2 100644 --- a/toolchain/elf2flt/Makefile +++ b/toolchain/elf2flt/Makefile @@ -12,6 +12,9 @@ endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_24),y) BINUTILS_VERSION:= 2.24 endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_25),y) +BINUTILS_VERSION:= 2.25 +endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 3db03b107..122e2aef4 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -142,6 +142,10 @@ ifeq ($(ADK_CPU_CORTEX_M3),y) GCC_CONFOPTS+= --with-cpu=cortex-m3 --with-mode=thumb endif +ifeq ($(ADK_CPU_CORTEX_A7),y) +GCC_CONFOPTS+= --with-cpu=cortex-a7 +endif + ifeq ($(ADK_CPU_CORTEX_A9),y) GCC_CONFOPTS+= --with-cpu=cortex-a9 endif diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 68a054950..edfec2cd8 100644 --- a/toolchain/gdb/Makefile.inc +++ b/toolchain/gdb/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gdb -PKG_VERSION:= 7.8 +PKG_VERSION:= 7.8.2 PKG_RELEASE:= 1 -PKG_HASH:= 49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875 +PKG_HASH:= 605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485 PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 5da057219..1faf1e639 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -15,7 +15,7 @@ include ${ADK_TOPDIR}/mk/buildhlp.mk GLIBC_MAKEOPTS+= cross-compiling=yes ifeq (${ADK_MAKE_PARALLEL},y) -GLIBC_MAKEOPTS+= PARALLELMFLAGS="-j1" +GLIBC_MAKEOPTS+= PARALLELMFLAGS="-j$(ADK_MAKE_JOBS)" endif GLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 2a8222729..2b6bdcef0 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -6,17 +6,17 @@ ifeq ($(ADK_LIBC_VERSION),git) PKG_VERSION:= 2.19.90 PKG_REPO:= git://sourceware.org/git/glibc.git endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_20),y) -PKG_VERSION:= 2.20 +ifeq ($(ADK_TARGET_LIB_GLIBC_2_21),y) +PKG_VERSION:= 2.21 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_RELEASE:= 1 -PKG_HASH:= f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 +PKG_HASH:= aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_19),y) -PKG_VERSION:= 2.19 +ifeq ($(ADK_TARGET_LIB_GLIBC_2_20),y) +PKG_VERSION:= 2.20 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_RELEASE:= 1 -PKG_HASH:= 2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2 +PKG_HASH:= f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ diff --git a/toolchain/glibc/patches/2.19/glibc-cross.patch b/toolchain/glibc/patches/2.19/glibc-cross.patch deleted file mode 100644 index a1903179d..000000000 --- a/toolchain/glibc/patches/2.19/glibc-cross.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Nur glibc-2.19.orig/sunrpc/rpc/types.h glibc-2.19/sunrpc/rpc/types.h ---- glibc-2.19.orig/sunrpc/rpc/types.h 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/sunrpc/rpc/types.h 2014-03-03 13:42:42.000000000 +0100 -@@ -74,19 +74,24 @@ - # define __daddr_t_defined - #endif - --#ifndef __u_char_defined --typedef __u_char u_char; --typedef __u_short u_short; --typedef __u_int u_int; --typedef __u_long u_long; --typedef __quad_t quad_t; --typedef __u_quad_t u_quad_t; --typedef __fsid_t fsid_t; --# define __u_char_defined -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+#if __WORDSIZE == 64 -+#ifndef __APPLE__ -+typedef long int quad_t; -+typedef unsigned long int u_quad_t; -+#endif -+#elif defined __GLIBC_HAVE_LONG_LONG -+typedef long long int quad_t; -+typedef unsigned long long int u_quad_t; - #endif --#ifndef __daddr_t_defined --typedef __daddr_t daddr_t; --typedef __caddr_t caddr_t; -+ -+# define __u_char_defined -+#if !defined(__daddr_t_defined) && defined(linux) -+typedef long int daddr_t; -+typedef char *caddr_t; - # define __daddr_t_defined - #endif - -diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c ---- glibc-2.19.orig/sunrpc/rpc_main.c 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/sunrpc/rpc_main.c 2014-03-04 07:12:00.000000000 +0100 -@@ -38,7 +38,11 @@ - #include <stdio.h> - #include <string.h> - #include <unistd.h> -+#ifdef __APPLE__ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif - #include <locale.h> - #include <ctype.h> - #include <sys/types.h> -@@ -958,10 +962,12 @@ - abort (); - temp = rindex (cmd->infile, '.'); - cp = stpcpy (mkfilename, "Makefile."); -- if (temp != NULL) -- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; -- else -+ if (temp != NULL) { -+ strncpy (cp, cmd->infile, temp - cmd->infile); -+ cp[temp - cmd->infile - 1] = '\0'; -+ } else { - stpcpy (cp, cmd->infile); -+ } - - } - else -diff -Nur glibc-2.19.orig/sunrpc/rpc_scan.c glibc-2.19/sunrpc/rpc_scan.c ---- glibc-2.19.orig/sunrpc/rpc_scan.c 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/sunrpc/rpc_scan.c 2014-03-04 07:11:29.000000000 +0100 -@@ -37,7 +37,11 @@ - #include <stdio.h> - #include <ctype.h> - #include <string.h> -+#ifdef __APPLE__ -+#define gettext(X) (X) -+#else - #include <libintl.h> -+#endif - #include "rpc_scan.h" - #include "rpc_parse.h" - #include "rpc_util.h" diff --git a/toolchain/glibc/patches/2.19/i686_define_bug.patch b/toolchain/glibc/patches/2.19/i686_define_bug.patch deleted file mode 100644 index cef7440b8..000000000 --- a/toolchain/glibc/patches/2.19/i686_define_bug.patch +++ /dev/null @@ -1,23 +0,0 @@ - Fix for compiling glibc with -march=i686 specified. - The patch below found at: http://permalink.gmane.org/gmane.linux.lfs.devel/9758, - a nice discussion (with a comment of the glibc maintainer) can be found here: - http://old.nabble.com/-RFC-PATCH--glibc-doesn%27t-build-with-%22gcc--march%3Di686%22-td17442608.html - - To me, this simply shows once more how fucked up things can be. E.g. the (related) bug report here: - http://bugs.gentoo.org/show_bug.cgi?id=201815. There are lots of duplicates to it, many people are - affected, one can find really elaborate reports. And the responsible gentoo developers are too - elite to even point to the actual patch fixing the issue. -diff -Nur glibc-2.16.0.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.16.0/sysdeps/unix/sysv/linux/i386/sysdep.h ---- glibc-2.16.0.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sysdeps/unix/sysv/linux/i386/sysdep.h 2012-08-01 17:56:05.000000000 +0200 -@@ -28,6 +28,10 @@ - #include <dl-sysdep.h> - #include <tls.h> - -+#if defined __i686 && defined __ASSEMBLER__ -+#undef __i686 -+#define __i686 __i686 -+#endif - - /* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h diff --git a/toolchain/glibc/patches/2.19/sparc-darwin.patch b/toolchain/glibc/patches/2.19/sparc-darwin.patch deleted file mode 100644 index 8560a42cf..000000000 --- a/toolchain/glibc/patches/2.19/sparc-darwin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur glibc-2.19.orig/configure glibc-2.19/configure ---- glibc-2.19.orig/configure 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/configure 2014-04-16 23:11:01.000000000 +0200 -@@ -6228,7 +6228,7 @@ - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } - then -- if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then -+ if $READELF -S conftest.so | grep '\.\(rela\|rel\)\.dyn' > /dev/null; then - libc_cv_z_combreloc=yes - else - libc_cv_z_combreloc=no diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 5c39a343c..1b28c151a 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -28,6 +28,8 @@ endif ifneq ($(ADK_DISABLE_TARGET_KERNEL_PATCHES),y) $(TRACE) kernel-target-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ + $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_BOARD)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) + $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) endif ifeq ($(ADK_KERNEL_ADDON_FBLOGO),y) |