[oe] [PATCH] angstrom: Use linux-uclibceabi instead of linux-uclibcgnueabi

[Koen Kooi]

On 04-09-09 16:52, Khem Raj wrote:
> * For uclibc based ARM EABI systems switch to using linux-uclibceabi
>    as TARGET_OS
>
> Signed-off-by: Khem Raj<raj.khem at gmail.com>

I wasn't happy with the other linux-gnu stuff, but since that's in now:

Acked-by: Koen Kooi <koen at openembedded.org>


> ---
>   conf/distro/include/angstrom-2007-for-openmoko.inc |    4 ++--
>   conf/distro/include/angstrom-uclibc.inc            |    2 +-
>   conf/distro/include/angstrom-uclinux-uclibc.inc    |    2 +-
>   .../include/sane-toolchain-uclinux-uclibc.inc      |    2 --
>   4 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
> index 1deb85d..6741bae 100644
> --- a/conf/distro/include/angstrom-2007-for-openmoko.inc
> +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
> @@ -143,8 +143,8 @@ PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc"
>   PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc"
>   PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc"
>
> -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
> -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
> +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc    = "uclibc-initial"
> +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc  = "uclibc-initial"
>
>   # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
>   PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
> diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
> index a60952f..004d904 100644
> --- a/conf/distro/include/angstrom-uclibc.inc
> +++ b/conf/distro/include/angstrom-uclibc.inc
> @@ -9,7 +9,7 @@ USE_NLS_glib-2.0 = "yes"
>   USE_NLS_glib-2.0-native = "yes"
>   USE_NLS_gcc-cross = "no"
>
> -TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
> +TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
>   TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
>
>   #mess with compiler flags to use -Os instead of -O2
> diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
> index 019f814..ad499f7 100644
> --- a/conf/distro/include/angstrom-uclinux-uclibc.inc
> +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
> @@ -6,7 +6,7 @@ USE_NLS_glib-2.0 = "yes"
>   USE_NLS_glib-2.0-native = "yes"
>   USE_NLS_gcc-cross = "no"
>
> -TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
> +TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
>
>   #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
> diff --git a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc
> index b757efb..fbb239a 100644
> --- a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc
> +++ b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc
> @@ -7,8 +7,6 @@ USE_NLS_glib-2.0 = "yes"
>   USE_NLS_glib-2.0-native = "yes"
>   USE_NLS_gcc-cross = "no"
>
> -TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
> -
>   #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"