summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-27 01:22:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 16:39:06 +0100
commitecf2a8cecfe115feeb0737dc5797687b574caf74 (patch)
treeec35e85b78b494d3413caba6cc7f9c56621029bc
parentf07b7c0da1748afc35fbb2ead7ae10ec66c7c428 (diff)
downloadpoky-ecf2a8cecfe115feeb0737dc5797687b574caf74.tar.gz
gcc: Drop ARCH_FLAGS_FOR_TARGET usage
As far as I can tell this variable is now completely unneeded. It would only ever get used in target builds and these are now correctly done in the target environment namespace, not any of our cross environments. As such, CC and other variables contain the correct compilers and other tune options and these are correctly picked up when building libgcc, libstdc++ and others. I tried to figure out where else these would make any sense and couldn't find anything. Builds appear fine without them so lets drop the complexity including the patch adding in this flag to gcc. (From OE-Core rev: 5484596f4252e707ff791feedf143a72dbb613f6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc6
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc2
4 files changed, 0 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 855ec26aef..42b4212f28 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -22,7 +22,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
22 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" 22 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
23 23
24SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ 24SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
25 file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
26 file://0002-uclibc-conf.patch \ 25 file://0002-uclibc-conf.patch \
27 file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \ 26 file://0003-gcc-uclibc-locale-ctype_touplow_t.patch \
28 file://0004-uclibc-locale.patch \ 27 file://0004-uclibc-locale.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 12482f81e3..3cb6ec8f2f 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -68,11 +68,6 @@ CPPFLAGS = ""
68EXTRA_OECONF_append_powerpc = " --with-long-double-128" 68EXTRA_OECONF_append_powerpc = " --with-long-double-128"
69EXTRA_OECONF_append_powerpc64 = " --with-long-double-128" 69EXTRA_OECONF_append_powerpc64 = " --with-long-double-128"
70 70
71# Used by configure to define additional values for FLAGS_FOR_TARGET -
72# passed to all the compilers.
73ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}"
74EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
75
76SYSTEMHEADERS = "${target_includedir}" 71SYSTEMHEADERS = "${target_includedir}"
77SYSTEMLIBS = "${target_base_libdir}/" 72SYSTEMLIBS = "${target_base_libdir}/"
78SYSTEMLIBS1 = "${target_libdir}/" 73SYSTEMLIBS1 = "${target_libdir}/"
@@ -129,7 +124,6 @@ do_configure () {
129 export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}" 124 export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
130 export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" 125 export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
131 export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" 126 export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
132 export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}"
133 export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" 127 export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
134 export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" 128 export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
135 export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" 129 export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 5fd2a8c8b0..70f9e0eb52 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -7,8 +7,6 @@ EXTRA_OECONF_PATHS = " \
7 --with-sysroot=${STAGING_DIR_TARGET} \ 7 --with-sysroot=${STAGING_DIR_TARGET} \
8 --with-build-sysroot=${STAGING_DIR_TARGET}" 8 --with-build-sysroot=${STAGING_DIR_TARGET}"
9 9
10ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
11
12EXTRA_OECONF += "--disable-libunwind-exceptions" 10EXTRA_OECONF += "--disable-libunwind-exceptions"
13EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" 11EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
14 12
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 3df21737e6..45a16370ce 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -7,8 +7,6 @@ EXTRA_OECONF_PATHS = " \
7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \ 7 --with-native-system-header-dir=${STAGING_DIR_TARGET}${target_includedir} \
8 --with-gxx-include-dir=${includedir}/c++/" 8 --with-gxx-include-dir=${includedir}/c++/"
9 9
10ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR} -I${B}/gcc/include/ "
11
12PACKAGES = "\ 10PACKAGES = "\
13 ${PN} ${PN}-plugins ${PN}-symlinks \ 11 ${PN} ${PN}-plugins ${PN}-symlinks \
14 g++ g++-symlinks \ 12 g++ g++-symlinks \