From 96931af89f9cc3056e413cff437a85eca85b3b75 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 27 Jul 2011 15:31:28 -0700 Subject: 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. Signed-off-by: Nitin A Kamble --- meta/classes/allarch.bbclass | 2 ++ meta/classes/cross-canadian.bbclass | 2 ++ meta/classes/cross.bbclass | 2 ++ meta/classes/crosssdk.bbclass | 2 ++ meta/classes/native.bbclass | 10 +++++++--- meta/classes/nativesdk.bbclass | 4 ++++ meta/classes/toolchain-scripts.bbclass | 9 +++++---- 7 files changed, 24 insertions(+), 7 deletions(-) (limited to 'meta/classes') 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" TARGET_ARCH = "allarch" TARGET_OS = "linux" TARGET_CC_ARCH = "none" +TARGET_LD_ARCH = "none" +TARGET_AS_ARCH = "none" PACKAGE_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}" HOST_OS = "${SDK_OS}" HOST_PREFIX = "${SDK_PREFIX}" HOST_CC_ARCH = "${SDK_CC_ARCH}" +HOST_LD_ARCH = "${SDK_LD_ARCH}" +HOST_AS_ARCH = "${SDK_AS_ARCH}" #assign DPKG_ARCH DPKG_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}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" +HOST_LD_ARCH = "${BUILD_LD_ARCH}" +HOST_AS_ARCH = "${BUILD_AS_ARCH}" STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" 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}" TARGET_OS = "${SDK_OS}" TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" +TARGET_LD_ARCH = "${SDK_LD_ARCH}" +TARGET_AS_ARCH = "${SDK_AS_ARCH}" TARGET_FPU = "" target_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}" TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_PREFIX = "${BUILD_PREFIX}" TARGET_CC_ARCH = "${BUILD_CC_ARCH}" +TARGET_LD_ARCH = "${BUILD_LD_ARCH}" +TARGET_AS_ARCH = "${BUILD_AS_ARCH}" TARGET_FPU = "" HOST_ARCH = "${BUILD_ARCH}" @@ -31,6 +33,8 @@ HOST_OS = "${BUILD_OS}" HOST_VENDOR = "${BUILD_VENDOR}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" +HOST_LD_ARCH = "${BUILD_LD_ARCH}" +HOST_AS_ARCH = "${BUILD_AS_ARCH}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" @@ -50,11 +54,11 @@ export CONFIG_SITE = "" export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc -E" -export LD = "${HOST_PREFIX}ld" +export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E" +export LD = "${HOST_PREFIX}ld ${HOST_LD_ARCH} " export CCLD = "${CC}" export AR = "${HOST_PREFIX}ar" -export AS = "${HOST_PREFIX}as" +export AS = "${HOST_PREFIX}as ${HOST_AS_ARCH}" export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" 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}" HOST_OS = "${SDK_OS}" HOST_PREFIX = "${SDK_PREFIX}" HOST_CC_ARCH = "${SDK_CC_ARCH}" +HOST_LD_ARCH = "${SDK_LD_ARCH}" +HOST_AS_ARCH = "${SDK_AS_ARCH}" #HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}" TARGET_ARCH = "${SDK_ARCH}" @@ -31,6 +33,8 @@ TARGET_VENDOR = "${SDK_VENDOR}" TARGET_OS = "${SDK_OS}" TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" +TARGET_LD_ARCH = "${SDK_LD_ARCH}" +TARGET_AS_ARCH = "${SDK_AS_ARCH}" TARGET_FPU = "" CPPFLAGS = "${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 () { fi echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script - echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script - echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script + echo 'export LDFLAGS="${TARGET_LD_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script + echo 'export CPPFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script @@ -59,6 +59,7 @@ toolchain_create_tree_env_script () { fi echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script + echo 'export LDFLAGS="${TARGET_LD_ARCH}"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script @@ -91,8 +92,8 @@ toolchain_create_sdk_env_script_for_installer () { fi echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script - echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script - echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script + echo 'export LDFLAGS="${TARGET_LD_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script + echo 'export CPPFLAGS="${TARGET_CC_ARCH} --sysroot=##SDKTARGETSYSROOT##"' >> $script echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script -- cgit 1.2.3-korg