Skip to content

Commit fe94bc1

Browse files
committed
Remove duplicate symbol workaround
1 parent 351d48e commit fe94bc1

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ jobs:
9090
- run: rustup component add llvm-tools-preview
9191
- name: Download compiler-rt reference sources
9292
run: |
93-
curl -L -o code.tar.gz https://github.com/rust-lang/llvm-project/archive/rustc/13.0-2021-08-08.tar.gz
94-
tar xzf code.tar.gz --strip-components 1 llvm-project-rustc-13.0-2021-08-08/compiler-rt
93+
curl -L -o code.tar.gz https://github.com/rust-lang/llvm-project/archive/rustc/18.0-2024-02-13.tar.gz
94+
tar xzf code.tar.gz --strip-components 1 llvm-project-rustc-18.0-2024-02-13/compiler-rt
9595
echo RUST_COMPILER_RT_ROOT=./compiler-rt >> $GITHUB_ENV
9696
shell: bash
9797

ci/run.sh

-5
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,11 @@ for rlib in $(echo $path); do
5757
stdout=$($NM -g --defined-only $rlib 2>&1)
5858
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several
5959
# times so ignore it
60-
#
61-
# FIXME(#167) - we shouldn't ignore `__builtin_cl` style symbols here.
6260
set +e
6361
echo "$stdout" | \
6462
sort | \
6563
uniq -d | \
6664
grep -v __x86.get_pc_thunk | \
67-
grep -v __builtin_cl | \
68-
grep -v __builtin_ctz | \
69-
grep -v __builtin_sadd_overflow | \
7065
grep 'T __'
7166

7267
if test $? = 0; then

0 commit comments

Comments
 (0)