gcc: Rename gcc-package.inc gcc-package-target.inc and move includes a level lower. There should be no functionality change yet, it just makes that change easier to remove target packaging from cross builds

49 files changed, 35 insertions, 27 deletions

diff --git a/packages/gcc/gcc-3.3.3.inc b/packages/gcc/gcc-3.3.3.inc
index 2a6357afd3..657eb2acce 100644
--- a/packages/gcc/gcc-3.3.3.inc
+++ b/packages/gcc/gcc-3.3.3.inc
@@ -94,5 +94,3 @@ do_configure () {
 	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
 	oe_runconf
 }
-
-require gcc-package.inc
diff --git a/packages/gcc/gcc-3.3.4.inc b/packages/gcc/gcc-3.3.4.inc
index 497c27026b..6c280c49f6 100644
--- a/packages/gcc/gcc-3.3.4.inc
+++ b/packages/gcc/gcc-3.3.4.inc
@@ -73,5 +73,3 @@ do_configure () {
 	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
 	oe_runconf
 }
-
-require gcc-package.inc
diff --git a/packages/gcc/gcc-3.4.3.inc b/packages/gcc/gcc-3.4.3.inc
index b9470416d6..1dc7056d89 100644
--- a/packages/gcc/gcc-3.4.3.inc
+++ b/packages/gcc/gcc-3.4.3.inc
@@ -2,8 +2,6 @@ require gcc-common.inc
 
 PR = "r12"
 
-require gcc-package.inc
-
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
 	   file://gcc34-arm-ldm.patch;patch=1 \
diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc
index 109b29eaff..cb96e6f2d1 100644
--- a/packages/gcc/gcc-3.4.4.inc
+++ b/packages/gcc/gcc-3.4.4.inc
@@ -2,8 +2,6 @@ require gcc-common.inc
 
 PR = "r7"
 
-require gcc-package.inc
-
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://gcc34-reverse-compare.patch;patch=1 \
 	   file://gcc34-arm-ldm.patch;patch=1 \
diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc
index 9f360764fb..da097b7e00 100644
--- a/packages/gcc/gcc-4.0.0.inc
+++ b/packages/gcc/gcc-4.0.0.inc
@@ -1,8 +1,6 @@
 require gcc-common.inc
 PR = "r3"
 
-require gcc-package.inc
-
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://ldflags.patch;patch=1"
diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc
index 6dd6febeba..ec97954992 100644
--- a/packages/gcc/gcc-4.0.2.inc
+++ b/packages/gcc/gcc-4.0.2.inc
@@ -3,9 +3,6 @@ require gcc-common.inc
 DEPENDS = "mpfr gmp"
 PR = "r7"
 
-
-require gcc-package.inc
-
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc
index b2aeb13177..45b8c142cc 100644
--- a/packages/gcc/gcc-4.1.0.inc
+++ b/packages/gcc/gcc-4.1.0.inc
@@ -3,8 +3,6 @@ PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
-require gcc-package.inc
-
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 	file://arm-nolibfloat.patch;patch=1 \
 	file://arm-softfloat.patch;patch=1 \
diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc
index d9cf6a08a0..3c369f04bc 100644
--- a/packages/gcc/gcc-4.1.1.inc
+++ b/packages/gcc/gcc-4.1.1.inc
@@ -1,8 +1,6 @@
 require gcc-common.inc
 PR = "r18"
 
-require gcc-package.inc
-
 SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://110-arm-eabi.patch;patch=1 \
diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc
index 0f0cd96e39..1059e74de0 100644
--- a/packages/gcc/gcc-4.1.2.inc
+++ b/packages/gcc/gcc-4.1.2.inc
@@ -3,8 +3,6 @@ require gcc-common.inc
 # remember to increment the -cross .bb PR too.
 PR = "r11"
 
-require gcc-package.inc
-
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://110-arm-eabi.patch;patch=1 \
diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc
index 513d9fde2c..ae1f99adf1 100644
--- a/packages/gcc/gcc-4.2.1.inc
+++ b/packages/gcc/gcc-4.2.1.inc
@@ -1,8 +1,6 @@
 require gcc-common.inc
 PR = "r9"
 
-require gcc-package.inc
-
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 8a250396cb..593ae546c3 100644
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -2,8 +2,6 @@ require gcc-common.inc
 
 PR = "r6"
 
-require gcc-package.inc
-
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
 	file://103-uclibc-conf-noupstream.patch;patch=1 \
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 8d973ac5d6..2569a97d03 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 PR = "r3"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index 6f237f8473..cb31e09e7e 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 PR = "r1"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index 8d973ac5d6..2569a97d03 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 PR = "r3"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index a8286c9603..0ea1761d8c 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 PR = "r2"
 
 inherit sdk
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 04c7049b5a..cb478492a6 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -8,5 +8,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc
 PACKAGES = "${PN}"
 
 require gcc-${PV}.inc
+require gcc-package-target.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index cd7990b36f..28864f12da 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -7,6 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 
 require gcc-${PV}.inc
+require gcc-package-target.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index 0934848111..46ceef7725 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -7,6 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 PACKAGES = "${PN}"
 
 require gcc-${PV}.inc
+require gcc-package-target.inc
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 4dec8d8648..4a78d6f5a4 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,5 +1,6 @@
 SECTION = "devel"
 require gcc-${PV}.inc
+require gcc-package-target.inc
 inherit cross
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index fb6538b7b8..1179da5bf6 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,5 +1,6 @@
 SECTION = "devel"
 require gcc-${PV}.inc
+require gcc-package-target.inc
 require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 0b23012088..046675aa05 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index a364bc6869..85d6630eba 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 0391aa729f..62c4119654 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 11bb13a5d2..71a641f47c 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 4a1eb70138..287fdbf5ea 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 09fc68c7ff..b0e2e71b64 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 750804749c..6b8fad72de 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index b24d4b544b..40ecc3af01 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index f42e902a25..5d5f747d6e 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,5 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 62dabe48b8..3c0f72faf5 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,5 @@
 require gcc-csl-arm-2005q3.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index 93d00179d1..d4897d8118 100644
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -1,4 +1,5 @@
 require gcc-csl-arm-cvs.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index e44e43aa25..62a68fb5a1 100644
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -1,4 +1,5 @@
 require gcc-csl-arm.inc
+require gcc-package-target.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
diff --git a/packages/gcc/gcc-csl-arm-2005q3.inc b/packages/gcc/gcc-csl-arm-2005q3.inc
index dea8113d1b..5231ee57d2 100644
--- a/packages/gcc/gcc-csl-arm-2005q3.inc
+++ b/packages/gcc/gcc-csl-arm-2005q3.inc
@@ -6,8 +6,6 @@ PR = "r3"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
-require gcc-package.inc
-
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2 \
            file://gcc_optab_arm.patch;patch=1 \
            file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
diff --git a/packages/gcc/gcc-csl-arm.inc b/packages/gcc/gcc-csl-arm.inc
index 5a07bcaf5b..eda4335426 100644
--- a/packages/gcc/gcc-csl-arm.inc
+++ b/packages/gcc/gcc-csl-arm.inc
@@ -6,8 +6,6 @@ PR = "r1"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 DEFAULT_PREFERENCE = "-1"
 
-require gcc-package.inc
-
 SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${SRCDATE} \
 	   file://gcc34-arm-tune.patch;patch=1"
 
diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package-target.inc
index 2976d58d05..2976d58d05 100644
--- a/packages/gcc/gcc-package.inc
+++ b/packages/gcc/gcc-package-target.inc
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_csl-arm-cvs.bb
+++ b/packages/gcc/gcc_csl-arm-cvs.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index 4bdf9a2459..d6f35bb290 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.bb
@@ -1 +1,2 @@
 require gcc-${PV}.inc
+require gcc-package-target.inc