diff --git a/cross-build-rtlibs.sh b/cross-build-rtlibs.sh
index 26a29034b902..5102081a497f 100755
--- a/cross-build-rtlibs.sh
+++ b/cross-build-rtlibs.sh
@@ -1,9 +1,13 @@
 #!/bin/sh
 # build compiler-rt, libcxx, libcxxabi, and libunwind with our patched clang
 # see https://llvm.org/docs/HowToCrossCompileBuiltinsOnArm.html
+set -x
 mkdir -p build-rtlibs
 cd build-rtlibs
-cross_flags="--sysroot=/usr/aarch64-linux-gnu/ --gcc-install-dir=/usr/lib/gcc/aarch64-linux-gnu/14.1.0 --rtlib=compiler-rt -march=armv8+memtag -ffixed-x18"
+ls -l /usr/lib/gcc/aarch64-linux-gnu
+find /usr | fgrep crtbeginS.o
+cross_flags="-B/usr/lib/gcc/aarch64-linux-gnu/14.1.0/ --sysroot=/usr/aarch64-linux-gnu -isystem /usr/aarch64-linux-gnu/include --rtlib=compiler-rt -march=armv8+memtag -ffixed-x18"
+#--sysroot=/usr/aarch64-linux-gnu/ --gcc-install-dir=/usr/lib/gcc/aarch64-linux-gnu/14.1.0
 export LDFLAGS="-L/usr/aarch64-linux-gnu/lib"
 cmake -GNinja -DLLVM_TARGETS_TO_BUILD="AArch64" -DLLVM_DEFAULT_TARGET_TRIPLE="aarch64-linux-gnu" \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
diff --git a/llvm/lib/Transforms/Utils/AArch64LoadStoreTagging.cpp b/llvm/lib/Transforms/Utils/AArch64LoadStoreTagging.cpp
index 47ea934f477f..6c5f363770b1 100644
--- a/llvm/lib/Transforms/Utils/AArch64LoadStoreTagging.cpp
+++ b/llvm/lib/Transforms/Utils/AArch64LoadStoreTagging.cpp
@@ -71,5 +71,5 @@ AArch64LoadStoreTaggingPass::run(Function &F, FunctionAnalysisManager &AM) {
   }
   // return true;
 
-  return PreservedAnalyses::all();
+  return PreservedAnalyses::none();
 }