From d19766541358a887e205db99d10f0e13923d445d Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 1 Apr 2020 13:05:03 -0700 Subject: microblaze machines: Set LINKER_HASH_STYLE defaults For Linux based builds, it should be set to sysv. This will result in the system using a supported hash type. (GNU hash is not supported on Microblaze., so sysv will be used instead.) For baremetal, set the value to "". This will result in no value set, and the system will use the compiler and linker default. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 2 ++ meta-xilinx-bsp/conf/machine/microblaze-plm.conf | 2 +- meta-xilinx-bsp/conf/machine/microblaze-pmu.conf | 2 +- meta-xilinx-bsp/conf/machine/microblaze-tc.conf | 2 +- meta-xilinx-bsp/conf/machine/versal-mb.conf | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc index 12ea78e0..f2533be7 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -33,6 +33,8 @@ GCCPIE_microblaze = "" GLIBCPIE_microblaze = "" SECURITY_CFLAGS_microblaze = "" SECURITY_LDFLAGS_microblaze = "" +# Microblaze does not support gnu hash style +LINKER_HASH_STYLE_microblaze = "sysv" XSERVER ?= " \ xserver-xorg \ diff --git a/meta-xilinx-bsp/conf/machine/microblaze-plm.conf b/meta-xilinx-bsp/conf/machine/microblaze-plm.conf index d18148e2..9ab8a46b 100644 --- a/meta-xilinx-bsp/conf/machine/microblaze-plm.conf +++ b/meta-xilinx-bsp/conf/machine/microblaze-plm.conf @@ -7,4 +7,4 @@ AVAILTUNES += "microblaze" TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" -TARGET_LINK_HASH_STYLE_microblaze = "" +LINKER_HASH_STYLE_microblaze = "sysv" diff --git a/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf b/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf index 02bfae37..09fd3c80 100644 --- a/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf +++ b/meta-xilinx-bsp/conf/machine/microblaze-pmu.conf @@ -7,4 +7,4 @@ AVAILTUNES += "microblaze" TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" -TARGET_LINK_HASH_STYLE_microblaze = "" +LINKER_HASH_STYLE_microblaze = "sysv" diff --git a/meta-xilinx-bsp/conf/machine/microblaze-tc.conf b/meta-xilinx-bsp/conf/machine/microblaze-tc.conf index 21ada3c8..bc80ad75 100644 --- a/meta-xilinx-bsp/conf/machine/microblaze-tc.conf +++ b/meta-xilinx-bsp/conf/machine/microblaze-tc.conf @@ -7,7 +7,7 @@ INHERIT += "xlnx-standalone" PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}' # GNU hash style not supported -TARGET_LINK_HASH_STYLE = "" +LINKER_HASH_STYLE_microblaze = "" # Define all of the multilibs supproted by this configuration MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" diff --git a/meta-xilinx-bsp/conf/machine/versal-mb.conf b/meta-xilinx-bsp/conf/machine/versal-mb.conf index d18148e2..f40b8bca 100644 --- a/meta-xilinx-bsp/conf/machine/versal-mb.conf +++ b/meta-xilinx-bsp/conf/machine/versal-mb.conf @@ -7,4 +7,4 @@ AVAILTUNES += "microblaze" TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" -TARGET_LINK_HASH_STYLE_microblaze = "" +LINKER_HASH_STYLE_microblaze = "" -- cgit v1.2.3-54-g00ecf