[Lldb-commits] [lldb] 5193c4a - [lldb][AArch64] Fix run-qemu.sh when only MTE is enabled.

[David Spickett via lldb-commits]

Author: David Spickett
Date: 2023-03-23T13:48:44Z
New Revision: 5193c4a8b38c3e61c862d5badf1cace7c26324f7

URL: https://github.com/llvm/llvm-project/commit/5193c4a8b38c3e61c862d5badf1cace7c26324f7
DIFF: https://github.com/llvm/llvm-project/commit/5193c4a8b38c3e61c862d5badf1cace7c26324f7.diff

LOG: [lldb][AArch64] Fix run-qemu.sh when only MTE is enabled.

SVE and MTE both require a CPU with that feature before
you can use the other options, but we only added the "max"
cpu when SVE was enabled too.

Added: 
    

Modified: 
    lldb/scripts/lldb-test-qemu/run-qemu.sh

Removed: 
    


################################################################################
diff  --git a/lldb/scripts/lldb-test-qemu/run-qemu.sh b/lldb/scripts/lldb-test-qemu/run-qemu.sh
old mode 100644
new mode 100755
index 339b8d955e613..d11711c10e772
--- a/lldb/scripts/lldb-test-qemu/run-qemu.sh
+++ b/lldb/scripts/lldb-test-qemu/run-qemu.sh
@@ -109,8 +109,12 @@ elif [[ "$ARCH" == "arm64" ]]; then
   QEMU_SVE_MAX_VQ=4
   QEMU_CPU="cortex-a53"
 
+  if [[ $SVE ]] || [[ $MTE ]]; then
+    QEMU_CPU="max"
+  fi
+
   if [[ $SVE ]]; then
-    QEMU_CPU="max,sve-max-vq=$QEMU_SVE_MAX_VQ"
+    QEMU_CPU="$QEMU_CPU,sve-max-vq=$QEMU_SVE_MAX_VQ"
   fi
   if [[ $MTE ]]; then
     QEMU_MACHINE="$QEMU_MACHINE,mte=on"