Merge pull request #75 from danielinux/up_m33mu_1.8

Update CI to m33mu 1.8, remove jump-table workaround

Author: dgarske

.github/workflows/stm32h563-m33mu.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     container:
-      image: ghcr.io/danielinux/m33mu-ci:1.7
+      image: ghcr.io/danielinux/m33mu-ci:1.8
       options: --privileged
 
     steps:
@@ -114,7 +114,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: ghcr.io/danielinux/m33mu-ci:1.7
+      image: ghcr.io/danielinux/m33mu-ci:1.8
       options: --privileged
 
     steps:
@@ -142,7 +142,6 @@ jobs:
             WOLFSSL_ROOT=../../../../wolfssl \
             ENABLE_HTTPS=1 ENABLE_MQTT_BROKER=1 ENABLE_SSH=1 \
             WOLFSSL_SP_NO_ASM=1 \
-            EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
             CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
 
       - name: Run m33mu + DHCP + full test
@@ -324,7 +323,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     container:
-      image: ghcr.io/danielinux/m33mu-ci:1.7
+      image: ghcr.io/danielinux/m33mu-ci:1.8
       options: --privileged
 
     steps:
@@ -348,11 +347,9 @@ jobs:
           set -euo pipefail
           make -C src/port/stm32h563 clean TZEN=0 ENABLE_HTTPS=1 \
             WOLFSSL_SP_NO_ASM=1 \
-            EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
             CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
           make -C src/port/stm32h563 TZEN=0 ENABLE_HTTPS=1 \
             WOLFSSL_SP_NO_ASM=1 \
-            EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
             CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
           strings src/port/stm32h563/app.bin | grep "Initializing HTTPS server" > /dev/null
 

tools/scripts/run-m33mu-ci-in-container.sh

@@ -50,19 +50,16 @@ build_full() {
     WOLFSSL_ROOT=../../../../wolfssl \
     ENABLE_HTTPS=1 ENABLE_MQTT_BROKER=1 ENABLE_SSH=1 \
     WOLFSSL_SP_NO_ASM=1 \
-    EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
     CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
 }
 
 build_https_tls13() {
   ensure_repo wolfssl https://github.com/wolfSSL/wolfssl.git
   make -C src/port/stm32h563 clean TZEN=0 ENABLE_HTTPS=1 \
     WOLFSSL_SP_NO_ASM=1 \
-    EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
     CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
   make -C src/port/stm32h563 TZEN=0 ENABLE_HTTPS=1 \
     WOLFSSL_SP_NO_ASM=1 \
-    EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
     CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
   strings src/port/stm32h563/app.bin | grep -q "Initializing HTTPS server"
 }
@@ -72,7 +69,6 @@ build_ssh_tzen() {
   ensure_repo wolfssh https://github.com/wolfSSL/wolfssh.git
   make -C src/port/stm32h563 clean
   make -C src/port/stm32h563 TZEN=0 ENABLE_SSH=1 \
-    EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \
     CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy
   strings src/port/stm32h563/app.bin | grep -q "Initializing SSH server"
 }