From cfb0487084cace5890dd206eae955a1a491880ae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Tue, 19 Apr 2016 20:26:09 +0200
Subject: merge

---
 target/config/Config.in.libc | 7 +++++++
 toolchain/glibc/Makefile.inc | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 019b22bf5..9e0d78aa0 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -69,6 +69,7 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_TARGET_ARCH_PPC64 || \
 		ADK_TARGET_ARCH_S390 || \
 		ADK_TARGET_ARCH_SH || \
+		ADK_TARGET_ARCH_SPARC || \
 		ADK_TARGET_ARCH_SPARC64 || \
 		ADK_TARGET_ARCH_TILE || \
 		ADK_TARGET_ARCH_X86 || \
@@ -142,6 +143,11 @@ 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_18
+	bool "2.18"
+	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
@@ -223,6 +229,7 @@ config ADK_LIBC_VERSION
 	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.18" if ADK_TARGET_LIB_GLIBC_2_18
 	default "2.20-or1k" if ADK_TARGET_LIB_GLIBC_OR1K
 	default "2.4.0" if ADK_TARGET_LIB_NEWLIB_2_4_0
 	default "2.3.0" if ADK_TARGET_LIB_NEWLIB_2_3_0
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index f7cfc9b2e..d1f236c93 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -25,6 +25,12 @@ PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 PKG_RELEASE:=		1
 PKG_HASH:=		aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8
 endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_18),y)
+PKG_VERSION:=		2.18
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
+PKG_RELEASE:=		1
+PKG_HASH:=		2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
+endif
 ifeq ($(ADK_TARGET_LIB_GLIBC_OR1K),y)
 PKG_VERSION:=		2.19.90
 PKG_SITES:=		https://github.com/bluecmd/or1k-glibc.git
-- 
cgit v1.2.3