summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-07-27 15:31:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-05 17:15:59 +0100
commit17e8d8558dbabe2540860ecf1232214dfdf90ff0 (patch)
treeaf12f217fc152e4f85993e318088c2d2b0f943cc /meta/classes
parent5561aaad28ed6db6d962f88db32814043044731f (diff)
downloadpoky-17e8d8558dbabe2540860ecf1232214dfdf90ff0.tar.gz
toolchain-scripts & other classes: add TARGET_LD_ARCH & TARGET_AS_ARCH vars
This is comming from x32 need to pass special parameters to ld & as. (From OE-Core rev: 96931af89f9cc3056e413cff437a85eca85b3b75) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/allarch.bbclass2
-rw-r--r--meta/classes/cross-canadian.bbclass2
-rw-r--r--meta/classes/cross.bbclass2
-rw-r--r--meta/classes/crosssdk.bbclass2
-rw-r--r--meta/classes/native.bbclass10
-rw-r--r--meta/classes/nativesdk.bbclass4
-rw-r--r--meta/classes/toolchain-scripts.bbclass9
7 files changed, 24 insertions, 7 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index 26fca70635..a2f81799a1 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -12,4 +12,6 @@ INHIBIT_DEFAULT_DEPS = "1"
12TARGET_ARCH = "allarch" 12TARGET_ARCH = "allarch"
13TARGET_OS = "linux" 13TARGET_OS = "linux"
14TARGET_CC_ARCH = "none" 14TARGET_CC_ARCH = "none"
15TARGET_LD_ARCH = "none"
16TARGET_AS_ARCH = "none"
15PACKAGE_EXTRA_ARCHS = "" 17PACKAGE_EXTRA_ARCHS = ""
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index c878d7f5a5..601175db45 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -39,6 +39,8 @@ HOST_VENDOR = "${SDK_VENDOR}"
39HOST_OS = "${SDK_OS}" 39HOST_OS = "${SDK_OS}"
40HOST_PREFIX = "${SDK_PREFIX}" 40HOST_PREFIX = "${SDK_PREFIX}"
41HOST_CC_ARCH = "${SDK_CC_ARCH}" 41HOST_CC_ARCH = "${SDK_CC_ARCH}"
42HOST_LD_ARCH = "${SDK_LD_ARCH}"
43HOST_AS_ARCH = "${SDK_AS_ARCH}"
42 44
43#assign DPKG_ARCH 45#assign DPKG_ARCH
44DPKG_ARCH = "${SDK_ARCH}" 46DPKG_ARCH = "${SDK_ARCH}"
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index e19614f280..519aa0dfff 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -11,6 +11,8 @@ HOST_VENDOR = "${BUILD_VENDOR}"
11HOST_OS = "${BUILD_OS}" 11HOST_OS = "${BUILD_OS}"
12HOST_PREFIX = "${BUILD_PREFIX}" 12HOST_PREFIX = "${BUILD_PREFIX}"
13HOST_CC_ARCH = "${BUILD_CC_ARCH}" 13HOST_CC_ARCH = "${BUILD_CC_ARCH}"
14HOST_LD_ARCH = "${BUILD_LD_ARCH}"
15HOST_AS_ARCH = "${BUILD_AS_ARCH}"
14 16
15STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" 17STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
16 18
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index a2e5a222fc..5cfa43b3de 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -9,6 +9,8 @@ TARGET_VENDOR = "${SDK_VENDOR}"
9TARGET_OS = "${SDK_OS}" 9TARGET_OS = "${SDK_OS}"
10TARGET_PREFIX = "${SDK_PREFIX}" 10TARGET_PREFIX = "${SDK_PREFIX}"
11TARGET_CC_ARCH = "${SDK_CC_ARCH}" 11TARGET_CC_ARCH = "${SDK_CC_ARCH}"
12TARGET_LD_ARCH = "${SDK_LD_ARCH}"
13TARGET_AS_ARCH = "${SDK_AS_ARCH}"
12TARGET_FPU = "" 14TARGET_FPU = ""
13 15
14target_libdir = "${SDKPATHNATIVE}${libdir_nativesdk}" 16target_libdir = "${SDKPATHNATIVE}${libdir_nativesdk}"
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 00f7b9f02d..9a41f19dc6 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -24,6 +24,8 @@ TARGET_OS = "${BUILD_OS}"
24TARGET_VENDOR = "${BUILD_VENDOR}" 24TARGET_VENDOR = "${BUILD_VENDOR}"
25TARGET_PREFIX = "${BUILD_PREFIX}" 25TARGET_PREFIX = "${BUILD_PREFIX}"
26TARGET_CC_ARCH = "${BUILD_CC_ARCH}" 26TARGET_CC_ARCH = "${BUILD_CC_ARCH}"
27TARGET_LD_ARCH = "${BUILD_LD_ARCH}"
28TARGET_AS_ARCH = "${BUILD_AS_ARCH}"
27TARGET_FPU = "" 29TARGET_FPU = ""
28 30
29HOST_ARCH = "${BUILD_ARCH}" 31HOST_ARCH = "${BUILD_ARCH}"
@@ -31,6 +33,8 @@ HOST_OS = "${BUILD_OS}"
31HOST_VENDOR = "${BUILD_VENDOR}" 33HOST_VENDOR = "${BUILD_VENDOR}"
32HOST_PREFIX = "${BUILD_PREFIX}" 34HOST_PREFIX = "${BUILD_PREFIX}"
33HOST_CC_ARCH = "${BUILD_CC_ARCH}" 35HOST_CC_ARCH = "${BUILD_CC_ARCH}"
36HOST_LD_ARCH = "${BUILD_LD_ARCH}"
37HOST_AS_ARCH = "${BUILD_AS_ARCH}"
34 38
35CPPFLAGS = "${BUILD_CPPFLAGS}" 39CPPFLAGS = "${BUILD_CPPFLAGS}"
36CFLAGS = "${BUILD_CFLAGS}" 40CFLAGS = "${BUILD_CFLAGS}"
@@ -50,11 +54,11 @@ export CONFIG_SITE = ""
50export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" 54export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
51export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" 55export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
52export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" 56export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
53export CPP = "${HOST_PREFIX}gcc -E" 57export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E"
54export LD = "${HOST_PREFIX}ld" 58export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} "
55export CCLD = "${CC}" 59export CCLD = "${CC}"
56export AR = "${HOST_PREFIX}ar" 60export AR = "${HOST_PREFIX}ar"
57export AS = "${HOST_PREFIX}as" 61export AS = "${HOST_PREFIX}as ${HOST_AS_ARCH}"
58export RANLIB = "${HOST_PREFIX}ranlib" 62export RANLIB = "${HOST_PREFIX}ranlib"
59export STRIP = "${HOST_PREFIX}strip" 63export STRIP = "${HOST_PREFIX}strip"
60 64
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index de7a88317c..152d053342 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -24,6 +24,8 @@ HOST_VENDOR = "${SDK_VENDOR}"
24HOST_OS = "${SDK_OS}" 24HOST_OS = "${SDK_OS}"
25HOST_PREFIX = "${SDK_PREFIX}" 25HOST_PREFIX = "${SDK_PREFIX}"
26HOST_CC_ARCH = "${SDK_CC_ARCH}" 26HOST_CC_ARCH = "${SDK_CC_ARCH}"
27HOST_LD_ARCH = "${SDK_LD_ARCH}"
28HOST_AS_ARCH = "${SDK_AS_ARCH}"
27#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}" 29#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}"
28 30
29TARGET_ARCH = "${SDK_ARCH}" 31TARGET_ARCH = "${SDK_ARCH}"
@@ -31,6 +33,8 @@ TARGET_VENDOR = "${SDK_VENDOR}"
31TARGET_OS = "${SDK_OS}" 33TARGET_OS = "${SDK_OS}"
32TARGET_PREFIX = "${SDK_PREFIX}" 34TARGET_PREFIX = "${SDK_PREFIX}"
33TARGET_CC_ARCH = "${SDK_CC_ARCH}" 35TARGET_CC_ARCH = "${SDK_CC_ARCH}"
36TARGET_LD_ARCH = "${SDK_LD_ARCH}"
37TARGET_AS_ARCH = "${SDK_AS_ARCH}"
34TARGET_FPU = "" 38TARGET_FPU = ""
35 39
36CPPFLAGS = "${BUILDSDK_CPPFLAGS}" 40CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index fe11e7278e..f7b52be752 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -24,8 +24,8 @@ toolchain_create_sdk_env_script () {
24 fi 24 fi
25 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script 25 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
26 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script 26 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
27 echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script 27 echo 'export LDFLAGS="${TARGET_LD_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
28 echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script 28 echo 'export CPPFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script
29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
30 echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script 30 echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
31 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script 31 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
@@ -59,6 +59,7 @@ toolchain_create_tree_env_script () {
59 fi 59 fi
60 echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script 60 echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
61 echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script 61 echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
62 echo 'export LDFLAGS="${TARGET_LD_ARCH}"' >> $script
62 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script 63 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
63 echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script 64 echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
64 echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script 65 echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
@@ -91,8 +92,8 @@ toolchain_create_sdk_env_script_for_installer () {
91 fi 92 fi
92 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script 93 echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
93 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script 94 echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
94 echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script 95 echo 'export LDFLAGS="${TARGET_LD_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
95 echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script 96 echo 'export CPPFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script
96 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 97 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
97 echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script 98 echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
98 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script 99 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script