aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-02-16 03:38:32 +0000
committerKoen Kooi <koen.kooi@linaro.org>2014-02-18 09:50:22 +0100
commit64e811b200839e4d18b8ec6a185119497cb71061 (patch)
tree20d3e96728278bf35fe187eecf049eb2fb6c33cc
parentd5d5cc449ca9c8bf26798be1b6b8744e679b64c6 (diff)
gcc-linaro-4.7: Delete
4.8 is stable enough now we can remove 4.7 from master branch Change-Id: Ifa2ee837675a7a6628a002a129ab8667da30c32e Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-4.7.bb2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb3
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.7.bb4
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-4.7.bb2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc22
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/64bithack.patch27
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch78
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch33
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/optional_libstdc.patch86
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/use-defaults.h-and-t-oe-in-B.patch80
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-common-4.7.inc2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-4.7.bb2
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-4.7.bb4
-rw-r--r--meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-4.7.bb2
15 files changed, 0 insertions, 350 deletions
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-4.7.bb
deleted file mode 100644
index 91cfbf30..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-canadian_linaro-4.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-linaro-common-4.7.inc
-require recipes-devtools/gcc/gcc-cross-canadian_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb
deleted file mode 100644
index c51f81e7..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross-initial_linaro-4.7.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-BASEPV = "4.7"
-PV = "linaro-${BASEPV}"
-require recipes-devtools/gcc/gcc-cross-initial_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb
deleted file mode 100644
index d91b6562..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-cross_linaro-4.7.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-BASEPV = "4.7"
-PV = "linaro-${BASEPV}"
-require recipes-devtools/gcc/gcc-cross_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.7.bb
deleted file mode 100644
index 1252a1c0..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_linaro-4.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require gcc-linaro-common-4.7.inc
-require recipes-devtools/gcc/gcc-crosssdk-initial_${BASEPV}.bb
-
-EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} "
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-4.7.bb
deleted file mode 100644
index c5554364..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk_linaro-4.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-linaro-common-4.7.inc
-require recipes-devtools/gcc/gcc-crosssdk_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc
deleted file mode 100644
index 8a6fa77d..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-require recipes-devtools/gcc/gcc-4.7.inc
-PV = "linaro-${BASEPV}"
-MMYY = "14.01"
-RELEASE = "20${MMYY}"
-PR = "r${RELEASE}"
-BINV = "4.7.4"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-${PV}' ], d)}"
-
-SRC_URI = "http://releases.linaro.org/${MMYY}/components/toolchain/gcc-linaro/${BASEPV}/gcc-${PV}-${RELEASE}.tar.bz2 \
- file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
- file://64bithack.patch \
- file://optional_libstdc.patch \
- file://use-defaults.h-and-t-oe-in-B.patch \
- file://fix-g++-sysroot.patch \
- "
-
-SRC_URI[md5sum] = "f93f561312bdb1b4b0267a57275aefdc"
-SRC_URI[sha256sum] = "3550ea4627071dadf296722891f712a901ce46a00398cca4084f8fe01ed5ca14"
-
-S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}-${RELEASE}"
-B = "${WORKDIR}/gcc-${PV}-${RELEASE}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/64bithack.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/64bithack.patch
deleted file mode 100644
index 7a4ba4c1..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/64bithack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This patch causes the GCC to install the libstc++ into lib as opposed to
-lib64 on X86_64 Linux targets. Usually the libstdc++ will be placed in lib64
-during the install step. Because that's where 64bit libs go for linux targets
-according to the FHS. If you don't like this but want to use linux as a target
-you have to patch the toolchain which is what 64bithack.patch attempts to do.
-One solution would be to have a distinctive OE target that doesn't support
-multilib and has 64bit libs under lib. The advantage over the current
-meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch provided by oe-core is that
-multilib upport is entirely disabled and MULTILIB_OSDIRNAMES is empty. This
-prevents a broken toolchain in case --enable-multilib gets used.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Ken Werner <ken.werner@linaro.org>
-
-Index: gcc-linaro-4.7-2012.05/gcc/config.gcc
-===================================================================
---- gcc-linaro-4.7-2012.05.orig/gcc/config.gcc
-+++ gcc-linaro-4.7-2012.05/gcc/config.gcc
-@@ -1303,7 +1303,6 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu
- tm_file="${tm_file} knetbsd-gnu.h"
- ;;
- esac
-- tmake_file="${tmake_file} i386/t-linux64"
- x86_multilibs="${with_multilib_list}"
- if test "$x86_multilibs" = "default"; then
- x86_multilibs="m64,m32"
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch
deleted file mode 100644
index e6028d55..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/fix-g++-sysroot.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-backport
-
-http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Refreshed for meta-linaro by Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-
----
- gcc/configure | 8 +++++++-
- gcc/configure.ac | 8 +++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
---- gcc-linaro-4.7-2013.02.orig/gcc/configure
-+++ gcc-linaro-4.7-2013.02/gcc/configure
-@@ -3322,11 +3322,13 @@ fi
-
- gcc_gxx_include_dir_add_sysroot=0
- if test "${with_sysroot+set}" = set; then
- gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
- if test "${gcc_gxx_without_sysroot}"; then
-- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+ if test x${with_sysroot} != x/; then
-+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+ fi
- gcc_gxx_include_dir_add_sysroot=1
- fi
- fi
-
-
-@@ -7284,10 +7286,14 @@ fi
-
- # Check whether --with-sysroot was given.
- if test "${with_sysroot+set}" = set; then :
- withval=$with_sysroot;
- case ${with_sysroot} in
-+ /) ;;
-+ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;;
-+ esac
-+ case ${with_sysroot} in
- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
- *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
- esac
-
- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
---- gcc-linaro-4.7-2013.02.orig/gcc/configure.ac
-+++ gcc-linaro-4.7-2013.02/gcc/configure.ac
-@@ -147,11 +147,13 @@ fi
-
- gcc_gxx_include_dir_add_sysroot=0
- if test "${with_sysroot+set}" = set; then
- gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
- if test "${gcc_gxx_without_sysroot}"; then
-- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+ if test x${with_sysroot} != x/; then
-+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+ fi
- gcc_gxx_include_dir_add_sysroot=1
- fi
- fi
-
- AC_ARG_WITH(cpp_install_dir,
-@@ -784,10 +786,14 @@ AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
- AC_ARG_WITH(sysroot,
- [AS_HELP_STRING([[--with-sysroot[=DIR]]],
- [search for usr/lib, usr/include, et al, within DIR])],
- [
- case ${with_sysroot} in
-+ /) ;;
-+ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;;
-+ esac
-+ case ${with_sysroot} in
- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;;
- *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
- esac
-
- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
deleted file mode 100644
index 964c4bbb..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
----
- configure | 2 +-
- configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4_7-branch/configure.ac
-===================================================================
---- gcc-4_7-branch.orig/configure.ac 2012-04-10 10:19:50.923337154 -0700
-+++ gcc-4_7-branch/configure.ac 2012-04-10 10:19:54.911337344 -0700
-@@ -2825,7 +2825,7 @@
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
-
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
- *" newlib "*)
- case " $target_configargs " in
-Index: gcc-4_7-branch/configure
-===================================================================
---- gcc-4_7-branch.orig/configure 2012-04-10 10:19:50.911337153 -0700
-+++ gcc-4_7-branch/configure 2012-04-10 10:19:54.915337349 -0700
-@@ -7368,7 +7368,7 @@
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
-
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
- *" newlib "*)
- case " $target_configargs " in
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/optional_libstdc.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/optional_libstdc.patch
deleted file mode 100644
index fe157a89..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/optional_libstdc.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++
-will not run correctly since by default the linker will try to link against libstdc++
-which shouldn't exist yet. We need an option to disable -lstdc++
-option whilst leaving -lc, -lgcc and other automatic library dependencies added by gcc
-driver. This patch adds such an option which only disables the -lstdc++.
-
-A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to
-do this officially, the likely answer is don't build libstdc++ separately.
-
-RP 29/6/10
-
-Index: gcc-4.6.0/gcc/cp/g++spec.c
-===================================================================
---- gcc-4.6.0.orig/gcc/cp/g++spec.c
-+++ gcc-4.6.0/gcc/cp/g++spec.c
-@@ -127,6 +127,7 @@ lang_specific_driver (struct cl_decoded_
- switch (decoded_options[i].opt_index)
- {
- case OPT_nostdlib:
-+ case OPT_nostdlib__:
- case OPT_nodefaultlibs:
- library = -1;
- break;
-Index: gcc-4.6.0/gcc/doc/invoke.texi
-===================================================================
---- gcc-4.6.0.orig/gcc/doc/invoke.texi
-+++ gcc-4.6.0/gcc/doc/invoke.texi
-@@ -193,7 +193,7 @@ in the following sections.
- -fno-pretty-templates @gol
- -frepo -fno-rtti -fstats -ftemplate-depth=@var{n} @gol
- -fno-threadsafe-statics -fuse-cxa-atexit -fno-weak -nostdinc++ @gol
---fno-default-inline -fvisibility-inlines-hidden @gol
-+-nostdlib++ -fno-default-inline -fvisibility-inlines-hidden @gol
- -fvisibility-ms-compat @gol
- -Wabi -Wconversion-null -Wctor-dtor-privacy @gol
- -Wnoexcept -Wnon-virtual-dtor -Wreorder @gol
-@@ -431,7 +431,7 @@ Objective-C and Objective-C++ Dialects}.
- @gccoptlist{@var{object-file-name} -l@var{library} @gol
- -nostartfiles -nodefaultlibs -nostdlib -pie -rdynamic @gol
- -s -static -static-libgcc -static-libstdc++ -shared @gol
---shared-libgcc -symbolic @gol
-+-shared-libgcc -symbolic -nostdlib++ @gol
- -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol
- -u @var{symbol}}
-
-@@ -9069,6 +9069,11 @@ These entries are usually resolved by en
- libc. These entry points should be supplied through some other
- mechanism when this option is specified.
-
-+@item -nostdlib++
-+@opindex nostdlib++
-+Do not use the standard system C++ runtime libraries when linking.
-+Only the libraries you specify will be passed to the linker.
-+
- @cindex @option{-lgcc}, use with @option{-nostdlib}
- @cindex @option{-nostdlib} and unresolved references
- @cindex unresolved references and @option{-nostdlib}
-Index: gcc-4.6.0/gcc/c-family/c.opt
-===================================================================
---- gcc-4.6.0.orig/gcc/c-family/c.opt
-+++ gcc-4.6.0/gcc/c-family/c.opt
-@@ -1111,6 +1111,10 @@ nostdinc++
- C++ ObjC++
- Do not search standard system include directories for C++
-
-+nostdlib++
-+Driver
-+Do not link standard C++ runtime library
-+
- o
- C ObjC C++ ObjC++ Joined Separate
- ; Documented in common.opt
-Index: gcc-4.6.0/gcc/gcc.c
-===================================================================
---- gcc-4.6.0.orig/gcc/gcc.c
-+++ gcc-4.6.0/gcc/gcc.c
-@@ -666,6 +666,7 @@ proper position among the other output f
- %(mflib) " STACK_SPLIT_SPEC "\
- %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\
- %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\
-+ %{!nostdlib++:}\
- %{!nostdlib:%{!nostartfiles:%E}} %{T*} }}}}}}"
- #endif
-
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/use-defaults.h-and-t-oe-in-B.patch b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/use-defaults.h-and-t-oe-in-B.patch
deleted file mode 100644
index b4351ee7..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-4.7/use-defaults.h-and-t-oe-in-B.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Upstream-Status: Pending
-
-Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
-the source can be shared between gcc-cross-initial,
-gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
----
- gcc/Makefile.in | 2 +-
- gcc/configure | 4 ++--
- gcc/configure.ac | 4 ++--
- gcc/mkconfig.sh | 4 ++--
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 7790915..3a0c34a 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -463,7 +463,7 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
- TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
-
- xmake_file=@xmake_file@
--tmake_file=@tmake_file@
-+tmake_file=@tmake_file@ ./t-oe
- TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
- TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
- TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
-diff --git a/gcc/configure b/gcc/configure
-index 82fa3e4..d4711b5 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11227,8 +11227,8 @@ for f in $tm_file; do
- tm_include_list="${tm_include_list} $f"
- ;;
- defaults.h )
-- tm_file_list="${tm_file_list} \$(srcdir)/$f"
-- tm_include_list="${tm_include_list} $f"
-+ tm_file_list="${tm_file_list} ./$f"
-+ tm_include_list="${tm_include_list} ./$f"
- ;;
- * )
- tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 844d8da..a960343 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1628,8 +1628,8 @@ for f in $tm_file; do
- tm_include_list="${tm_include_list} $f"
- ;;
- defaults.h )
-- tm_file_list="${tm_file_list} \$(srcdir)/$f"
-- tm_include_list="${tm_include_list} $f"
-+ tm_file_list="${tm_file_list} ./$f"
-+ tm_include_list="${tm_include_list} ./$f"
- ;;
- * )
- tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
-diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
-index d56df8c..875d0f1 100644
---- a/gcc/mkconfig.sh
-+++ b/gcc/mkconfig.sh
-@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
- if [ $# -ge 1 ]; then
- echo '#ifdef IN_GCC' >> ${output}T
- for file in "$@"; do
-- if test x"$file" = x"defaults.h"; then
-+ if test x"$file" = x"./defaults.h"; then
- postpone_defaults_h="yes"
- else
- echo "# include \"$file\"" >> ${output}T
-@@ -103,7 +103,7 @@ esac
-
- # If we postponed including defaults.h, add the #include now.
- if test x"$postpone_defaults_h" = x"yes"; then
-- echo "# include \"defaults.h\"" >> ${output}T
-+ echo "# include \"./defaults.h\"" >> ${output}T
- fi
-
- # Add multiple inclusion protection guard, part two.
---
-1.7.1
-
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-common-4.7.inc b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-common-4.7.inc
deleted file mode 100644
index f9d63115..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-linaro-common-4.7.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-BASEPV = "4.7"
-PV = "linaro-${BASEPV}"
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-4.7.bb
deleted file mode 100644
index a976006e..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-runtime_linaro-4.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-linaro-common-4.7.inc
-require recipes-devtools/gcc/gcc-runtime_${BASEPV}.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-4.7.bb
deleted file mode 100644
index bab8f21a..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/gcc_linaro-4.7.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require gcc-linaro-common-4.7.inc
-require recipes-devtools/gcc/gcc_${BASEPV}.bb
-
-DEPENDS =+ "gmp-native"
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-4.7.bb b/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-4.7.bb
deleted file mode 100644
index f98fa24d..00000000
--- a/meta-linaro-toolchain/recipes-devtools/gcc/libgcc_linaro-4.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gcc-linaro-common-4.7.inc
-require recipes-devtools/gcc/libgcc_${BASEPV}.bb