[tools] master update

[Matt Caswell]

The branch master has been updated
       via  96a195347859112c1520d1ef84690ec3109f1f49 (commit)
      from  dbd9a8a187e3ab8c59e41f957ba1135c364d231c (commit)


- Log -----------------------------------------------------------------
commit 96a195347859112c1520d1ef84690ec3109f1f49
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Dec 1 14:49:50 2020 +0000

    Ensure sanitizer builds use no-asm
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/tools/pull/77)

-----------------------------------------------------------------------

Summary of changes:
 run-checker/run-checker.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh
index 643128d..19849cd 100755
--- a/run-checker/run-checker.sh
+++ b/run-checker/run-checker.sh
@@ -99,12 +99,12 @@ if run-hook prepare; then
 
         if [ "$opt" == "enable-asan" ]; then
             # A documented requirement for enable-asan is no-shared
-            expandedopts="enable-asan no-shared -DOPENSSL_SMALL_FOOTPRINT"
+            expandedopts="enable-asan no-shared no-asm -DOPENSSL_SMALL_FOOTPRINT"
         elif [ "$opt" == "enable-ubsan" ]; then
             # We've seen it on Travis already, ubsan requires -DPEDANTIC and
             # -fno-sanitize=alignment, or crypto/modes will fail to build in
             # some circumstances.  Running on a VM seems to be one of them.
-            expandedopts="enable-ubsan -DPEDANTIC -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=alignment"
+            expandedopts="enable-ubsan no-asm -DPEDANTIC -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=alignment"
         elif [ "$opt" == "enable-fuzz-afl" ]; then
             warnopts=""
             optcc=afl-clang-fast