diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-target.inc | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 2abc0e355d..d3b36937bf 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -32,6 +32,16 @@ def get_gcc_float_setting(bb, d): | |||
32 | 32 | ||
33 | get_gcc_float_setting[vardepvalue] = "${@get_gcc_float_setting(bb, d)}" | 33 | get_gcc_float_setting[vardepvalue] = "${@get_gcc_float_setting(bb, d)}" |
34 | 34 | ||
35 | def get_gcc_x86_64_arch_setting(bb, d): | ||
36 | import re | ||
37 | march = re.match(r'^.*-march=([^\s]*)', d.getVar('TUNE_CCARGS')) | ||
38 | if march: | ||
39 | return "--with-arch=%s " % march.group(1) | ||
40 | # The earliest supported x86-64 CPU | ||
41 | return "--with-arch=core2" | ||
42 | |||
43 | get_gcc_x86_64_arch_setting[vardepvalue] = "${@get_gcc_x86_64_arch_setting(bb, d)}" | ||
44 | |||
35 | def get_gcc_mips_plt_setting(bb, d): | 45 | def get_gcc_mips_plt_setting(bb, d): |
36 | if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d): | 46 | if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d): |
37 | return "--with-mips-plt" | 47 | return "--with-mips-plt" |
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index cc65e995c3..7dac3ef422 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc | |||
@@ -19,7 +19,7 @@ EXTRA_OECONF:append:armv6:class-target = " --with-arch=armv6${ARMFPARCHEXT}" | |||
19 | EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}" | 19 | EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}" |
20 | EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}" | 20 | EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}" |
21 | EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}" | 21 | EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}" |
22 | EXTRA_OECONF:append:x86-64:class-target = " --with-arch=native" | 22 | EXTRA_OECONF:append:x86-64:class-target = " ${@get_gcc_x86_64_arch_setting(bb, d)}" |
23 | 23 | ||
24 | # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is | 24 | # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is |
25 | # set in subdir gcc, so subdir libcc1 can't use it, export it here to | 25 | # set in subdir gcc, so subdir libcc1 can't use it, export it here to |