summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-08-16 15:17:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 14:58:51 +0100
commit81d9b54d7e6335d7d0aeff3fa6ac083989c2f69d (patch)
treed8858d489b2fa6043a0285ca0cb352904959141d /meta/conf
parent19a7e6c63b14e8c63ff0aadd9b068869230d514f (diff)
downloadpoky-81d9b54d7e6335d7d0aeff3fa6ac083989c2f69d.tar.gz
conf,recipes: Add new variable LINKER_HASH_STYLE
LINKER_HASH_STYLE in OE is set to either 'sysv' or 'gnu' depending upon processor architecture e.g. mips does not support gnu hash style so is uses sysv besides 'sysv' and 'gnu' third option is to set it to 'both' we do not do that by default but user can still set it (From OE-Core rev: 17322dba8434e592d3922496f89f8d1d5598247e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf9
-rw-r--r--meta/conf/distro/include/tcmode-default.inc1
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 730439c3b4..618a57b602 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -476,7 +476,14 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
476 -Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \ 476 -Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \
477 -Wl,-rpath,${base_libdir} -Wl,-O1" 477 -Wl,-rpath,${base_libdir} -Wl,-O1"
478 478
479TARGET_LINK_HASH_STYLE ??= "" 479LINKER_HASH_STYLE ??= "gnu"
480# mips does not support GNU hash style therefore we override
481LINKER_HASH_STYLE_mips = "sysv"
482LINKER_HASH_STYLE_mipsel = "sysv"
483LINKER_HASH_STYLE_mips64 = "sysv"
484LINKER_HASH_STYLE_mips64el = "sysv"
485TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('LINKER_HASH_STYLE', d, True) == 'gnu']}"
486
480export LDFLAGS = "${TARGET_LDFLAGS}" 487export LDFLAGS = "${TARGET_LDFLAGS}"
481export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" 488export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
482#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \ 489#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2857215893..86562bea86 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -63,5 +63,4 @@ PREFERRED_VERSION_gzip-native ?= "1.4"
63 63
64# Setup suitable toolchain flags 64# Setup suitable toolchain flags
65require conf/distro/include/as-needed.inc 65require conf/distro/include/as-needed.inc
66TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
67 66