diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/ar_to_bc.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/ar_to_bc.sh --- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/ar_to_bc.sh +++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/ar_to_bc.sh @@ -30,7 +30,12 @@ for INPUT in *; do for OBJ in $($AR t $INPUT); do $AR x $INPUT $OBJ - mv -f $OBJ $(basename $INPUT).$OBJ + if [[ $(file $OBJ) =~ 'LLVM IR bitcode' ]]; then + mv -f $OBJ $(basename $INPUT).$OBJ + else + # Skip $OBJ which may come from an assembly file (e.g. Support/BLAKE3/*.S). + rm -f $OBJ + fi done done diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh --- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh +++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh @@ -140,7 +140,6 @@ -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_ENABLE_THREADS=OFF \ - -DLLVM_DISABLE_ASSEMBLY_FILES=ON \ $LLVM_SRC fi cd ${LLVM_BUILD}