Skip to contentSkip to conversation

angstrom: Use linux-uclibceabi instead of linux-uclibcgnueabi

PATCH In review Khem Raj 2 participants 3 messages Sep 4, 2009

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 angstrom: Use linux-uclibceabi instead of linux-uclibcgnueabi

* For uclibc based ARM EABI systems switch to using linux-uclibceabi as TARGET_OS

---
 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(-)
conf/distro/include/angstrom-2007-for-openmoko.inc +2 -2
index 1deb85d..6741bae 100644
@@ -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"
conf/distro/include/angstrom-uclibc.inc +1 -1
index a60952f..004d904 100644
@@ -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
conf/distro/include/angstrom-uclinux-uclibc.inc +1 -1
index 019f814..ad499f7 100644
@@ -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
conf/distro/include/sane-toolchain-uclinux-uclibc.inc +0 -2
index b757efb..fbb239a 100644
@@ -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"
Signature · 1 line
1.6.3.3
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Khem Raj

* For uclibc based ARM EABI systems switch to using linux-uclibceabi as TARGET_OS

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

Quoted 61 lines
---
  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(-)
conf/distro/include/angstrom-2007-for-openmoko.inc +2 -2
index 1deb85d..6741bae 100644
@@ -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"
conf/distro/include/angstrom-uclibc.inc +1 -1
index a60952f..004d904 100644
@@ -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
conf/distro/include/angstrom-uclinux-uclibc.inc +1 -1
index 019f814..ad499f7 100644
@@ -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
conf/distro/include/sane-toolchain-uclinux-uclibc.inc +0 -2
index b757efb..fbb239a 100644
@@ -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"
author
#2 lore raw
Quoted 10 lines · Koen Kooi
Quoted 5 lines · Khem Raj

* For uclibc based ARM EABI systems switch to using linux-uclibceabi as TARGET_OS

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

Thanks. Yes its gross but it I think/hope it will be helpful.

Quoted 106 lines
Quoted 87 lines

---
 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(-)
conf/distro/include/angstrom-2007-for-openmoko.inc +0 -0
index 1deb85d..6741bae 100644
@@ -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"
conf/distro/include/angstrom-uclibc.inc +0 -0
index a60952f..004d904 100644
@@ -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

conf/distro/include/angstrom-uclinux-uclibc.inc +0 -0
index 019f814..ad499f7 100644
@@ -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

conf/distro/include/sane-toolchain-uclinux-uclibc.inc +0 -0
index b757efb..fbb239a 100644
@@ -7,8 +7,6 @@ USE_NLS_glib-2.0 = "yes"

 USE_NLS_glib-2.0-native = "yes"
 USE_NLS_gcc-cross = "no"

Quoted 11 lines

-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"

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel