summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/libstdcxx/Makefile2
-rw-r--r--target/config/Config.in.compiler4
-rw-r--r--target/config/Config.in.libc4
-rw-r--r--toolchain/newlib/Makefile1
-rw-r--r--toolchain/newlib/Makefile.inc6
-rw-r--r--toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch14
-rw-r--r--toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch14
-rw-r--r--toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch12
-rw-r--r--toolchain/newlib/patches/2.4.0/fix-tooldir.patch12
-rw-r--r--toolchain/newlib/patches/2.5.0/fix-tooldir.patch (renamed from toolchain/newlib/patches/2.2.0.20151023/fix-tooldir.patch)0
10 files changed, 8 insertions, 61 deletions
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 0f229ea72..c3b3b4eb7 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -19,7 +19,7 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-install:
-ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY),)
+ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_ARCH_METAG),)
${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
ifeq ($(ADK_TARGET_ARCH_SH),y)
ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index 75a777745..a465cb66c 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -21,7 +21,7 @@ default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
default ADK_TOOLCHAIN_GCC_4_2 if ADK_TARGET_ARCH_METAG
default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_ARCH_LM32
+default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_ARCH_LM32 && !ADK_TARGET_LIB_NEWLIB
default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_SYSTEM_KINETIS_K70
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_XTENSA
@@ -32,6 +32,7 @@ default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_CR16
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_H8300
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_FRV
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_M32R
+default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_LM32 && ADK_TARGET_LIB_NEWLIB
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_CPU_MIPS_MIPS32R6 || ADK_TARGET_CPU_MIPS64_MIPS64R6
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_S390
default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_SYSTEM_NUMATO_MIMASV2
@@ -53,7 +54,6 @@ config ADK_TOOLCHAIN_GCC_6
depends on !ADK_TARGET_ARCH_METAG
depends on !ADK_TARGET_ARCH_NDS32
depends on !ADK_TARGET_ARCH_OR1K
- depends on !ADK_TARGET_ARCH_LM32
select ADK_DISABLE_HONOUR_CFLAGS
config ADK_TOOLCHAIN_GCC_5
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index a360c48b7..821968750 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -151,8 +151,8 @@ config ADK_TARGET_LIB_MUSL_GIT
bool "git"
depends on ADK_TARGET_LIB_MUSL
-config ADK_TARGET_LIB_NEWLIB_2_4_0
- bool "2.4.0"
+config ADK_TARGET_LIB_NEWLIB_2_5_0
+ bool "2.5.0"
depends on ADK_TARGET_LIB_NEWLIB
config ADK_TARGET_LIB_NEWLIB_GIT
diff --git a/toolchain/newlib/Makefile b/toolchain/newlib/Makefile
index 246927667..affbe239a 100644
--- a/toolchain/newlib/Makefile
+++ b/toolchain/newlib/Makefile
@@ -11,7 +11,6 @@ $(WRKBUILD)/.configured:
CC='' \
CFLAGS='' \
LDFLAGS='' \
- have_doc='' \
./configure --prefix=/usr \
--target=$(GNU_TARGET_NAME) \
--enable-newlib-io-long-long \
diff --git a/toolchain/newlib/Makefile.inc b/toolchain/newlib/Makefile.inc
index 222a1496d..af2850d10 100644
--- a/toolchain/newlib/Makefile.inc
+++ b/toolchain/newlib/Makefile.inc
@@ -8,10 +8,10 @@ PKG_RELEASE:= 1
PKG_SITES:= git://sourceware.org/git/newlib-cygwin.git
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
endif
-ifeq ($(ADK_TARGET_LIB_NEWLIB_2_4_0),y)
-PKG_VERSION:= 2.4.0
+ifeq ($(ADK_TARGET_LIB_NEWLIB_2_5_0),y)
+PKG_VERSION:= 2.5.0
PKG_RELEASE:= 1
-PKG_HASH:= 545b3d235e350d2c61491df8b9f775b1b972f191380db8f52ec0b1c829c52706
+PKG_HASH:= 5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b
PKG_SITES:= ftp://sourceware.org/pub/newlib/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
diff --git a/toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch b/toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch
deleted file mode 100644
index 3b500b61c..000000000
--- a/toolchain/newlib/patches/2.2.0.20151023/disable-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur newlib-2.2.0-1.orig/etc/Makefile.in newlib-2.2.0-1/etc/Makefile.in
---- newlib-2.2.0-1.orig/etc/Makefile.in 2010-11-20 20:37:57.000000000 +0100
-+++ newlib-2.2.0-1/etc/Makefile.in 2015-12-03 14:23:44.043820971 +0100
-@@ -63,8 +63,8 @@
- PDFFILES = standards.pdf configure.pdf
- HTMLFILES = standards.html configure.html
-
--all: info
--install install-strip: install-info
-+all:
-+install install-strip:
-
- uninstall:
-
diff --git a/toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch b/toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch
deleted file mode 100644
index 3b500b61c..000000000
--- a/toolchain/newlib/patches/2.3.0.20160226/disable-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur newlib-2.2.0-1.orig/etc/Makefile.in newlib-2.2.0-1/etc/Makefile.in
---- newlib-2.2.0-1.orig/etc/Makefile.in 2010-11-20 20:37:57.000000000 +0100
-+++ newlib-2.2.0-1/etc/Makefile.in 2015-12-03 14:23:44.043820971 +0100
-@@ -63,8 +63,8 @@
- PDFFILES = standards.pdf configure.pdf
- HTMLFILES = standards.html configure.html
-
--all: info
--install install-strip: install-info
-+all:
-+install install-strip:
-
- uninstall:
-
diff --git a/toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch b/toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch
deleted file mode 100644
index 652f7494b..000000000
--- a/toolchain/newlib/patches/2.3.0.20160226/fix-tooldir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur newlib-2.2.0-1.orig/configure newlib-2.2.0-1/configure
---- newlib-2.2.0-1.orig/configure 2014-07-05 23:09:07.000000000 +0200
-+++ newlib-2.2.0-1/configure 2015-11-25 06:33:11.461178398 +0100
-@@ -6985,7 +6985,7 @@
-
- # Some systems (e.g., one of the i386-aix systems the gas testers are
- # using) don't handle "\$" correctly, so don't use it here.
--tooldir='${exec_prefix}'/${target_noncanonical}
-+tooldir='${exec_prefix}'
- build_tooldir=${tooldir}
-
- # Create a .gdbinit file which runs the one in srcdir
diff --git a/toolchain/newlib/patches/2.4.0/fix-tooldir.patch b/toolchain/newlib/patches/2.4.0/fix-tooldir.patch
deleted file mode 100644
index 652f7494b..000000000
--- a/toolchain/newlib/patches/2.4.0/fix-tooldir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur newlib-2.2.0-1.orig/configure newlib-2.2.0-1/configure
---- newlib-2.2.0-1.orig/configure 2014-07-05 23:09:07.000000000 +0200
-+++ newlib-2.2.0-1/configure 2015-11-25 06:33:11.461178398 +0100
-@@ -6985,7 +6985,7 @@
-
- # Some systems (e.g., one of the i386-aix systems the gas testers are
- # using) don't handle "\$" correctly, so don't use it here.
--tooldir='${exec_prefix}'/${target_noncanonical}
-+tooldir='${exec_prefix}'
- build_tooldir=${tooldir}
-
- # Create a .gdbinit file which runs the one in srcdir
diff --git a/toolchain/newlib/patches/2.2.0.20151023/fix-tooldir.patch b/toolchain/newlib/patches/2.5.0/fix-tooldir.patch
index 652f7494b..652f7494b 100644
--- a/toolchain/newlib/patches/2.2.0.20151023/fix-tooldir.patch
+++ b/toolchain/newlib/patches/2.5.0/fix-tooldir.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 12:43:31 +0000