From ebbe06e97f0ee51a788a93e0e852bdb0e27c37d6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Aug 2009 00:34:30 -0700 Subject: minimal, sane-toolchain: Use eglibc if LIBC is not selected. Currently we fall back to glibc if LIBC is not set. We now will use eglibc as default lib for minimal and sane-toolchain Signed-off-by: Khem Raj --- conf/distro/include/sane-toolchain-eglibc.inc | 2 ++ conf/distro/include/sane-toolchain.inc | 2 +- conf/distro/minimal.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index 4c5f44ff8e..88719f5f33 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -3,6 +3,8 @@ # eglibc: # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" + FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 72fff9869d..07e1455168 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -115,7 +115,7 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" ############################################################################# # Can be "glibc", "eglibc" or "uclibc" -LIBC ?= "glibc" +LIBC ?= "eglibc" require conf/distro/include/${LIBC}.inc PSTAGE_EXTRAPATH = "${LIBC}" require conf/distro/include/sane-toolchain-${LIBC}.inc diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 2eb4817b9c..fa2a926a1d 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -73,7 +73,7 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -LIBC ?= "glibc" +LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# -- cgit v1.2.3