From 1b222351b72da54ac47eb918e8837f927f7f8af1 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 18 May 2011 17:23:38 +0100 Subject: remove now-unused config files --- conf/distro/include/eglibc-internal.inc | 1 - conf/distro/include/eglibc.inc | 28 ---- conf/distro/include/sane-toolchain-eglibc.inc | 26 ---- conf/distro/include/sane-toolchain-uclibc.inc | 47 ------ conf/distro/include/sane-toolchain.inc | 214 -------------------------- conf/distro/include/toolchain-internal.inc | 7 - conf/distro/include/uclibc-internal.inc | 1 - conf/distro/include/uclibc.inc | 19 --- 8 files changed, 343 deletions(-) delete mode 100644 conf/distro/include/eglibc-internal.inc delete mode 100644 conf/distro/include/eglibc.inc delete mode 100644 conf/distro/include/sane-toolchain-eglibc.inc delete mode 100644 conf/distro/include/sane-toolchain-uclibc.inc delete mode 100644 conf/distro/include/sane-toolchain.inc delete mode 100644 conf/distro/include/toolchain-internal.inc delete mode 100644 conf/distro/include/uclibc-internal.inc delete mode 100644 conf/distro/include/uclibc.inc diff --git a/conf/distro/include/eglibc-internal.inc b/conf/distro/include/eglibc-internal.inc deleted file mode 100644 index 80e07d9..0000000 --- a/conf/distro/include/eglibc-internal.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/distro/include/${LIBC}.inc diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc deleted file mode 100644 index cd66442..0000000 --- a/conf/distro/include/eglibc.inc +++ /dev/null @@ -1,28 +0,0 @@ -# Add glibc overrides to the overrides for eglibc. -OVERRIDES =. "libc-glibc:" - -# The things eglibc can provide. We default to wanting eglibc to provide them. -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" -PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" -PREFERRED_PROVIDER_virtual/libc = "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc" - -# eglibc is configured for OLDEST_KERNEL kernel version, so we set minimal -# sane versions there - -OLDEST_KERNEL ?= "2.4.0" - -# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi" -# TARGET_OS here, not on architecture which is 'arm' in both cases -OLDEST_KERNEL_linux-gnueabi ?= "2.6.16" -OLDEST_KERNEL_sparc64 ?= "2.4.21" -OLDEST_KERNEL_ppc64 ?= "2.4.21" -DISTRO_FEATURES_EGLIBC ?= "ipv6 backtrace big-macros bsd cxx-tests catgets \ - charsets crypt crypt-ufc db-aliases envz fcvt fmtmsg \ - fstab ftraverse getlogin idn inet inet-anl libm \ - libm-big locales locale-code memusage nis nsswitch \ - rcmd rtld-debug spawn streams sunrpc utmp utmpx \ - wordexp posix-clang-wchar posix-regexp \ - posix-regexp-glibc posix-wchar-io" - diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc deleted file mode 100644 index d38ca5d..0000000 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ /dev/null @@ -1,26 +0,0 @@ -# Originally brought to you by the Angstrom Distribution - -# eglibc: -# [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os ${DEBUG_FLAGS}" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1 ${DEBUG_FLAGS}" -FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" - -# gcc 4.4 and 4.5 has a problem with 'leakage' into libgcc.a with -Os -FULL_OPTIMIZATION_powerpc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" - -# JaMa: I promise to report bug upstream, but as it can take a while to fix it, I'll switch to -O2 here -# Tested with gcc-4.4.2 and gcc-4.4.3 on armv4t and armv5te and it fails with -Os, with gcc-4.3.3 it works OK with -Os -# Here is testcase, but you have to rebuild whole libqtxml to test it -# http://lists.shr-project.org/pipermail/shr-devel/2010-February/002169.html -FULL_OPTIMIZATION_pn-qt4-x11-free = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" -# This I've seen only on armv4t, it segfaults when called from pisi, but whole test unit suite can pass -FULL_OPTIMIZATION_pn-libsyncml = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 ${DEBUG_FLAGS}" - -BUILD_OPTIMIZATION_pn-perl = "-O1" -BUILD_OPTIMIZATION_sparc = "-O2" - -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" - -CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc deleted file mode 100644 index b51cdaf..0000000 --- a/conf/distro/include/sane-toolchain-uclibc.inc +++ /dev/null @@ -1,47 +0,0 @@ -# Originally brought to you by the Angstrom Distribution - -# uclibc: - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" - -USE_NLS ?= "no" -USE_NLS_glib-2.0-native = "yes" -USE_NLS_gcc-cross = "no" - -PREFERRED_VERSION_uclibc ?= "${PREFERRED_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-initial ?= "${PREFERRED_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-cross ?= "${PREFERRED_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-cross-sdk ?= "${PREFERRED_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-cross-initial ?= "${PREFERRED_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-cross-intermediate ?= "${PREFERRED_UCLIBC_VERSION}" - -#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 -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -pipe ${DEBUG_FLAGS}" -BUILD_OPTIMIZATION += "-pipe" - -# -Os compiled root file system does not boot for powerpc, root cause it still at large -# we use -O2 meanwhile -FULL_OPTIMIZATION_powerpc = "-O2 -pipe ${DEBUG_FLAGS}" - -#Gcc will die with 'internal consistency error when using the above optimizations -#with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports). -#However, some packages require optimizations to compile (e.g. libmad). -#It appears the guilty optimization is "-frename-registers", leaving that one -#out allows the build to proceed normally. -fexpensive-optimizations may be OK, -#it was removed while debugging an issue that ultimately turned out to be due -#to the ICE fixed by gcc-pr32889.patch. It needs to be tested again. -#Note that this testing was done without the gcc-pr32889.patch. -FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer ${DEBUG_FLAGS}" - -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]}" - -CXXFLAGS += "-fvisibility-inlines-hidden" - - diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc deleted file mode 100644 index 5882fd7..0000000 --- a/conf/distro/include/sane-toolchain.inc +++ /dev/null @@ -1,214 +0,0 @@ -# Originally brought to you by the Angstrom Distribution - -############################################################################# -# TOOLCHAIN VERSION SETTINGS -############################################################################# - -# Base line versions, good for most things -PREFERRED_GCC_VERSION ?= "4.5" -PREFERRED_BINUTILS_VERSION ?= "2.21" -PREFERRED_UCLIBC_VERSION ?= "git" -PREFERRED_EGLIBC_VERSION ?= "2.12" -PREFERRED_GLIBC_VERSION ?= "2.10.1" -# we need hard assignment here, because bitbake.conf has -# weak "no" first so weak "yes" here won't override it -# also use hard assignment for version to make sure it's -# new enough for SYSROOT support -PREFERRED_LIBTOOL_VERSION = "2.4" -LIBTOOL_HAS_SYSROOT = "yes" - -# Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. -PREFERRED_VERSION_glibc ?= "${PREFERRED_GLIBC_VERSION}" -PREFERRED_VERSION_glibc-initial ?= "${PREFERRED_GLIBC_VERSION}" -PREFERRED_VERSION_eglibc ?= "${PREFERRED_EGLIBC_VERSION}" -PREFERRED_VERSION_eglibc-initial ?= "${PREFERRED_EGLIBC_VERSION}" - -# Some systems need a special gcc version -PREFERRED_GCC_VERSION_486sx ?= "4.3.2" -PREFERRED_GCC_VERSION_avr32 ?= "4.2.2" -PREFERRED_GCC_VERSION_bfin ?= "4.1.2" -PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" - -# This is unrelated to the kernel version, but glibc and some userspaceapps require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.31" - -# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) -#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53" - -# Binutils -PREFERRED_VERSION_binutils ?= "${PREFERRED_BINUTILS_VERSION}" -PREFERRED_VERSION_binutils-cross ?= "${PREFERRED_BINUTILS_VERSION}" -PREFERRED_VERSION_binutils-cross-sdk ?= "${PREFERRED_BINUTILS_VERSION}" - -# Avr32 only has patches for binutils 2.17 in OE -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" - -# Compiler versions -PREFERRED_VERSION_gcc ?= "${PREFERRED_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross ?= "${PREFERRED_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-sdk ?= "${PREFERRED_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-initial ?= "${PREFERRED_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-intermediate ?= "${PREFERRED_GCC_VERSION}" - -# Others -PREFERRED_VERSION_libtool = "${PREFERRED_LIBTOOL_VERSION}" -PREFERRED_VERSION_libtool-cross = "${PREFERRED_LIBTOOL_VERSION}" -PREFERRED_VERSION_libtool-native = "${PREFERRED_LIBTOOL_VERSION}" -PREFERRED_VERSION_libtool-sdk = "${PREFERRED_LIBTOOL_VERSION}" -PREFERRED_VERSION_libtool-nativesdk = "${PREFERRED_LIBTOOL_VERSION}" - -############################################################################# -# TOOLCHAIN CUSTOMIZATION -############################################################################# - -# Branding -TARGET_VENDOR = "-oe" - -# Compiler selection -TOOLCHAIN_TYPE ?= "internal" -require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc - -# Add BASE_PACKAGE_ARCH to the overrides list so that we can override the -# ARM_INSTRUCTION_SET like below - -OVERRIDES =. "${BASE_PACKAGE_ARCH}:" - -# ARM920T and up can use thumb mode to decrease binary size at the expense of speed -# (the complete story is a bit more nuanced due to cache starvation) -# Minimal turns on thumb for armv4t machine according to this RFC: -# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html - -# We can't set ARM_INSTRUCTION_SET_ directly since that will un-overridable in recipes like gcc -PREFERRED_ARM_INSTRUCTION_SET_armv4t = "thumb" -PREFERRED_ARM_INSTRUCTION_SET_armv5te = "thumb" -PREFERRED_ARM_INSTRUCTION_SET_armv5teb = "thumb" -PREFERRED_ARM_INSTRUCTION_SET ?= "arm" -ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" -# "arm" "thumb" -# The instruction set the compiler should use when generating application -# code. The kernel is always compiled with arm code at present. arm code -# is the original 32 bit ARM instruction set, thumb code is the 16 bit -# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) -# but requires more instructions (140% for 70% smaller code) so may be -# slower. - -THUMB_INTERWORK = "yes" -# "yes" "no" -# Whether to compile with code to allow interworking between the two -# instruction sets. This allows thumb code to be executed on a primarily -# arm system and vice versa. It is strongly recommended that DISTROs not -# turn this off - the actual cost is very small. - -# We don't want to keep OABI compat -ARM_KEEP_OABI = "0" - -# ARM EABI is softfloat by default, but let's make sure :) -# make it overridable for platforms with FPU, like ep93xx or i.mx31 -TARGET_FPU_arm ?= "soft" -TARGET_FPU_armeb ?= "soft" -TARGET_FPU_ixp4xx ?= "soft" -TARGET_FPU_ppc405 ?= "soft" - -TARGET_FPU_armv6 ?= "hard" -TARGET_FPU_armv6-novfp ?= "soft" -TARGET_FPU_armv7a ?= "hard" -TARGET_FPU_ppc603e ?= "hard" - -# webkit-gtk and cairo have alignment issues with double instructions on armv5 so -# disable them here. TODO: This knowledge should rather be encoded in the actual -# recipes! -TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t" -TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" - -############################################################################# -# C LIBRARY SETTINGS -############################################################################# - -# Can be "glibc", "eglibc" or "uclibc" -LIBC ?= "eglibc" -require conf/distro/include/${LIBC}-${TOOLCHAIN_TYPE}.inc -PSTAGE_EXTRAPATH = "${LIBC}" -require conf/distro/include/sane-toolchain-${LIBC}.inc - -# Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-native" -ENABLE_BINARY_LOCALE_GENERATION ?= "1" - -# We only want to build UTF8 locales -LOCALE_UTF8_ONLY = "1" - -# Qemu doesn't like armv6/eabi/vfp -ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0" -ENABLE_BINARY_LOCALE_GENERATION_armv6-novfp = "0" -ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" - -#qemu has taken a dislike to armeb as well -ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" -def detect_arm_abi (d): - import bb - if bb.data.getVar('DISTRO_FEATURES',d) is None: - if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: - return "oabi" - else: - return "" - if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: - if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d).split(): - return "eabi" - return "oabi" - return "" - -def compute_os_portion_of_target_triplet (d): - import bb - arm_eabi_unsupported_arches = "armv1 armv2 armv3" - ppc_spe_supporting_arches = "ppce500v2 ppce500" - gnu_suffix = "" - if bb.data.getVar('LIBC', d, 1) == "uclibc": - libc_suffix = "uclibc" - else: - libc_suffix = "" - - if bb.data.getVar('TARGET_ARCH',d,1) in ['bfin']: - if libc_suffix is not "uclibc": - bb.fatal("bfin is not supported on glibc/eglibc. Please choose uclibc") - else: - os_suffix = "uclinux" - else: - os_suffix = "linux" - bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1) - - if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \ - bparch is not None: - if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d,1).split() and \ - bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: - if bparch in arm_eabi_unsupported_arches.split(): - bb.fatal("DISTRO requested EABI but selected machine does not support EABI") - abi_suffix = "" - else: - if libc_suffix is not "uclibc": - gnu_suffix = "gnu" - abi_suffix = "eabi" - elif bparch in ppc_spe_supporting_arches.split(): - if libc_suffix is not "uclibc": - gnu_suffix = "gnu" - abi_suffix = "spe" - else: - abi_suffix = "" - else: - bb.note("DISTRO_FEATURES is not set abi suffix not set") - abi_suffix = "" - - if bb.data.getVar('TOOLCHAIN_BRAND', d, 1) is not None and \ - "csl" in bb.data.getVar('TOOLCHAIN_BRAND', d, 1): - gnu_suffix = "gnu" - - if libc_suffix + gnu_suffix + abi_suffix is not "": - return os_suffix + "-" + libc_suffix + gnu_suffix + abi_suffix - else: - return os_suffix - -# This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI = "${@detect_arm_abi(d)}" -TARGET_OS = "${@compute_os_portion_of_target_triplet(d)}" -include conf/distro/include/sane-toolchain-${ARM_ABI}.inc diff --git a/conf/distro/include/toolchain-internal.inc b/conf/distro/include/toolchain-internal.inc deleted file mode 100644 index b875dae..0000000 --- a/conf/distro/include/toolchain-internal.inc +++ /dev/null @@ -1,7 +0,0 @@ -# Toolchain specific virtuals -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/include/uclibc-internal.inc b/conf/distro/include/uclibc-internal.inc deleted file mode 100644 index 80e07d9..0000000 --- a/conf/distro/include/uclibc-internal.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/distro/include/${LIBC}.inc diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc deleted file mode 100644 index 200fac2..0000000 --- a/conf/distro/include/uclibc.inc +++ /dev/null @@ -1,19 +0,0 @@ -# Add uclibc overrides to the overrides. -OVERRIDES =. "libc-uclibc:" - -# The things uclibc can provide. We default to wanting uclibc to provide them. -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "proxy-libintl" -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" - -# libc settings -DISTRO_FEATURES += "${@['', ' nls'][bb.data.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" -MACHINE_FEATURES += "${@['', ' bx'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" -# FIXME: We enable IPv4 per default to avoid alot of breakage. -# FIXME: Figure out an acceptable way to negotiate either -# FIXME: desired features or hard requirements, either top-down or bottom-up. -DISTRO_FEATURES += " ipv4" -- cgit 1.2.3-korg