diff --git a/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-b-key-bti_baremetal.sh b/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-b-key-bti_baremetal.sh
index 5ef65936..90d0b438 100644
--- a/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-b-key-bti_baremetal.sh
+++ b/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-b-key-bti_baremetal.sh
@@ -8,4 +8,4 @@ RESOURCE_DIR=$(clang -print-resource-dir)
 PATH_TO_BUILTIN=$RESOURCE_DIR/lib/baremetal
 BUILTIN=clang_rt.builtins-pacret-bti-aarch64-nofp
 
-./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-nofp --quic-aarch64-mark-bti --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-mabi=aapcs-soft -march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -mgeneral-regs-only -mllvm -aarch64-enable-simd-scalar=false -fno-rounding-math" LDFLAGS="-Wl,-L${PATH_TO_BUILTIN}" LIBCC="-l${BUILTIN}" "$@"
+./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-nofp --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-mabi=aapcs-soft -march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -mgeneral-regs-only -mllvm -aarch64-enable-simd-scalar=false -fno-rounding-math" LDFLAGS="-Wl,-L${PATH_TO_BUILTIN}" LIBCC="-l${BUILTIN}" "$@"
diff --git a/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-bti_baremetal.sh b/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-bti_baremetal.sh
index 919f6143..984c8484 100644
--- a/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-bti_baremetal.sh
+++ b/qualcomm-software/config/linux/arm/aarch64-nofp-pacret-bti_baremetal.sh
@@ -8,4 +8,4 @@ RESOURCE_DIR=$(clang -print-resource-dir)
 PATH_TO_BUILTIN=$RESOURCE_DIR/lib/baremetal
 BUILTIN=clang_rt.builtins-pacret-bti-aarch64-nofp
 
-./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-nofp --quic-aarch64-mark-bti --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-mabi=aapcs-soft -march=armv8.3a -mbranch-protection=pac-ret+leaf+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -mgeneral-regs-only -mllvm -aarch64-enable-simd-scalar=false -fno-rounding-math" LDFLAGS="-Wl,-L${PATH_TO_BUILTIN}" LIBCC="-l${BUILTIN}" "$@"
+./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-nofp --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-mabi=aapcs-soft -march=armv8.3a -mbranch-protection=pac-ret+leaf+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -mgeneral-regs-only -mllvm -aarch64-enable-simd-scalar=false -fno-rounding-math" LDFLAGS="-Wl,-L${PATH_TO_BUILTIN}" LIBCC="-l${BUILTIN}" "$@"
diff --git a/qualcomm-software/config/linux/arm/aarch64-pacret-b-key-bti_baremetal.sh b/qualcomm-software/config/linux/arm/aarch64-pacret-b-key-bti_baremetal.sh
index ba389244..d07bbaaa 100644
--- a/qualcomm-software/config/linux/arm/aarch64-pacret-b-key-bti_baremetal.sh
+++ b/qualcomm-software/config/linux/arm/aarch64-pacret-b-key-bti_baremetal.sh
@@ -13,11 +13,11 @@ echo $INSTALL_DIR
 mkdir -p $INSTALL_DIR/lib
 # configure for libc standalone
 
-./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-mark-bti --quic-libc-standalone --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -D__QUIC_ENABLE_FLT_FOR_PRINT -fno-rounding-math" "$@" --prefix=tmp_install_dir/libc
+./configure --disable-wrapper --quic-arm-baremetal --quic-libc-standalone --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -D__QUIC_ENABLE_FLT_FOR_PRINT -fno-rounding-math" "$@" --prefix=tmp_install_dir/libc
 
 make -j8 && make install
 cp tmp_install_dir/libc/lib/libc.a $INSTALL_DIR/lib/libc-standalone.a
 rm -rf tmp_install_dir
 make distclean
 
-./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-mark-bti --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -fno-rounding-math" "$@"
+./configure --disable-wrapper --quic-arm-baremetal --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.5-a -mbranch-protection=pac-ret+leaf+b-key+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -fno-rounding-math" "$@"
diff --git a/qualcomm-software/config/linux/arm/aarch64-pacret-bti_baremetal.sh b/qualcomm-software/config/linux/arm/aarch64-pacret-bti_baremetal.sh
index 960c6cc1..01acfad6 100644
--- a/qualcomm-software/config/linux/arm/aarch64-pacret-bti_baremetal.sh
+++ b/qualcomm-software/config/linux/arm/aarch64-pacret-bti_baremetal.sh
@@ -13,11 +13,11 @@ echo $INSTALL_DIR
 mkdir -p $INSTALL_DIR/lib
 # configure for libc standalone
 
-./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-mark-bti --quic-libc-standalone --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.3a -mbranch-protection=pac-ret+leaf+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -D__QUIC_ENABLE_FLT_FOR_PRINT -fno-rounding-math" "$@" --prefix=tmp_install_dir/libc
+./configure --disable-wrapper --quic-arm-baremetal --quic-libc-standalone --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.3a -mbranch-protection=pac-ret+leaf+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -D__QUIC_ENABLE_FLT_FOR_PRINT -fno-rounding-math" "$@" --prefix=tmp_install_dir/libc
 
 make -j8 && make install
 cp tmp_install_dir/libc/lib/libc.a $INSTALL_DIR/lib/libc-standalone.a
 rm -rf tmp_install_dir
 make distclean
 
-./configure --disable-wrapper --quic-arm-baremetal --quic-aarch64-mark-bti --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.3a -mbranch-protection=pac-ret+leaf+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -fno-rounding-math" "$@"
+./configure --disable-wrapper --quic-arm-baremetal --disable-visibility CROSS_COMPILE="llvm-" CC="clang --target=aarch64-none-elf -fuse-ld=eld" CFLAGS="-march=armv8.3a -mbranch-protection=pac-ret+leaf+bti -Os -mstrict-align -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden -DVISIBILITY_HIDDEN -fno-rounding-math" "$@"