summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/eglibc/Makefile.inc4
-rw-r--r--toolchain/eglibc/patches/sparc-libm.patch84
-rw-r--r--toolchain/gcc/Makefile6
-rw-r--r--toolchain/uClibc/Makefile21
4 files changed, 19 insertions, 96 deletions
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 5c59d9d2e..abb6879c3 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.18
+PKG_VERSION:= 2.19
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2e4aad1b953daa997debe48fe10862cc
+PKG_MD5SUM:= b54dfce017ee3132f7b2a8d8f46067cf
PKG_SITES:= http://openadk.org/distfiles/
EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
--without-cvs \
diff --git a/toolchain/eglibc/patches/sparc-libm.patch b/toolchain/eglibc/patches/sparc-libm.patch
deleted file mode 100644
index fc8b4cc36..000000000
--- a/toolchain/eglibc/patches/sparc-libm.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Nur eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S
---- eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S 2013-09-13 10:20:20.000000000 +0200
-+++ eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdimf.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,35 +0,0 @@
--/* Compute positive difference, sparc 32-bit.
-- Copyright (C) 2013 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by David S. Miller <davem@davemloft.net>.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, see
-- <http://www.gnu.org/licenses/>. */
--
--#include <sysdep.h>
--
--ENTRY(__fdimf)
-- st %o0, [%sp + 72]
-- st %o1, [%sp + 76]
-- ld [%sp + 72], %f0
-- ld [%sp + 76], %f1
-- fcmps %f0, %f1
-- fbug 1f
-- st %g0, [%sp + 72]
-- ld [%sp + 72], %f0
-- fnegs %f0, %f1
--1: retl
-- fsubs %f0, %f1, %f0
--END(__fdimf)
--weak_alias (__fdimf, fdimf)
-diff -Nur eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S
---- eglibc-2.18.orig/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S 2013-09-13 10:20:20.000000000 +0200
-+++ eglibc-2.18/libc/sysdeps/sparc/sparc32/fpu/s_fdim.S 1970-01-01 01:00:00.000000000 +0100
-@@ -1,41 +0,0 @@
--/* Compute positive difference, sparc 32-bit.
-- Copyright (C) 2013 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by David S. Miller <davem@davemloft.net>.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, see
-- <http://www.gnu.org/licenses/>. */
--
--#include <sysdep.h>
--#include <math_ldbl_opt.h>
--
--ENTRY(__fdim)
-- std %o0, [%sp + 72]
-- std %o2, [%sp + 80]
-- ldd [%sp + 72], %f0
-- ldd [%sp + 80], %f2
-- fcmpd %f0, %f2
-- st %g0, [%sp + 72]
-- fbug 1f
-- st %g0, [%sp + 76]
-- ldd [%sp + 72], %f0
-- fnegd %f0, %f2
--1: retl
-- fsubd %f0, %f2, %f0
--END(__fdim)
--weak_alias (__fdim, fdim)
--
--#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
--compat_symbol (libm, __fdim, fdiml, GLIBC_2_1);
--#endif
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 7566d3f20..32710c9bd 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -94,7 +94,11 @@ GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vf
endif
ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y)
-GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard
+ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
+GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=thumb
+else
+GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard --with-mode=arm
+endif
endif
ifneq ($(ADK_TARGET_ABI),)
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index f84575a3c..3c4af868e 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -39,19 +39,22 @@ $(WRKBUILD)/.headers:
sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \
$(TOPDIR)/target/$(ADK_TARGET_ARCH)/$(UCLIBCCFG) >${WRKBUILD}/.config
ifeq ($(ADK_TARGET_ABI_N64),y)
- $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
endif
ifeq ($(ADK_TARGET_ABI_N32),y)
- $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
endif
ifeq ($(ADK_TARGET_ABI_O32),y)
- $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
- $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+ $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif
+ifeq ($(ADK_PACKAGE_GDB),y)
+ $(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config
endif
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config