summaryrefslogtreecommitdiff
path: root/meta-linaro-toolchain/recipes-devtools/gcc
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2018-12-26 19:33:29 +0100
committervishal <vishal.bhoj@linaro.org>2019-01-04 14:54:33 +0530
commit992800a1d2c5d072e575ae883c67d7741b973e31 (patch)
treece72a7603759e014843e9f5099427fb052bb6b36 /meta-linaro-toolchain/recipes-devtools/gcc
parenta947155fff883396a827bf3aed190f09123e059d (diff)
downloadmeta-linaro-992800a1d2c5d072e575ae883c67d7741b973e31.tar.gz
meta-linaro-toolchain/recipes-devtools: GCC remove gcc-cross{,sdk}-initial
Recently gcc-cross{,sdk}-initial was removed in OE core, next are changes to use gcc-cross. http://git.openembedded.org/openembedded-core/commit/?id=62b7308b8c4d2b439a15a4f7cbc6f823077bb0be http://git.openembedded.org/openembedded-core/commit/?id=d84971928b68efddbdb6344b1021d998c9e26adb http://git.openembedded.org/openembedded-core/commit/?id=122217b421f749b5fef52bea44ad6e04bc8f8d3a Change-Id: If9160b56f1c4681eb778b524586401f1570a8a2d Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Diffstat (limited to 'meta-linaro-toolchain/recipes-devtools/gcc')
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc89
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb4
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb4
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.3.bb4
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-6.3.bb2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.1.bb2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.2.bb2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc7
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb5
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb5
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.3.bb5
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-6.3.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb3
14 files changed, 3 insertions, 135 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc
deleted file mode 100644
index 892b1db..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial.inc
+++ /dev/null
@@ -1,89 +0,0 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-INHIBIT_AUTOTOOLS_DEPS = "1"
-INHIBIT_DEFAULT_DEPS = "1"
-
-# We still need gnu-config-native
-DEPENDS_prepend = "gnu-config-native autoconf-native "
-
-PN = "gcc-cross-initial-${TARGET_ARCH}"
-
-CROSS_TARGET_SYS_DIR_append = ".${PN}"
-
-# This is intended to be a -very- basic config
-# sysroot is needed in case we use libc-initial
-EXTRA_OECONF = "\
- --with-newlib \
- --without-headers \
- --disable-shared \
- --disable-threads \
- --disable-multilib \
- --disable-__cxa_atexit \
- --enable-languages=c \
- --program-prefix=${TARGET_PREFIX} \
- --with-sysroot=/not/exist \
- --with-build-sysroot=${STAGING_DIR_TARGET} \
- ${EXTRA_OECONF_INITIAL} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
- ${EXTRA_OECONF_GCC_FLOAT} \
- ${@get_gcc_ppc_plt_settings(bb, d)} \
-"
-
-EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
-
-do_compile () {
- oe_runmake all-gcc configure-target-libgcc
- (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
-}
-
-do_install () {
- ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h)
- oe_runmake 'DESTDIR=${D}' install-gcc
-
- # We don't really need this (here shares/ contains man/, info/, locale/).
- rm -rf ${D}${datadir}/
-
- # We use libiberty from binutils
- find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
- find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
-
- # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
- # found. These need to be relative paths so they work in different locations.
- dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
- install -d $dest
- useld=${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '.bfd', '', d)}
- ln -sf ${BINRELPATH}/${TARGET_PREFIX}ld${useld} ${dest}ld
- for t in ar as nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
- ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
- done
- # fixed limits.h infact includes the so called real limits.h
- # which should come from libc but when we build libc-initial
- # then bunch of configure tests include fixed limits.h which in turn
- # includes real limits.h but this real limits.h is not staged yet
- # so we overwirte the generated include-fixed/limits.h for gcc-cross-initial
- # to get rid references to real limits.h
- cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include/limits.h
-}
-#
-# Override the default sysroot staging copy since this won't look like a target system
-#
-sysroot_stage_all() {
- sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
- install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
- install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/
- mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true
- mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
-}
-
-do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/"
-do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
-
-inherit nopackages
-
-COMPILERINITIAL = "-initial"
-
-
-# We really only want this built by things that need it, not any recrdeptask
-deltask do_build
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb
deleted file mode 100644
index f118094..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.9.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-BASEPV = "4.9"
-PV = "linaro-${BASEPV}"
-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-initial_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb
deleted file mode 100644
index a1af8f3..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-BASEPV = "5.2"
-PV = "linaro-${BASEPV}"
-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-initial_linaro-5.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.3.bb
deleted file mode 100644
index 5dd1fc4..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-5.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-BASEPV = "5.3"
-PV = "linaro-${BASEPV}"
-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-initial_linaro-6.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-6.3.bb
deleted file mode 100644
index 22d4b05..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-6.3.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-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-initial_linaro-7.1.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.1.bb
deleted file mode 100644
index 22d4b05..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-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-initial_linaro-7.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.2.bb
deleted file mode 100644
index 22d4b05..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-7.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-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.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc
index a6df45e..52e9958 100644
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross.inc
@@ -2,7 +2,7 @@ inherit cross
INHIBIT_DEFAULT_DEPS = "1"
EXTRADEPENDS = ""
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${EXTRADEPENDS} ${NATIVEDEPS}"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
python () {
if d.getVar("TARGET_OS").startswith("linux"):
@@ -32,7 +32,6 @@ EXTRA_OECONF += "\
--with-system-zlib \
"
-DEPENDS_remove_libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc"
EXTRA_OECONF_append_libc-baremetal = " --without-headers"
EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix"
@@ -207,8 +206,8 @@ do_gcc_stash_builddir () {
addtask do_gcc_stash_builddir after do_compile before do_install
SSTATETASKS += "do_gcc_stash_builddir"
do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
-do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
-do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
+do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
+do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
python do_gcc_stash_builddir_setscene () {
sstate_setscene(d)
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb
deleted file mode 100644
index f42e8b8..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.9.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gcc-linaro-common-4.9.inc
-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-initial_linaro-5.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb
deleted file mode 100644
index 176a24f..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gcc-linaro-common-5.2.inc
-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-initial_linaro-5.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.3.bb
deleted file mode 100644
index fb3afb7..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-5.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gcc-linaro-common-5.3.inc
-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-initial_linaro-6.3.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-6.3.bb
deleted file mode 100644
index c0b6626..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-6.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb
-require recipes-devtools/gcc/gcc-crosssdk-initial.inc
-
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb
deleted file mode 100644
index c0b6626..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb
-require recipes-devtools/gcc/gcc-crosssdk-initial.inc
-
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb
deleted file mode 100644
index c0b6626..0000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-7.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb
-require recipes-devtools/gcc/gcc-crosssdk-initial.inc
-