diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-12 16:25:47 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:23:15 +0100 |
| commit | 410990445ada8cdcfaec4e6fa5791cee9a5b8983 (patch) | |
| tree | 5d5a7344245167f2a9b6c09bf0fb165c99f069af | |
| parent | 5740696c81a9143504c1cb93e94c54add27896e4 (diff) | |
| download | openembedded-core-410990445ada8cdcfaec4e6fa5791cee9a5b8983.tar.gz | |
crosssdk/nativesdk: Ensure EXTRA_OECONF_FPU is unset
If EXTRA_OECONF_FPU is left set, certain ARM variables related to hard-float
can get pulled in and trigger rebuilds of the crosssdk code. The best solution
is to simply force the variable to a known correct value for the SDK targets
currently supported in the same way as TARGET_FPU.
There is some slight rearrangement of the gcc code to ensure the variable is
always used to call the fpu function.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/crosssdk.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/nativesdk.bbclass | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-initial.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 93aba7022e..f3a502ab79 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -28,3 +28,6 @@ baselib = "lib" do_populate_sysroot[stamp-extra-info] = "" do_package[stamp-extra-info] = "" + +# Need to force this to ensure consitency accross architectures +EXTRA_OECONF_FPU = "" diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index a58fce2040..7deaafc670 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -36,6 +36,7 @@ TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" TARGET_FPU = "" +EXTRA_OECONF_FPU = "" CPPFLAGS = "${BUILDSDK_CPPFLAGS}" CFLAGS = "${BUILDSDK_CFLAGS}" diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index faec391dcb..0523698030 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -21,7 +21,7 @@ EXTRA_OECONF = "--with-newlib \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ ${EXTRA_OECONF_INITIAL} \ - ${@get_gcc_fpu_setting(bb, d)}" + ${EXTRA_OECONF_FPU}" do_compile () { oe_runmake all-gcc all-target-libgcc diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index c940e549c5..e06926d6e1 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -23,7 +23,7 @@ EXTRA_OECONF = "--enable-shared \ --with-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ --with-build-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ ${EXTRA_OECONF_INTERMEDIATE} \ - ${@get_gcc_fpu_setting(bb, d)} \ + ${EXTRA_OECONF_FPU} \ ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)}" do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}" |