diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-06 14:48:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-10 13:03:57 +0000 |
commit | 89ce67d8e41cc50a9b9ee225c054729f9cee7cdc (patch) | |
tree | 8bb5d2ed19e0c205289008d2bce9d6a64d24eb95 /meta/recipes-devtools | |
parent | 6d0cf6477c1703d60befe13f293afd0a602553a1 (diff) | |
download | poky-89ce67d8e41cc50a9b9ee225c054729f9cee7cdc.tar.gz |
recipes: Drop ld-is-gold support
Gold hasn't seen development in some time and is being dropped from binutils
releases. Drop the small number of special cases for it we were carrying.
This patch also turns off gold in the binutils recipe.
(From OE-Core rev: a4addb9ab63011e7c604fc5daff95559e7d214e7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils.inc | 20 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/libstd-rs_1.81.0.bb | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust_1.81.0.bb | 5 |
3 files changed, 1 insertions, 29 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 81443105f6..00b1301258 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc | |||
@@ -56,12 +56,6 @@ GPROFNG_ALTS:x86 = "${GPROFNGS}" | |||
56 | GPROFNG_ALTS:x86-64 = "${GPROFNGS}" | 56 | GPROFNG_ALTS:x86-64 = "${GPROFNGS}" |
57 | GPROFNG_ALTS:aarch64 = "${GPROFNGS}" | 57 | GPROFNG_ALTS:aarch64 = "${GPROFNGS}" |
58 | 58 | ||
59 | LDGOLD_ALTS ?= "ld.gold dwp" | ||
60 | LDGOLD_ALTS:riscv64 = "" | ||
61 | LDGOLD_ALTS:riscv32 = "" | ||
62 | LDGOLD_ALTS:loongarch64 = "" | ||
63 | LDGOLD_ALTS:libc-glibc:mipsarch = "" | ||
64 | |||
65 | USE_ALTERNATIVES_FOR = " \ | 59 | USE_ALTERNATIVES_FOR = " \ |
66 | addr2line \ | 60 | addr2line \ |
67 | ar \ | 61 | ar \ |
@@ -72,7 +66,6 @@ USE_ALTERNATIVES_FOR = " \ | |||
72 | ${GPROFNG_ALTS} \ | 66 | ${GPROFNG_ALTS} \ |
73 | ld \ | 67 | ld \ |
74 | ld.bfd \ | 68 | ld.bfd \ |
75 | ${LDGOLD_ALTS} \ | ||
76 | nm \ | 69 | nm \ |
77 | objcopy \ | 70 | objcopy \ |
78 | objdump \ | 71 | objdump \ |
@@ -104,7 +97,7 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ | |||
104 | --disable-libdecnumber \ | 97 | --disable-libdecnumber \ |
105 | --disable-readline \ | 98 | --disable-readline \ |
106 | --disable-sim \ | 99 | --disable-sim \ |
107 | ${LDGOLD} \ | 100 | --disable-gold \ |
108 | ${EXTRA_TARGETS} \ | 101 | ${EXTRA_TARGETS} \ |
109 | ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" | 102 | ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" |
110 | 103 | ||
@@ -112,12 +105,6 @@ EXTRA_TARGETS = "" | |||
112 | EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " | 105 | EXTRA_TARGETS:x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " |
113 | EXTRA_TARGETS:class-native = "" | 106 | EXTRA_TARGETS:class-native = "" |
114 | 107 | ||
115 | LDGOLD:class-native = "" | ||
116 | LDGOLD:class-crosssdk = "" | ||
117 | LDGOLD:libc-glibc:mipsarch = "" | ||
118 | LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" | ||
119 | |||
120 | |||
121 | # This is necessary due to a bug in the binutils Makefiles | 108 | # This is necessary due to a bug in the binutils Makefiles |
122 | # EXTRA_OEMAKE = "configure-build-libiberty all" | 109 | # EXTRA_OEMAKE = "configure-build-libiberty all" |
123 | 110 | ||
@@ -204,8 +191,3 @@ inherit update-alternatives | |||
204 | ALTERNATIVE_PRIORITY = "100" | 191 | ALTERNATIVE_PRIORITY = "100" |
205 | 192 | ||
206 | ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" | 193 | ALTERNATIVE:${PN}:class-target = "${USE_ALTERNATIVES_FOR}" |
207 | |||
208 | python () { | ||
209 | if bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', True, False, d) and bb.utils.contains_any('TARGET_ARCH', 'riscv32 riscv64 loongarch64', True, False, d): | ||
210 | bb.fatal("Gold linker does not _yet_ support RISC-V and LoongArch architecture please remove ld-is-gold from DISTRO_FEATURES") | ||
211 | } | ||
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.81.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.81.0.bb index 14161714f2..06a2889b92 100644 --- a/meta/recipes-devtools/rust/libstd-rs_1.81.0.bb +++ b/meta/recipes-devtools/rust/libstd-rs_1.81.0.bb | |||
@@ -48,8 +48,3 @@ do_install () { | |||
48 | } | 48 | } |
49 | 49 | ||
50 | BBCLASSEXTEND = "nativesdk" | 50 | BBCLASSEXTEND = "nativesdk" |
51 | |||
52 | # Since 1.70.0 upgrade this fails to build with gold: | ||
53 | # http://errors.yoctoproject.org/Errors/Details/708194/ | ||
54 | # ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined | ||
55 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-fuse-ld=bfd', '', d)}" | ||
diff --git a/meta/recipes-devtools/rust/rust_1.81.0.bb b/meta/recipes-devtools/rust/rust_1.81.0.bb index 1038c275f6..c4f8ee7108 100644 --- a/meta/recipes-devtools/rust/rust_1.81.0.bb +++ b/meta/recipes-devtools/rust/rust_1.81.0.bb | |||
@@ -377,8 +377,3 @@ RUSTLIB_DEP:class-nativesdk = "" | |||
377 | INSANE_SKIP:${PN} = "staticdev" | 377 | INSANE_SKIP:${PN} = "staticdev" |
378 | 378 | ||
379 | BBCLASSEXTEND = "native nativesdk" | 379 | BBCLASSEXTEND = "native nativesdk" |
380 | |||
381 | # Since 1.70.0 upgrade this fails to build with gold: | ||
382 | # http://errors.yoctoproject.org/Errors/Details/708196/ | ||
383 | # ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined | ||
384 | LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-fuse-ld=bfd', '', d)}" | ||