From 6932c0485925fecf18eed354aed61c3d65e60039 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 20 Sep 2014 19:38:56 -0700
Subject: [PATCH] angstrom: Adjust to eglibc -> glibc change in OE-Core

Default to glibc now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/distro/angstrom-next.conf         |  2 +-
 conf/distro/include/angstrom-glibc.inc | 40 +++++++-------------------
 conf/distro/include/angstrom.inc       |  6 ++--
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/conf/distro/angstrom-next.conf b/conf/distro/angstrom-next.conf
index 953eae7..03906ec 100644
--- a/conf/distro/angstrom-next.conf
+++ b/conf/distro/angstrom-next.conf
@@ -52,7 +52,7 @@ IMAGE_LINGUAS ?= '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)
 FEED_BASEPATH = "feeds/next/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. udev/systemd) require a recent version to build against
-LINUX_LIBC_HEADERS_VERSION                       ?= "3.14%"
+LINUX_LIBC_HEADERS_VERSION                       ?= "3.16%"
 PREFERRED_VERSION_linux-libc-headers              = "${LINUX_LIBC_HEADERS_VERSION}"
 PREFERRED_VERSION_linux-libc-headers-native       = "${LINUX_LIBC_HEADERS_VERSION}"
 PREFERRED_VERSION_nativesdk-linux-libc-headers    = "${LINUX_LIBC_HEADERS_VERSION}"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 2a6e8de..5fb623c 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -1,41 +1,21 @@
 # glibc:
-require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc
-
 PNBLACKLIST[libiconv] = "the glibc provided iconv library is used"
 
 TARGET_OS = "linux"
-TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 
-#mess with compiler flags to use -Os instead of -O2
-#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
+# sane-toolchain.inc has this, and explains the GNU and ABI suffices:
+#TARGET_OS = "${@compute_os_portion_of_target_triplet(d)}"
+
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TUNE_PKGARCH',d,1) in ['ppce500', 'ppce500v2']]}"
+
 # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os"
 
-FULL_OPTIMIZATION_pn-perl = "-O1"
-FULL_OPTIMIZATION_ep9312 = "-O -fno-signed-zeros -pipe ${DEBUG_FLAGS}"
-
-# This is only used for -native packages
-BUILD_OPTIMIZATION_pn-perl-native = "-O1"
-
 TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
 
-# Disable -Wl,as-needed for now till all the test come back OK
-#require conf/distro/include/angstrom-ldflags.inc
-
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-LIBC_DEPENDENCIES = "\
-    libsegfault \
-    glibc \
-    glibc-dbg \
-    glibc-dev \
-    glibc-utils \
-    glibc-thread-db \
-    glibc-localedata-i18n \
-    glibc-gconv-ibm850 \
-    glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-1 \
-    glibc-gconv-iso8859-15 \
-    locale-base-en-gb \
-    "
+# We use gold as default linker for arm/x86 on eglibc based images
+DISTRO_FEATURES_append_arm = " ld-is-gold"
+DISTRO_FEATURES_append_x86 = " ld-is-gold"
+DISTRO_FEATURES_append_x86-64 = " ld-is-gold"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 47a7807..5978ebb 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -33,11 +33,11 @@ MACHINEOVERRIDES .= ":${@bb.data.getVar('FEED_ARCH', d,1).replace('all','noarch'
 #INHERIT += "src_distribute_local"
 SRC_DIST_LOCAL ?= "symlink"
 
-# Can be "glibc", "eglibc" or "uclibc"
-TCLIBC ?= "eglibc"
+# Can be "glibc", "musl" or "uclibc"
+TCLIBC ?= "glibc"
 
 # The things *libc can provide.
-PREFERRED_PROVIDER_eglibc = "eglibc"
+PREFERRED_PROVIDER_eglibc = "glibc"
 
 PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk"