From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qu9hq-0006dG-Qt for openembedded-core@lists.openembedded.org; Thu, 18 Aug 2011 23:00:51 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 18 Aug 2011 13:56:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,247,1312182000"; d="scan'208";a="39980301" Received: from unknown (HELO swold-MOBL.local) ([10.255.13.226]) by azsmga001.ch.intel.com with ESMTP; 18 Aug 2011 13:56:11 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Thu, 18 Aug 2011 13:55:34 -0700 Message-Id: <5e892786b427b2049ddf0e660d57877e24f89385.1313700595.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2011 21:00:52 -0000 From: Khem Raj LINKER_HASH_STYLE is not set to either sysv or gnu depending upon architecture e.g. mips does not support gnu hash style among the supported architectures so we make sure its set to 'sysv' form mips Linker flags are munged to adhere to renamed variable Third option is to set it to 'both' we do not do that by default but user can still set it Signed-off-by: Khem Raj --- meta/conf/bitbake.conf | 4 ++-- meta/conf/distro/include/tcmode-default.inc | 6 +++++- meta/recipes-core/uclibc/uclibc.inc | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b309516..58a604a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -475,9 +475,9 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ -Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \ -Wl,-rpath,${base_libdir} -Wl,-O1" -TARGET_LINK_HASH_STYLE ??= "" +LINKER_HASH_STYLE ??= "gnu" export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" +export TARGET_LDFLAGS = "-Wl,-O1 -Wl,--hash-style=${LINKER_HASH_STYLE}" #export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \ # -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \ # -Wl,-O1" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 0d0af38..60f99ac 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -63,5 +63,9 @@ PREFERRED_VERSION_gzip-native ?= "1.4" # Setup suitable toolchain flags require conf/distro/include/as-needed.inc -TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" +# mips does not support GNU hash style therefore we hard assign them +LINKER_HASH_STYLE_mips = "sysv" +LINKER_HASH_STYLE_mipsel = "sysv" +LINKER_HASH_STYLE_mips64 = "sysv" +LINKER_HASH_STYLE_mips64el = "sysv" diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 222c34f..ab10f1b 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc @@ -201,5 +201,5 @@ do_configure() { do_install() { oe_runmake PREFIX=${D} install - oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" install_utils + oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=-Wl,--hash-style=${LINKER_HASH_STYLE}" install_utils } -- 1.7.6