summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-08-14 14:05:57 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:50 +0100
commit75191fcd7e152e900f4b092d674b4c0795faf5cc (patch)
tree0416cbe6bcc4728aaf3e111009110ff98a60be73
parent14a2d1eaa161622eb00a26474bd127b0856f7358 (diff)
downloadpoky-75191fcd7e152e900f4b092d674b4c0795faf5cc.tar.gz
gcc: Abstract long double configuration into python function
musl does not support IBM 128 long double for ppc, instead of doing complex overrides move it into a pythong snippet which is easier to read and more compact. (From OE-Core rev: e7011429e40ae96b9c9f1e7f3c6f4c1f1102607f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc5
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc5
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 4c55542280..497d06ae8b 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -25,6 +25,11 @@ def get_gcc_mips_plt_setting(bb, d):
25 return "--with-mips-plt" 25 return "--with-mips-plt"
26 return "" 26 return ""
27 27
28def get_long_double_setting(bb, d):
29 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'eglibc' ]:
30 return "--with-long-double-128"
31 return ""
32
28def get_gcc_multiarch_setting(bb, d): 33def get_gcc_multiarch_setting(bb, d):
29 target_arch = d.getVar('TRANSLATED_TARGET_ARCH', True) 34 target_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
30 multiarch_options = { 35 multiarch_options = {
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 3f9d03f773..71dce12f45 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -47,6 +47,7 @@ EXTRA_OECONF = "\
47 ${EXTRA_OECONF_GCC_FLOAT} \ 47 ${EXTRA_OECONF_GCC_FLOAT} \
48 ${EXTRA_OECONF_PATHS} \ 48 ${EXTRA_OECONF_PATHS} \
49 ${@get_gcc_mips_plt_setting(bb, d)} \ 49 ${@get_gcc_mips_plt_setting(bb, d)} \
50 ${@get_long_double_setting(bb, d)} \
50 ${@get_gcc_multiarch_setting(bb, d)} \ 51 ${@get_gcc_multiarch_setting(bb, d)} \
51" 52"
52 53
@@ -66,10 +67,6 @@ EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune
66EXTRA_OECONF_GCC_FLOAT ??= "" 67EXTRA_OECONF_GCC_FLOAT ??= ""
67CPPFLAGS = "" 68CPPFLAGS = ""
68 69
69# powerpc needs this to comply with the ABI
70EXTRA_OECONF_append_powerpc = " --with-long-double-128"
71EXTRA_OECONF_append_powerpc64 = " --with-long-double-128"
72
73SYSTEMHEADERS = "${target_includedir}" 70SYSTEMHEADERS = "${target_includedir}"
74SYSTEMLIBS = "${target_base_libdir}/" 71SYSTEMLIBS = "${target_base_libdir}/"
75SYSTEMLIBS1 = "${target_libdir}/" 72SYSTEMLIBS1 = "${target_libdir}/"