summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-19 10:37:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-26 11:19:54 +0000
commit3436264a32d025f44aecacb8b7498c1157fe80e5 (patch)
tree5b060241da7ed4a6ca98a4b9aa6c5226694b94ed /meta
parent0afd3ac3ada35dd986aaf3be41d7177dc6b71ade (diff)
downloadpoky-3436264a32d025f44aecacb8b7498c1157fe80e5.tar.gz
gcc: Drop the -initial versions of the compiler
Separated out from the previous commit for clarity, this simply drops all the -inital pieces of gcc which are no longer needed after the previous commit. (From OE-Core rev: d84971928b68efddbdb6344b1021d998c9e26adb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-8.2.inc14
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc7
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc89
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial_8.2.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc10
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial_8.2.bb3
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk.inc2
9 files changed, 6 insertions, 126 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-8.2.inc b/meta/recipes-devtools/gcc/gcc-8.2.inc
index 206e1571b2..b6568a046e 100644
--- a/meta/recipes-devtools/gcc/gcc-8.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-8.2.inc
@@ -107,20 +107,6 @@ EXTRA_OECONF_BASE = "\
107 --without-isl \ 107 --without-isl \
108" 108"
109 109
110EXTRA_OECONF_INITIAL = "\
111 --disable-libmudflap \
112 --disable-libgomp \
113 --disable-libitm \
114 --disable-libquadmath \
115 --with-system-zlib \
116 --disable-lto \
117 --disable-plugin \
118 --enable-linker-build-id \
119 --enable-decimal-float=no \
120 --without-isl \
121 --disable-libssp \
122"
123
124EXTRA_OECONF_PATHS = "\ 110EXTRA_OECONF_PATHS = "\
125 --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ 111 --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \
126 --with-sysroot=/not/exist \ 112 --with-sysroot=/not/exist \
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 06c90336b6..96334e54b4 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -10,12 +10,11 @@ CVE_PRODUCT = "gcc"
10inherit autotools gettext texinfo 10inherit autotools gettext texinfo
11 11
12BPN = "gcc" 12BPN = "gcc"
13COMPILERINITIAL = "" 13COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir"
14COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc${COMPILERINITIAL}:do_gcc_stash_builddir" 14COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir"
15COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc${COMPILERINITIAL}-crosssdk:do_gcc_stash_builddir"
16 15
17python extract_stashed_builddir () { 16python extract_stashed_builddir () {
18 src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}") 17 src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}")
19 dest = d.getVar("B") 18 dest = d.getVar("B")
20 oe.path.copyhardlinktree(src, dest) 19 oe.path.copyhardlinktree(src, dest)
21 staging_processfixme([src + "/fixmepath"], dest, dest, dest, d) 20 staging_processfixme([src + "/fixmepath"], dest, dest, dest, d)
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 0eecde6f17..375c5e90c9 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -17,7 +17,6 @@ LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
17 17
18EXTRA_OECONF_BASE ?= "" 18EXTRA_OECONF_BASE ?= ""
19EXTRA_OECONF_PATHS ?= "" 19EXTRA_OECONF_PATHS ?= ""
20EXTRA_OECONF_INITIAL ?= ""
21 20
22GCCMULTILIB ?= "--disable-multilib" 21GCCMULTILIB ?= "--disable-multilib"
23GCCTHREADS ?= "posix" 22GCCTHREADS ?= "posix"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
deleted file mode 100644
index 892b1dbf2f..0000000000
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ /dev/null
@@ -1,89 +0,0 @@
1DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
3PACKAGES = ""
4
5INHIBIT_AUTOTOOLS_DEPS = "1"
6INHIBIT_DEFAULT_DEPS = "1"
7
8# We still need gnu-config-native
9DEPENDS_prepend = "gnu-config-native autoconf-native "
10
11PN = "gcc-cross-initial-${TARGET_ARCH}"
12
13CROSS_TARGET_SYS_DIR_append = ".${PN}"
14
15# This is intended to be a -very- basic config
16# sysroot is needed in case we use libc-initial
17EXTRA_OECONF = "\
18 --with-newlib \
19 --without-headers \
20 --disable-shared \
21 --disable-threads \
22 --disable-multilib \
23 --disable-__cxa_atexit \
24 --enable-languages=c \
25 --program-prefix=${TARGET_PREFIX} \
26 --with-sysroot=/not/exist \
27 --with-build-sysroot=${STAGING_DIR_TARGET} \
28 ${EXTRA_OECONF_INITIAL} \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
30 ${EXTRA_OECONF_GCC_FLOAT} \
31 ${@get_gcc_ppc_plt_settings(bb, d)} \
32"
33
34EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
35
36do_compile () {
37 oe_runmake all-gcc configure-target-libgcc
38 (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
39}
40
41do_install () {
42 ( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h)
43 oe_runmake 'DESTDIR=${D}' install-gcc
44
45 # We don't really need this (here shares/ contains man/, info/, locale/).
46 rm -rf ${D}${datadir}/
47
48 # We use libiberty from binutils
49 find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
50 find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
51
52 # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
53 # found. These need to be relative paths so they work in different locations.
54 dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
55 install -d $dest
56 useld=${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '.bfd', '', d)}
57 ln -sf ${BINRELPATH}/${TARGET_PREFIX}ld${useld} ${dest}ld
58 for t in ar as nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
59 ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
60 done
61 # fixed limits.h infact includes the so called real limits.h
62 # which should come from libc but when we build libc-initial
63 # then bunch of configure tests include fixed limits.h which in turn
64 # includes real limits.h but this real limits.h is not staged yet
65 # so we overwirte the generated include-fixed/limits.h for gcc-cross-initial
66 # to get rid references to real limits.h
67 cp gcc/include-fixed/limits.h ${D}${gcclibdir}/${TARGET_SYS}/${BINV}/include/limits.h
68}
69#
70# Override the default sysroot staging copy since this won't look like a target system
71#
72sysroot_stage_all() {
73 sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
74 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/
75 install -d ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/
76 mv ${SYSROOT_DESTDIR}${target_base_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_base_libdir}/ || true
77 mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
78}
79
80do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/"
81do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
82
83inherit nopackages
84
85COMPILERINITIAL = "-initial"
86
87
88# We really only want this built by things that need it, not any recrdeptask
89deltask do_build
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_8.2.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_8.2.bb
deleted file mode 100644
index 4c73e5ce61..0000000000
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_8.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require recipes-devtools/gcc/gcc-cross_${PV}.bb
2require gcc-cross-initial.inc
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 63a196e2e9..add6b43017 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -215,8 +215,8 @@ do_gcc_stash_builddir () {
215addtask do_gcc_stash_builddir after do_compile before do_install 215addtask do_gcc_stash_builddir after do_compile before do_install
216SSTATETASKS += "do_gcc_stash_builddir" 216SSTATETASKS += "do_gcc_stash_builddir"
217do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}" 217do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
218do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}" 218do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
219do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}" 219do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
220 220
221python do_gcc_stash_builddir_setscene () { 221python do_gcc_stash_builddir_setscene () {
222 sstate_setscene(d) 222 sstate_setscene(d)
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
deleted file mode 100644
index 08eda5d4c7..0000000000
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
+++ /dev/null
@@ -1,10 +0,0 @@
1inherit crosssdk
2
3PN = "gcc-crosssdk-initial-${SDK_SYS}"
4
5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
7SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
8
9DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native ${NATIVEDEPS}"
10PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial-crosssdk"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_8.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_8.2.bb
deleted file mode 100644
index fd90e1140f..0000000000
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_8.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb
2require gcc-crosssdk-initial.inc
3
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index cda2927794..bd2e71d63f 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
@@ -8,5 +8,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
8 8
9GCCMULTILIB = "--disable-multilib" 9GCCMULTILIB = "--disable-multilib"
10 10
11DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-${TARGET_PREFIX}libc-for-gcc gettext-native ${NATIVEDEPS}" 11DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native ${NATIVEDEPS}"
12PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" 12PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"