summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
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