final cleanup for LLVM_VERSION=13 upgrade

.github/workflows/main.yaml

@@ -26,6 +26,8 @@ jobs:
           sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-$LLVM_VERSION main"
           sudo apt update
           sudo apt install clang-format-$LLVM_VERSION --yes
+          sudo update-alternatives --remove-all clang-format
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-$LLVM_VERSION 100
       - name: Run Clang Format check
         run: ./format.sh -d
       - name: Run Cargo Format check
@@ -41,12 +43,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Install
+      - name: Install LLVM
         run: |
           sudo apt install binaryen --yes
           sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" bash $LLVM_VERSION
           sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$LLVM_VERSION 100
           sudo update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-$LLVM_VERSION 100
+          sudo update-alternatives --install /usr/bin/llvm-dis llvm-dis /usr/bin/llvm-dis-$LLVM_VERSION 100
           sudo apt install libc++-dev libc++abi-dev wabt --yes
           # not really sure why we need to modify this
           PATH=/usr/bin:$PATH

applications/Makefile

@@ -1,7 +1,6 @@
 AWSMCC=../target/release/awsm
 CC=clang
 ARCH=64bit_nix
-LLVM_VERSION=12
 
 # Used by aWsm when compiling the *.wasm to *.bc
 # No need for adding the --runtime-globals flag for just a single sandbox exec
@@ -40,7 +39,7 @@ dist/%.bc: ./wasm_apps/dist/%.wasm dist
 	${AWSMCC} ${AWSMFLAGS} $< -o $@
 
 dist/%.ll: dist/%.bc
-	llvm-dis-${LLVM_VERSION} $< -o $@
+	llvm-dis $< -o $@
 
 # By default choose the bc.mini.awsm mode:
 dist/%.awsm: dist/%.bc.mini.awsm ;

code_benches/app_tinycrypt/Makefile

@@ -1,6 +1,5 @@
 CC=clang
 OPTFLAGS=-O3 -flto
-LLVM_VERSION=12
 
 # Assuming to be called from code_benches/app_tinycrypt directory
 ROOT_PATH:=$(shell cd ../.. && realpath .)
@@ -78,7 +77,7 @@ bin/app_tinycrypt_us.bc: bin/app_tinycrypt.wasm
 	@${AWSM_CC} -u $^ -o $@
 
 %.ll: %.bc
-	llvm-dis-${LLVM_VERSION} $^ -o $@
+	llvm-dis $^ -o $@
 
 # Run unsafe code using the "No Protection" memory model
 bin/app_tinycrypt_np_us: bin/app_tinycrypt_us.bc ${RUNTIME_NP}

code_benches/custom_binarytrees/Makefile

@@ -1,6 +1,5 @@
 CC=clang
 OPTFLAGS=-O3 -flto
-LLVM_VERSION=12
 
 # Assuming to be called from code_benches/custom_binarytrees directory
 ROOT_PATH:=$(shell cd ../.. && realpath .)
@@ -78,7 +77,7 @@ bin/custom_binarytrees_us.bc: bin/custom_binarytrees.wasm
 	@${AWSM_CC} -u $^ -o $@
 
 %.ll: %.bc
-	llvm-dis-${LLVM_VERSION} $^ -o $@
+	llvm-dis $^ -o $@
 
 # Run unsafe code using the "No Protection" memory model
 bin/custom_binarytrees_np_us: bin/custom_binarytrees_us.bc ${RUNTIME_NP}

tests/wat/Makefile

@@ -1,7 +1,6 @@
 ROOT_PATH:=$(shell cd ../.. && realpath .)
 RUNTIME_PATH:=${ROOT_PATH}/runtime
 ARCH=64bit_nix
-LLVM_VERSION=12
 
 CC=clang
 OPTFLAGS=-O0 -g -flto
@@ -70,7 +69,7 @@ clean:
 	@RUST_BACKTRACE=1 ${AWSM_CC} $< -o $@ 1>$*.log 2>&1
 
 %.ll: %.bc
-	@llvm-dis-${LLVM_VERSION} $< -o $@
+	@llvm-dis $< -o $@
 
 .PHONY: %_wasmtime
 %_wasmtime: %.wasm