diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh
--- a/llvm/utils/release/test-release.sh
+++ b/llvm/utils/release/test-release.sh
@@ -35,7 +35,6 @@
 do_libunwind="yes"
 do_test_suite="yes"
 do_openmp="yes"
-do_bolt="no"
 do_lld="yes"
 do_lldb="yes"
 do_polly="yes"
@@ -47,6 +46,20 @@
 ExportBranch=""
 git_ref=""
 
+Machine=`uname -m`
+do_bolt="no"
+if [ "$System" = "Linux" ]; then
+    case $Machine in
+        x86_64 )
+            do_bolt="yes"
+            ;;
+        arm64 | aarch64 )
+            do_bolt="yes"
+            ;;
+    esac
+fi
+
+
 function usage() {
     echo "usage: `basename $0` -release X.Y.Z -rc NUM [OPTIONS]"
     echo ""