[compiler-rt] 241e645 - ar_to_bc.sh: Ignore non-bitcode files in archives

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2022-06-01T10:28:14-07:00
New Revision: 241e645036f8a4383dfce4c043586ebf9b0ce225

URL: https://github.com/llvm/llvm-project/commit/241e645036f8a4383dfce4c043586ebf9b0ce225
DIFF: https://github.com/llvm/llvm-project/commit/241e645036f8a4383dfce4c043586ebf9b0ce225.diff

LOG: ar_to_bc.sh: Ignore non-bitcode files in archives

The script uses llvm-link to link LLVM bitcode files.
5426da8ffa4a6d55adab21026ce6ebe8f1cc6ef2 used -DLLVM_DISABLE_ASSEMBLY_FILES=ON
to ignore object files compiled from lib/Support/BLAKE3/*.S.

A better approach (which fits Bazel better) is to ignore non-bitcode files.

Reviewed By: akyrtzi

Differential Revision: https://reviews.llvm.org/D126728

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/symbolizer/scripts/ar_to_bc.sh
    compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh

Removed: 
    


################################################################################
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
index fa05d61a7c6d9..7b69539ec59da 100755
--- 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 @@ pushd $SCRATCH_DIR
 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
index 196a876a6e7e4..599f063b45c9b 100755
--- 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 @@ if [[ ! -d ${LLVM_BUILD} ]]; then
     -DLLVM_ENABLE_ZLIB=ON \
     -DLLVM_ENABLE_TERMINFO=OFF \
     -DLLVM_ENABLE_THREADS=OFF \
-    -DLLVM_DISABLE_ASSEMBLY_FILES=ON \
   $LLVM_SRC
 fi
 cd ${LLVM_BUILD}