summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-04-01 13:05:03 -0700
committerMark Hatle <mark.hatle@xilinx.com>2020-04-03 16:00:19 -0700
commitd19766541358a887e205db99d10f0e13923d445d (patch)
treeedf28d6c715244a0957bad77776853e08bb5d183
parenta36088aa206d2492a958c95ebb4d533343224150 (diff)
downloadmeta-xilinx-d19766541358a887e205db99d10f0e13923d445d.tar.gz
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 <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc2
-rw-r--r--meta-xilinx-bsp/conf/machine/microblaze-plm.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/microblaze-pmu.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/microblaze-tc.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/versal-mb.conf2
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 = ""
33GLIBCPIE_microblaze = "" 33GLIBCPIE_microblaze = ""
34SECURITY_CFLAGS_microblaze = "" 34SECURITY_CFLAGS_microblaze = ""
35SECURITY_LDFLAGS_microblaze = "" 35SECURITY_LDFLAGS_microblaze = ""
36# Microblaze does not support gnu hash style
37LINKER_HASH_STYLE_microblaze = "sysv"
36 38
37XSERVER ?= " \ 39XSERVER ?= " \
38 xserver-xorg \ 40 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"
7TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" 7TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
8PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" 8PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
9 9
10TARGET_LINK_HASH_STYLE_microblaze = "" 10LINKER_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"
7TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" 7TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
8PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" 8PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
9 9
10TARGET_LINK_HASH_STYLE_microblaze = "" 10LINKER_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"
7PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}' 7PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}'
8 8
9# GNU hash style not supported 9# GNU hash style not supported
10TARGET_LINK_HASH_STYLE = "" 10LINKER_HASH_STYLE_microblaze = ""
11 11
12# Define all of the multilibs supproted by this configuration 12# Define all of the multilibs supproted by this configuration
13MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" 13MULTILIB_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"
7TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare" 7TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
8PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" 8PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
9 9
10TARGET_LINK_HASH_STYLE_microblaze = "" 10LINKER_HASH_STYLE_microblaze = ""