Skip to content

Commit e076921

Browse files
committed
binutils
1 parent dbab30c commit e076921

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

.github/workflows/linux_thirdparty.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,9 @@ jobs:
230230
- { vm: cctest, proj: cctest_lcc }
231231
- { vm: cctest, proj: cctest_pcctests }
232232
- { vm: cctest, proj: cctest_wacc }
233-
- { vm: cctest, proj: test_kefir }
234-
- { vm: cctest, proj: test_tinycc }
233+
- { vm: cctest, proj: test_binutils_gccverify }
234+
- { vm: cctest, proj: test_kefir_gccverify }
235+
- { vm: cctest, proj: test_tinycc_gccverify }
235236
- { vm: cctest, proj: build_lacc }
236237
steps:
237238
- name: Download artifact

scripts/linux_thirdparty.bash

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ test_bfs() {
3939
}
4040

4141
test_binutils() {
42-
url_lz https://ftpmirror.gnu.org/gnu/binutils/binutils-with-gold-2.46.tar.lz binutils
43-
sed -i 's|^# define __attribute__(x)$||g' include/ansidecl.h
42+
shared_binutils
4443

4544
(cd ld/testsuite && find . -name '*.c' -exec sed -i 's|^#pragma weak.*|__attribute__((weak))|g' {} +)
4645
sed -i 's|\[at_least_gcc_version 5 1\]|1|g' ld/testsuite/ld-elf/linux-x86.exp
@@ -65,8 +64,12 @@ test_binutils() {
6564
# this one passes '-Bsymbolic' to cc, not sure if intended
6665
sed -i 's|symbolic \"-Bsymbolic\"|symbolic \"-Wl,-Bsymbolic\"|g' ld/testsuite/ld-shared/shared.exp
6766

68-
fix_and_configure --disable-gprofng
69-
make && make check
67+
make check
68+
}
69+
70+
test_binutils_gccverify() {
71+
shared_binutils
72+
make check CC=gcc CC_FOR_BUILD=gcc CC_FOR_TARGET=gcc
7073
}
7174

7275
test_bison() {
@@ -433,7 +436,7 @@ test_jq() {
433436
make check
434437
}
435438

436-
test_kefir() {
439+
test_kefir_gccverify() {
437440
codeberg_tar jprotopopov kefir v0.5.0
438441
mkdir bin && CC=gcc scripts/detect-host-env.sh --header > bin/config.h
439442
make CC="$CC"
@@ -1114,7 +1117,7 @@ test_tcl() {
11141117
grep -P -q '^all.tcl.*Failed\t0$' __testlog
11151118
}
11161119

1117-
test_tinycc() {
1120+
test_tinycc_gccverify() {
11181121
local CCTESTSCRIPT=$(dirname $(realpath $0))/cctest_tinycc.bash
11191122

11201123
git_fetch https://github.com/Tiny-C-Compiler/tinycc-mirror-repository 4597a9621e70a337b241d424f4ab4729cb75b426 tinycc
@@ -1784,6 +1787,14 @@ url_xz() {
17841787
get_tar .xz "$2" "$1"
17851788
}
17861789

1790+
shared_binutils() {
1791+
url_lz https://ftpmirror.gnu.org/gnu/binutils/binutils-with-gold-2.46.tar.lz binutils
1792+
sed -i 's|^# define __attribute__(x)$||g' include/ansidecl.h
1793+
1794+
fix_and_configure --disable-gprofng
1795+
make
1796+
}
1797+
17871798
shared_muon() {
17881799
git_fetch https://github.com/muon-build/muon 4e5da086c500ce8b0a45ccef92a64202acc6dc7d muon
17891800
cat << EOF >> src/script/runtime/toolchains.meson

0 commit comments

Comments
 (0)