summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc5
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc1
3 files changed, 7 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index d63c07f68a..6f2f224a14 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_gcc_ppc_plt_settings(bb, d):
29 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc' ] and not bb.utils.contains('DISTRO_FEATURES', 'bssplt', True, False, d):
30 return "--enable-secureplt"
31 return ""
32
28def get_long_double_setting(bb, d): 33def get_long_double_setting(bb, d):
29 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'glibc' ]: 34 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'glibc' ]:
30 return "--with-long-double-128" 35 return "--with-long-double-128"
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index a14be738c5..cee6f4a58f 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_gcc_ppc_plt_settings(bb, d)} \
50 ${@get_long_double_setting(bb, d)} \ 51 ${@get_long_double_setting(bb, d)} \
51 ${@get_gcc_multiarch_setting(bb, d)} \ 52 ${@get_gcc_multiarch_setting(bb, d)} \
52" 53"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 7197447080..c0fa139a85 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -26,6 +26,7 @@ EXTRA_OECONF = "\
26 ${EXTRA_OECONF_INITIAL} \ 26 ${EXTRA_OECONF_INITIAL} \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
28 ${EXTRA_OECONF_GCC_FLOAT} \ 28 ${EXTRA_OECONF_GCC_FLOAT} \
29 ${@get_gcc_ppc_plt_settings(bb, d)} \
29" 30"
30 31
31EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}" 32EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"