summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-01 16:40:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-02 20:46:58 +0100
commit075e2884ce10094258af6f7c6db1af7579b5bffa (patch)
treef646b1fa7f727820e2d95242ed98f7d31c096d70
parent5e4db52ea6c25b87772ce8e72199b9e5dc299dd2 (diff)
downloadpoky-075e2884ce10094258af6f7c6db1af7579b5bffa.tar.gz
gcc-common: Only apply fpu settings to target gcc
Within the OE build environment, we supply the correct fpu settings. These only need to be spelt out for the on-target gcc. Doing this means the checksums for the core compiler don't depend on the fpu settings. We exclude the compiler tunes for similar reasons, it doesn't need to influence the compiler build. (From OE-Core rev: ce1f3fd20d81545d6d5dfc68f86f9fddf8ac9bbf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc2
3 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 0408e65d5f..e56e598b75 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -63,7 +63,7 @@ def get_tune_parameters(tune, d):
63 retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS', True) 63 retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS', True)
64 return retdict 64 return retdict
65 65
66get_tune_parameters[vardepsexclude] = "AVAILTUNES" 66get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS"
67 67
68DEBIANNAME_${MLPREFIX}libgcc = "libgcc1" 68DEBIANNAME_${MLPREFIX}libgcc = "libgcc1"
69 69
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 3cb6ec8f2f..31e3cc4551 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -61,7 +61,7 @@ EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit"
61EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" 61EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
62EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" 62EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
63 63
64EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" 64EXTRA_OECONF_FPU ??= ""
65CPPFLAGS = "" 65CPPFLAGS = ""
66 66
67# powerpc needs this to comply with the ABI 67# powerpc needs this to comply with the ABI
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 45a16370ce..de906d6241 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -7,6 +7,8 @@ EXTRA_OECONF_PATHS = " \
7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ 7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \
8 --with-gxx-include-dir=${includedir}/c++/" 8 --with-gxx-include-dir=${includedir}/c++/"
9 9
10EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
11
10PACKAGES = "\ 12PACKAGES = "\
11 ${PN} ${PN}-plugins ${PN}-symlinks \ 13 ${PN} ${PN}-plugins ${PN}-symlinks \
12 g++ g++-symlinks \ 14 g++ g++-symlinks \