diff options
author | Koen Kooi <koen.kooi@linaro.org> | 2016-01-04 11:23:18 +0100 |
---|---|---|
committer | Koen Kooi <koen.kooi@linaro.org> | 2016-01-04 11:23:18 +0100 |
commit | 697174bacf597826260ffdb473c95e317e0a1374 (patch) | |
tree | 292ab6dcdc41ff6ccf83c1ec9372addb89f7d978 /meta-linaro-toolchain | |
parent | 9d7c5be96da2b340e130476da4558aed5ac8a844 (diff) |
gcc linaro-5.2: stop requiring OE-core 5.2 recipes
OE-core deleted the 5.2 recipes, so import and adapt the actual bits we need.
Change-Id: Ib97870f8ad6a20ffea843be127bc32ad0185122e
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'meta-linaro-toolchain')
10 files changed, 93 insertions, 9 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-5.2.bb index 90315a5c..84bbd08f 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-5.2.bb @@ -1,2 +1,3 @@ require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/gcc-cross-canadian_${BASEPV}.bb +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-cross-canadian.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb index e078f2a0..a1af8f38 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb @@ -1,3 +1,4 @@ BASEPV = "5.2" PV = "linaro-${BASEPV}" -require recipes-devtools/gcc/gcc-cross-initial_${BASEPV}.bb +require recipes-devtools/gcc/gcc-cross_${PV}.bb +require recipes-devtools/gcc/gcc-cross-initial.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-5.2.bb index c7f38348..0a693f5b 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-5.2.bb @@ -1,3 +1,4 @@ BASEPV = "5.2" PV = "linaro-${BASEPV}" -require recipes-devtools/gcc/gcc-cross_${BASEPV}.bb +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-cross.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb index b972f59b..176a24f7 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb @@ -1,4 +1,5 @@ require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/gcc-crosssdk-initial_${BASEPV}.bb +require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb +require recipes-devtools/gcc/gcc-crosssdk-initial.inc EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} " diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-5.2.bb index 020e7028..66b7b9c2 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-5.2.bb @@ -1,2 +1,3 @@ require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/gcc-crosssdk_${BASEPV}.bb +require recipes-devtools/gcc/gcc-cross_${PV}.bb +require recipes-devtools/gcc/gcc-crosssdk.inc diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc index 852b6f15..23da1d71 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-5.2.inc @@ -1,4 +1,61 @@ -require recipes-devtools/gcc/gcc-5.2.inc +require recipes-devtools/gcc/gcc-common.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.2:${FILE_DIRNAME}/gcc-5.2/backport:" + +DEPENDS =+ "mpfr gmp libmpc zlib" +NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" + +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ +" + +# Language Overrides +FORTRAN = "" +JAVA = "" + +LTO = "--enable-lto" + +EXTRA_OECONF_BASE = "\ + ${LTO} \ + --enable-libssp \ + --disable-bootstrap \ + --disable-libmudflap \ + --with-system-zlib \ + --with-linker-hash-style=${LINKER_HASH_STYLE} \ + --enable-linker-build-id \ + --with-ppl=no \ + --with-cloog=no \ + --enable-checking=release \ + --enable-cheaders=c_global \ + --without-isl \ +" + +EXTRA_OECONF_INITIAL = "\ + --disable-libmudflap \ + --disable-libgomp \ + --disable-libssp \ + --disable-libquadmath \ + --with-system-zlib \ + --disable-lto \ + --disable-plugin \ + --enable-decimal-float=no \ + --without-isl \ +" + +EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " + +EXTRA_OECONF_PATHS = "\ + --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ + --with-sysroot=/not/exist \ + --with-build-sysroot=${STAGING_DIR_TARGET} \ +" + PV = "linaro-${BASEPV}" MMYY = "15.11" diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-5.2.bb index 72572b02..a147ebd9 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-5.2.bb @@ -1,2 +1,7 @@ require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/gcc-runtime_${BASEPV}.bb +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-runtime.inc + +FILES_libgomp-dev += "\ + ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/openacc.h \ +" diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-source_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-source_linaro-5.2.bb index b695e7ba..b343bc8d 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-source_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-source_linaro-5.2.bb @@ -1,3 +1,5 @@ require gcc-linaro-common-5.2.inc require recipes-devtools/gcc/gcc-${PV}.inc require recipes-devtools/gcc/gcc-source.inc + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-5.2.bb index 7426c423..07943abb 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-5.2.bb @@ -1,4 +1,18 @@ require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/gcc_${BASEPV}.bb +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-target.inc + +# Building with thumb enabled on armv4t fails with +# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs +# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output +ARM_INSTRUCTION_SET_armv4 = "arm" + +do_configure_prepend() { + # Easiest way to stop bad RPATHs getting into the library since we have a + # broken libtool here + sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure +} + +BBCLASSEXTEND = "nativesdk" DEPENDS += "gmp-native" diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-5.2.bb index 27351516..c27968d6 100644 --- a/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-5.2.bb +++ b/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-5.2.bb @@ -1,2 +1,3 @@ require gcc-linaro-common-5.2.inc -require recipes-devtools/gcc/libgcc_${BASEPV}.bb +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/libgcc.inc |