Skip to content

Commit c6a4104

Browse files
spholznico
spholz
authored and
nico
committed
Toolchain+Ports: Update binutils to 2.44
1 parent 7a1b3fe commit c6a4104

File tree

6 files changed

+52
-100
lines changed

6 files changed

+52
-100
lines changed

‎Meta/serenity.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ ensure_toolchain() {
284284
if [ "$TOOLCHAIN_TYPE" = "GNU" ]; then
285285
local ld_version
286286
ld_version="$("$TOOLCHAIN_DIR"/bin/"$TARGET"-pc-serenity-ld -v)"
287-
local expected_version="GNU ld (GNU Binutils) 2.41"
287+
local expected_version="GNU ld (GNU Binutils) 2.44"
288288
if [ "$ld_version" != "$expected_version" ]; then
289289
echo "Your toolchain has an old version of binutils installed."
290290
echo " installed version: \"$ld_version\""

‎Ports/AvailablePorts.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
1919
| [`bass`](bass/) | Beneath a Steel Sky | cd-1.2 | https://www.scummvm.org/games |
2020
| [`bc`](bc/) | bc | 7.0.3 | https://github.com/gavinhoward/bc |
2121
| [`bdwgc`](bdwgc/) | Boehm-Demers-Weiser Garbage Collector (libgc) | 8.2.8 | https://github.com/ivmai/bdwgc |
22-
| [`binutils`](binutils/) | GNU Binutils | 2.41 | https://www.gnu.org/software/binutils/ |
22+
| [`binutils`](binutils/) | GNU Binutils | 2.44 | https://www.gnu.org/software/binutils/ |
2323
| [`bison`](bison/) | GNU Bison | 3.8.2 | https://www.gnu.org/software/bison/ |
2424
| [`bochs`](bochs/) | Bochs x86 PC emulator | 2.7 | https://sourceforge.net/projects/bochs/ |
2525
| [`boost`](boost/) | Boost C++ libraries | 1.83.0 | https://www.boost.org/ |

‎Ports/binutils/package.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env -S bash ../.port_include.sh
22
port='binutils'
3-
version='2.41'
3+
version='2.44'
44
useconfigure='true'
55
use_fresh_config_sub='true'
66
configopts=(
@@ -13,7 +13,7 @@ configopts=(
1313
"--enable-libiberty"
1414
)
1515
files=(
16-
"https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz#ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450"
16+
"https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz#ce2017e059d63e67ddb9240e9d4ec49c2893605035cd60e92ad53177f4377237"
1717
)
1818
depends=(
1919
'zlib'

‎Toolchain/BuildGNU.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ echo SYSROOT is "$SYSROOT"
7474

7575
mkdir -p "$DIR/Tarballs"
7676

77-
BINUTILS_VERSION="2.41"
78-
BINUTILS_MD5SUM="256d7e0ad998e423030c84483a7c1e30"
77+
BINUTILS_VERSION="2.44"
78+
BINUTILS_MD5SUM="49912ce774666a30806141f106124294"
7979
BINUTILS_NAME="binutils-$BINUTILS_VERSION"
8080
BINUTILS_PKG="${BINUTILS_NAME}.tar.xz"
8181
BINUTILS_BASE_URL="https://ftpmirror.gnu.org/gnu/binutils"

‎Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch

+27-75
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ On AArch64, we set `COMMONPAGESIZE` to enable RELRO support.
1717
gas/config/tc-i386.c | 3 ++-
1818
gas/config/te-serenity.h | 3 +++
1919
gas/configure.tgt | 3 +++
20-
ld/Makefile.am | 6 ++++++
21-
ld/Makefile.in | 9 +++++++++
20+
ld/Makefile.am | 3 +++
21+
ld/Makefile.in | 6 ++++++
2222
ld/configure.tgt | 9 +++++++++
2323
ld/emulparams/aarch64serenity.sh | 5 +++++
2424
ld/emulparams/elf64lriscvserenity.sh | 2 ++
2525
ld/emulparams/elf_serenity.sh | 1 +
2626
ld/emulparams/elf_x86_64_serenity.sh | 2 ++
27-
11 files changed, 52 insertions(+), 1 deletion(-)
27+
11 files changed, 46 insertions(+), 1 deletion(-)
2828
create mode 100644 gas/config/te-serenity.h
2929
create mode 100644 ld/emulparams/aarch64serenity.sh
3030
create mode 100644 ld/emulparams/elf64lriscvserenity.sh
3131
create mode 100644 ld/emulparams/elf_serenity.sh
3232
create mode 100644 ld/emulparams/elf_x86_64_serenity.sh
3333

3434
diff --git a/bfd/config.bfd b/bfd/config.bfd
35-
index bdee53957c0ca034161715f86e84fcc950d7b625..dc97a5e4a57709736c62f4f4555dd92c0cabd507 100644
35+
index 0d7901175036952b076ce6adebdbb84eaa6c3e7b..da83aa4ec2516c092e0317a14facf6f6518d37cb 100644
3636
--- a/bfd/config.bfd
3737
+++ b/bfd/config.bfd
38-
@@ -283,6 +283,11 @@ case "${targ}" in
38+
@@ -284,6 +284,11 @@ case "${targ}" in
3939
targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
4040
want64=true
4141
;;
@@ -44,10 +44,10 @@ index bdee53957c0ca034161715f86e84fcc950d7b625..dc97a5e4a57709736c62f4f4555dd92c
4444
+ targ_selvecs=
4545
+ want64=true
4646
+ ;;
47-
aarch64-*-linux* | aarch64-*-netbsd* | aarch64-*-nto*)
47+
aarch64-*-linux* | aarch64-*-netbsd* | aarch64-*-nto* | aarch64-*-gnu*)
4848
targ_defvec=aarch64_elf64_le_vec
4949
targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_le_vec aarch64_pe_le_vec"
50-
@@ -734,6 +739,11 @@ case "${targ}" in
50+
@@ -735,6 +740,11 @@ case "${targ}" in
5151
targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec"
5252
want64=true
5353
;;
@@ -60,10 +60,10 @@ index bdee53957c0ca034161715f86e84fcc950d7b625..dc97a5e4a57709736c62f4f4555dd92c
6060
i[3-7]86-*-lynxos*)
6161
targ_defvec=i386_elf32_vec
6262
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
63-
index de35ee2a2c6952e596e2f5092a22dee5cc54d92c..7f9c91019432a86d4eb1e94bfe7b9ffd6976057a 100644
63+
index e5988347e0a59679ea429da5aa844ec8b23a75d0..a19e434e998ef2ab3040226d1b057e997858f357 100644
6464
--- a/gas/config/tc-i386.c
6565
+++ b/gas/config/tc-i386.c
66-
@@ -501,7 +501,8 @@ const char extra_symbol_chars[] = "*%-([{}"
66+
@@ -571,7 +571,8 @@ const char extra_symbol_chars[] = "*%-(["
6767
&& !defined (TE_Haiku) \
6868
&& !defined (TE_FreeBSD) \
6969
&& !defined (TE_DragonFly) \
@@ -83,26 +83,26 @@ index 0000000000000000000000000000000000000000..f38faf598cba7f561ed9528ee3732822
8383
+
8484
+#define TE_SerenityOS 1
8585
diff --git a/gas/configure.tgt b/gas/configure.tgt
86-
index 3429f850d05a23783d6736d875c649f5acf48afa..cc83c4d94da21fa278f7f2bdd32b436bd4b540a3 100644
86+
index 7c81bffa16bf1793357ecdf37b172fbc21b51e06..d07145ed396da716c52402a05cfb27e5ff6d2869 100644
8787
--- a/gas/configure.tgt
8888
+++ b/gas/configure.tgt
89-
@@ -137,6 +137,7 @@ case ${generic_target} in
89+
@@ -139,6 +139,7 @@ case ${generic_target} in
9090
aarch64*-*-nto*) fmt=elf;;
9191
aarch64*-*-openbsd*) fmt=elf;;
9292
aarch64*-*-pe* | aarch64*-*-mingw*) fmt=coff em=pepaarch64 ;;
9393
+ aarch64*-*-serenity*) fmt=elf em=serenity ;;
9494
alpha-*-*vms*) fmt=evax ;;
9595
alpha-*-osf*) fmt=ecoff ;;
9696
alpha-*-linux*ecoff*) fmt=ecoff ;;
97-
@@ -265,6 +266,7 @@ case ${generic_target} in
97+
@@ -267,6 +268,7 @@ case ${generic_target} in
9898
i386-*-*nt*) fmt=coff em=pe ;;
9999
i386-*-rdos*) fmt=elf ;;
100100
i386-*-darwin*) fmt=macho ;;
101101
+ i386-*-serenity) fmt=elf em=serenity ;;
102102

103103
ia16-*-elf*) fmt=elf ;;
104104

105-
@@ -370,6 +372,7 @@ case ${generic_target} in
105+
@@ -372,6 +374,7 @@ case ${generic_target} in
106106

107107
pru-*-*) fmt=elf ;;
108108

@@ -111,7 +111,7 @@ index 3429f850d05a23783d6736d875c649f5acf48afa..cc83c4d94da21fa278f7f2bdd32b436b
111111
riscv*-*-*) fmt=elf ;;
112112

113113
diff --git a/ld/Makefile.am b/ld/Makefile.am
114-
index c3adbb0ccadacb5060988fe0aa24700b7cb489b4..5bbb3a61738a4cce09ba9b8b58d329c3bd5a36ec 100644
114+
index ccff92899249fc8bca672c6f28e77ad14a55de79..797727456c6896a566d4658f2841e7a5ad0842f9 100644
115115
--- a/ld/Makefile.am
116116
+++ b/ld/Makefile.am
117117
@@ -390,6 +390,7 @@ ALL_64_EMULATION_SOURCES = \
@@ -122,127 +122,79 @@ index c3adbb0ccadacb5060988fe0aa24700b7cb489b4..5bbb3a61738a4cce09ba9b8b58d329c3
122122
earm64pe.c \
123123
eelf32_x86_64.c \
124124
eelf32b4300.c \
125-
@@ -444,6 +445,7 @@ ALL_64_EMULATION_SOURCES = \
125+
@@ -447,6 +448,7 @@ ALL_64_EMULATION_SOURCES = \
126126
eelf64lppc.c \
127127
eelf64lppc_fbsd.c \
128128
eelf64lriscv.c \
129129
+ eelf64lriscvserenity.c \
130130
eelf64lriscv_lp64.c \
131131
eelf64lriscv_lp64f.c \
132132
eelf64ltsmip.c \
133-
@@ -459,6 +461,7 @@ ALL_64_EMULATION_SOURCES = \
133+
@@ -462,6 +464,7 @@ ALL_64_EMULATION_SOURCES = \
134134
eelf_x86_64_cloudabi.c \
135135
eelf_x86_64_fbsd.c \
136136
eelf_x86_64_haiku.c \
137137
+ eelf_x86_64_serenity.c \
138138
eelf_x86_64_sol2.c \
139139
ehppa64linux.c \
140140
ei386pep.c \
141-
@@ -885,6 +888,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
142-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Pc@am__quote@
143-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64nto.Pc@am__quote@
144-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Pc@am__quote@
145-
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64serenity.Pc@am__quote@
146-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earm64pe.Pc@am__quote@
147-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Pc@am__quote@
148-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Pc@am__quote@
149-
@@ -939,6 +943,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
150-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc_fbsd.Pc@am__quote@
151-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64loongarch.Pc@am__quote@
152-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv.Pc@am__quote@
153-
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscvserenity.Pc@am__quote@
154-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64.Pc@am__quote@
155-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64f.Pc@am__quote@
156-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ltsmip.Pc@am__quote@
157-
@@ -954,6 +959,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
158-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@
159-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@
160-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Pc@am__quote@
161-
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_serenity.Pc@am__quote@
162-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@
163-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@
164-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Pc@am__quote@
165141
diff --git a/ld/Makefile.in b/ld/Makefile.in
166-
index d1a5602643787c240b5323c6c09b9d2bbc813e79..b18a0ed9cede77b1665bb0716176091ac02f5fe9 100644
142+
index 3e24bd4deb26f787439c69e57f9321755f2d258a..301e6e7b77ba8893356a7d3c78f4bb38947f7d4d 100644
167143
--- a/ld/Makefile.in
168144
+++ b/ld/Makefile.in
169-
@@ -890,6 +890,7 @@ ALL_64_EMULATION_SOURCES = \
145+
@@ -900,6 +900,7 @@ ALL_64_EMULATION_SOURCES = \
170146
eaarch64linuxb.c \
171147
eaarch64nto.c \
172148
eaarch64pe.c \
173149
+ eaarch64serenity.c \
174150
earm64pe.c \
175151
eelf32_x86_64.c \
176152
eelf32b4300.c \
177-
@@ -944,6 +945,7 @@ ALL_64_EMULATION_SOURCES = \
153+
@@ -957,6 +958,7 @@ ALL_64_EMULATION_SOURCES = \
178154
eelf64lppc.c \
179155
eelf64lppc_fbsd.c \
180156
eelf64lriscv.c \
181157
+ eelf64lriscvserenity.c \
182158
eelf64lriscv_lp64.c \
183159
eelf64lriscv_lp64f.c \
184160
eelf64ltsmip.c \
185-
@@ -959,6 +961,7 @@ ALL_64_EMULATION_SOURCES = \
161+
@@ -972,6 +974,7 @@ ALL_64_EMULATION_SOURCES = \
186162
eelf_x86_64_cloudabi.c \
187163
eelf_x86_64_fbsd.c \
188164
eelf_x86_64_haiku.c \
189165
+ eelf_x86_64_serenity.c \
190166
eelf_x86_64_sol2.c \
191167
ehppa64linux.c \
192168
ei386pep.c \
193-
@@ -1271,6 +1274,7 @@ distclean-compile:
169+
@@ -1284,6 +1287,7 @@ distclean-compile:
194170
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Po@am__quote@
195171
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64nto.Po@am__quote@
196172
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Po@am__quote@
197173
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64serenity.Po@am__quote@
198174
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaix5ppc.Po@am__quote@
199175
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaix5rs6.Po@am__quote@
200176
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaixppc.Po@am__quote@
201-
@@ -1447,6 +1451,7 @@ distclean-compile:
177+
@@ -1465,6 +1469,7 @@ distclean-compile:
202178
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc.Po@am__quote@
203179
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc_fbsd.Po@am__quote@
204180
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv.Po@am__quote@
205181
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscvserenity.Po@am__quote@
206182
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64.Po@am__quote@
207183
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64f.Po@am__quote@
208184
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ltsmip.Po@am__quote@
209-
@@ -1471,6 +1476,7 @@ distclean-compile:
185+
@@ -1489,6 +1494,7 @@ distclean-compile:
210186
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@
211187
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@
212188
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Po@am__quote@
213189
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_serenity.Po@am__quote@
214190
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@
215191
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Po@am__quote@
216192
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf_linux.Po@am__quote@
217-
@@ -2602,6 +2608,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
218-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Pc@am__quote@
219-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64nto.Pc@am__quote@
220-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Pc@am__quote@
221-
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64serenity.Pc@am__quote@
222-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earm64pe.Pc@am__quote@
223-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Pc@am__quote@
224-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Pc@am__quote@
225-
@@ -2656,6 +2663,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
226-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lppc_fbsd.Pc@am__quote@
227-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64loongarch.Pc@am__quote@
228-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv.Pc@am__quote@
229-
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscvserenity.Po@am__quote@
230-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64.Pc@am__quote@
231-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64lriscv_lp64f.Pc@am__quote@
232-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64ltsmip.Pc@am__quote@
233-
@@ -2671,6 +2679,7 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
234-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@
235-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@
236-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Pc@am__quote@
237-
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_serenity.Pc@am__quote@
238-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@
239-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@
240-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Pc@am__quote@
241193
diff --git a/ld/configure.tgt b/ld/configure.tgt
242-
index c62b9581d9b8bb0bb000ff83247baa6144b9921b..6d0d7b2e0dee06be5c808aa933643e4c9eff0a7a 100644
194+
index ea01ccf9a1b7f959b25768397057e33a990541cb..c0f81114d44aef3deccd63c6325c60fa5fe4641d 100644
243195
--- a/ld/configure.tgt
244196
+++ b/ld/configure.tgt
245-
@@ -97,6 +97,9 @@ aarch64-*-freebsd*) targ_emul=aarch64fbsd
197+
@@ -98,6 +98,9 @@ aarch64-*-freebsd*) targ_emul=aarch64fbsd
246198
aarch64-*-fuchsia*) targ_emul=aarch64elf
247199
targ_extra_emuls="aarch64elfb armelf armelfb"
248200
;;
@@ -252,7 +204,7 @@ index c62b9581d9b8bb0bb000ff83247baa6144b9921b..6d0d7b2e0dee06be5c808aa933643e4c
252204
aarch64_be-*-linux-gnu_ilp32)
253205
targ_emul=aarch64linux32b
254206
targ_extra_libpath="aarch64linuxb aarch64linux aarch64linux32 armelfb_linux_eabi armelf_linux_eabi"
255-
@@ -825,6 +828,9 @@ riscv64*-*-linux*) targ_emul=elf64lriscv
207+
@@ -833,6 +836,9 @@ riscv64*-*-linux*) targ_emul=elf64lriscv
256208
targ_extra_emuls="elf64lriscv_lp64f elf64lriscv_lp64 elf32lriscv elf32lriscv_ilp32f elf32lriscv_ilp32 elf64briscv elf64briscv_lp64f elf64briscv_lp64 elf32briscv elf32briscv_ilp32f elf32briscv_ilp32"
257209
targ_extra_libpath=$targ_extra_emuls
258210
;;
@@ -262,7 +214,7 @@ index c62b9581d9b8bb0bb000ff83247baa6144b9921b..6d0d7b2e0dee06be5c808aa933643e4c
262214
riscv64be*-*-*) targ_emul=elf64briscv
263215
targ_extra_emuls="elf32briscv elf64lriscv elf32lriscv"
264216
targ_extra_libpath=$targ_extra_emuls
265-
@@ -1011,6 +1017,9 @@ x86_64-*-linux-*) targ_emul=elf_x86_64
217+
@@ -1019,6 +1025,9 @@ x86_64-*-linux-*) targ_emul=elf_x86_64
266218
x86_64-*-redox*) targ_emul=elf_x86_64
267219
targ_extra_emuls=elf_i386
268220
;;

0 commit comments

Comments
 (0)