summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorJulian Pidancet <julian.pidancet@gmail.com>2011-12-01 00:01:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-30 23:35:13 +0000
commit0b42b2fc118bef8ce0d1473b146673182f5d1f78 (patch)
tree80f000be38b96e3ef782eeae258399fc57a30be0 /meta/recipes-devtools
parent8ed16b26dfefac4b42766b9f7090bb3b76110fe3 (diff)
downloadopenembedded-core-0b42b2fc118bef8ce0d1473b146673182f5d1f78.tar.gz
openembedded-core-0b42b2fc118bef8ce0d1473b146673182f5d1f78.tar.bz2
openembedded-core-0b42b2fc118bef8ce0d1473b146673182f5d1f78.tar.xz
openembedded-core-0b42b2fc118bef8ce0d1473b146673182f5d1f78.zip
Fix multiarch DISTRO_FEATURE
Make get_gcc_multiarch_setting more elegant. Use a dictionnary to store the config options and replace bb.data.getVar with d.getVar. Remove i686 from the architecture list because it doesn't seem to be a valid TARGET_ARCH any more in OE. Configure gdb (gdb and gdb-cross) with --enable-64-bit-bfd if multiarch DISTRO_FEATURE is present Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc17
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc1
2 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 7ec2f7e46..fe112d9d0 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -22,13 +22,16 @@ def get_gcc_mips_plt_setting(bb, d):
return ""
def get_gcc_multiarch_setting(bb, d):
- if 'multiarch' in bb.data.getVar('DISTRO_FEATURES',d,1).split() :
- if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'i586', 'i686' ] :
- return "--enable-targets=all"
- if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'powerpc' ] :
- return "--enable-targets=powerpc64"
- if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'sparc' ] :
- return "--enable-targets=all"
+ target_arch = d.getVar('TARGET_ARCH', True)
+ multiarch_options = {
+ "i586": "--enable-targets=all",
+ "powerpc": "--enable-targets=powerpc64",
+ "sparc": "--enable-targets=all",
+ }
+
+ if 'multiarch' in d.getVar('DISTRO_FEATURES', True).split() :
+ if target_arch in multiarch_options :
+ return multiarch_options[target_arch]
return ""
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index e01b57cc8..d728139f6 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -41,6 +41,7 @@ EXPAT = "--without-expat"
EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
--with-curses --disable-multilib --with-system-readline --disable-sim \
${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \
+ ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \
"
GDBPROPREFIX = "--program-prefix=''"