diff options
| -rw-r--r-- | target/config/Config.in.libc | 12 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index c86214324..9d63b957f 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -41,6 +41,7 @@ config ADK_TARGET_LIB_GLIBC depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_H8300 depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_SPARC depends on !ADK_TARGET_ARCH_XTENSA depends on !ADK_TARGET_UCLINUX depends on !ADK_TARGET_WITHOUT_MMU @@ -89,6 +90,10 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG +config ADK_TARGET_LIB_GLIBC_2_23 + bool "2.23" + depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_OR1K + config ADK_TARGET_LIB_GLIBC_2_22 bool "2.22" depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \ @@ -99,11 +104,6 @@ config ADK_TARGET_LIB_GLIBC_2_21 depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \ && !ADK_TARGET_ARCH_OR1K -config ADK_TARGET_LIB_GLIBC_2_20 - bool "2.20" - depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \ - && !ADK_TARGET_ARCH_OR1K - config ADK_TARGET_LIB_GLIBC_OR1K bool "2.20-or1k" depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_OR1K @@ -177,9 +177,9 @@ config ADK_LIBC_VERSION default "1.1.13" if ADK_TARGET_LIB_MUSL_1_1_13 default "1.1.12" if ADK_TARGET_LIB_MUSL_1_1_12 default "1.1.11" if ADK_TARGET_LIB_MUSL_1_1_11 + default "2.23" if ADK_TARGET_LIB_GLIBC_2_23 default "2.22" if ADK_TARGET_LIB_GLIBC_2_22 default "2.21" if ADK_TARGET_LIB_GLIBC_2_21 - default "2.20" if ADK_TARGET_LIB_GLIBC_2_20 default "2.20-or1k" if ADK_TARGET_LIB_GLIBC_OR1K default "2.2.0" if ADK_TARGET_LIB_NEWLIB_2_2_0 default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \ diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 4740023e3..f7cfc9b2e 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -7,6 +7,12 @@ PKG_VERSION:= 2.22.90 PKG_SITES:= git://sourceware.org/git/glibc.git PKG_RELEASE:= 1 endif +ifeq ($(ADK_TARGET_LIB_GLIBC_2_23),y) +PKG_VERSION:= 2.23 +PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} +PKG_RELEASE:= 1 +PKG_HASH:= 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 +endif ifeq ($(ADK_TARGET_LIB_GLIBC_2_22),y) PKG_VERSION:= 2.22 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} @@ -19,18 +25,6 @@ PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_RELEASE:= 1 PKG_HASH:= aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_20),y) -PKG_VERSION:= 2.20 -PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} -PKG_RELEASE:= 1 -PKG_HASH:= f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 -endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_19),y) -PKG_VERSION:= 2.19 -PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} -PKG_RELEASE:= 1 -PKG_HASH:= 2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2 -endif ifeq ($(ADK_TARGET_LIB_GLIBC_OR1K),y) PKG_VERSION:= 2.19.90 PKG_SITES:= https://github.com/bluecmd/or1k-glibc.git |