summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-08-14 14:05:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:50 +0100
commit14a2d1eaa161622eb00a26474bd127b0856f7358 (patch)
treeeb1cf8e7a8af7914d523d18de88a04a9b9e42775 /meta/recipes-devtools/gcc
parent79e235c5ee4fad9f2ab86c80965724dfcf397f46 (diff)
downloadpoky-14a2d1eaa161622eb00a26474bd127b0856f7358.tar.gz
sdk: change EXTRA_OECONF_FPU to EXTRA_OECONF_GCC_FLOAT
This variable is used to ensure the proper version of --with-float=FOO is passed to gcc's configure script. gcc also has a --with-fpu=FOO option that means something different. To avoid confusion, change the names to be consistent. (From OE-Core rev: c17d883fa99b6967d83c3796d22fc0c1dbe704e6) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc2
5 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 66a18d9749..4c55542280 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -9,7 +9,7 @@ inherit autotools gettext texinfo
9 9
10BPN = "gcc" 10BPN = "gcc"
11 11
12def get_gcc_fpu_setting(bb, d): 12def get_gcc_float_setting(bb, d):
13 if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm": 13 if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm":
14 return "--with-float=hard" 14 return "--with-float=hard"
15 if d.getVar('TARGET_FPU', True) in [ 'soft' ]: 15 if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
@@ -18,7 +18,7 @@ def get_gcc_fpu_setting(bb, d):
18 return "--enable-e500_double" 18 return "--enable-e500_double"
19 return "" 19 return ""
20 20
21get_gcc_fpu_setting[vardepvalue] = "${@get_gcc_fpu_setting(bb, d)}" 21get_gcc_float_setting[vardepvalue] = "${@get_gcc_float_setting(bb, d)}"
22 22
23def get_gcc_mips_plt_setting(bb, d): 23def get_gcc_mips_plt_setting(bb, d):
24 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d): 24 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d):
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 9c4e98694b..3f9d03f773 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -44,7 +44,7 @@ EXTRA_OECONF = "\
44 --without-local-prefix \ 44 --without-local-prefix \
45 ${OPTSPACE} \ 45 ${OPTSPACE} \
46 ${EXTRA_OECONF_BASE} \ 46 ${EXTRA_OECONF_BASE} \
47 ${EXTRA_OECONF_FPU} \ 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_multiarch_setting(bb, d)} \ 50 ${@get_gcc_multiarch_setting(bb, d)} \
@@ -63,7 +63,7 @@ EXTRA_OECONF_append_libc-uclibc = " --enable-__cxa_atexit"
63EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" 63EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
64EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" 64EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
65 65
66EXTRA_OECONF_FPU ??= "" 66EXTRA_OECONF_GCC_FLOAT ??= ""
67CPPFLAGS = "" 67CPPFLAGS = ""
68 68
69# powerpc needs this to comply with the ABI 69# powerpc needs this to comply with the ABI
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index d8868bb668..0b1f37b908 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -19,7 +19,7 @@ EXTRA_OECONF_PATHS = "\
19# e.g. we switch between different machines with different tunes. 19# e.g. we switch between different machines with different tunes.
20EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH" 20EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
21TARGET_ARCH[vardepsexclude] = "TUNE_ARCH" 21TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
22get_gcc_fpu_setting[vardepvalue] = "" 22get_gcc_float_setting[vardepvalue] = ""
23 23
24# 24#
25# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky 25# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 64196ee106..ccbdcf53ea 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF = "\
25 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \ 25 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
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_FPU} \ 28 ${EXTRA_OECONF_GCC_FLOAT} \
29" 29"
30 30
31EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}" 31EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 0f9a5f87c6..a266f16edf 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -10,7 +10,7 @@ EXTRA_OECONF_PATHS = "\
10 10
11EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" 11EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
12 12
13EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" 13EXTRA_OECONF_GCC_FLOAT = "${@get_gcc_float_setting(bb, d)}"
14 14
15PACKAGES = "\ 15PACKAGES = "\
16 ${PN} ${PN}-plugins ${PN}-symlinks \ 16 ${PN} ${PN}-plugins ${PN}-symlinks \