Merge pull request Mbed-TLS#118 from daverodgman/mtest-iar

Author: daverodgman

tools/bin/mtest

@@ -11,7 +11,7 @@ import sys
 import shutil
 from collections import namedtuple
 
-ALL_COMPILERS = [ "gcc", "clang", "armclang", "arm-none-eabi-gcc" ]
+ALL_COMPILERS = [ "gcc", "clang", "armclang", "arm-none-eabi-gcc", "iar" ]
 NATIVE_TARGET = None
 
 ARCHS    = [ "mips", "mipsel", "mips64", "mips64el", "powerpc64le", "s390x", "riscv64", "x86_64", "x86" ]
@@ -42,6 +42,7 @@ NON_NATIVE_SUPPORT = {
     "armclang": [ "armv6-thumb1", "armv7-arm", "armv8-thumb2", "armv8-aarch64" ],
     "gcc":      [ "armv5-thumb1", "armv5-arm", "armv6-thumb1", "armv6-thumb2", "armv6-arm", "armv7-thumb2", "armv7-arm", "armv8-thumb2", "armv8-arm", "armv8-aarch64" ] + ARCHS,
     "clang":    [ "armv5-thumb1", "armv5-arm", "armv6-thumb1", "armv6-thumb2", "armv6-arm", "armv7-thumb2", "armv7-arm", "armv8-thumb2", "armv8-arm", "armv8-aarch64" ] + ARCHS,
+    "iar":      [ "armv5-thumb1", "armv5-arm", "armv6-thumb1", "armv6-thumb2", "armv6-arm", "armv7-thumb2", "armv7-arm", "armv8-thumb2", "armv8-arm", "armv8-aarch64" ]
 }
 
 QEMU_NAME_MAP = {
@@ -53,20 +54,28 @@ MEMSAN_OPTIONS = [ "MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN", "-MBEDTLS_USE_PSA_CRYPTO
 MEMSAN_CFLAGS  = ['-fsanitize=memory', '-O1', '-g3', '-fno-omit-frame-pointer', '-fno-optimize-sibling-calls', '-fsanitize-memory-track-origins=2']
 MEMSAN_CC      = "clang"
 
+# TODO: can some of the IAR limitations be removed?
 COMPILER_CONFIGS = {
 #    "armclang": [ "MBEDTLS_NO_UDBL_DIVISION" ]
+    "iar": [ "MBEDTLS_NO_PLATFORM_ENTROPY", "-MBEDTLS_HAVE_TIME_DATE", "-MBEDTLS_HAVE_TIME", "-MBEDTLS_TIMING_C", "-MBEDTLS_FS_IO", "-MBEDTLS_PSA_ITS_FILE_C", "-MBEDTLS_PSA_CRYPTO_STORAGE_C", "-MBEDTLS_NET_C" ]
 }
 
 ASAN_CFLAGS   = ['-fsanitize=address', '-fno-common', '-fsanitize=undefined', '-fno-sanitize-recover=all', '-O1', '-g3', '-fno-omit-frame-pointer', '-fno-optimize-sibling-calls']
 ASAN_LDFLAGS  = ASAN_CFLAGS
 
 WARNING_FLAGS = {
+    "iar"  : ['--warnings_are_errors'], # cannot enable --strict because then IAR will not recognise #warning
     "clang": ['-Werror', '-Wall', '-Wextra', '-Wwrite-strings', '-Wpointer-arith', '-Wimplicit-fallthrough', '-Wshadow', '-Wvla', '-Wformat=2', '-Wno-format-nonliteral', '-Wshadow', '-Wasm-operand-widths', '-Wunreachable-code'],
     "gcc"  : ['-Werror', '-Wall', '-Wextra', '-Wwrite-strings', '-Wpointer-arith', '-Wimplicit-fallthrough', '-Wshadow', '-Wvla', '-Wformat=2', '-Wno-format-nonliteral', '-Wshadow', '-Wformat-signedness', '-Wformat-overflow=2', '-Wformat-truncation', '-Wlogical-op']
 }
 WARNING_FLAGS["arm-none-eabi-gcc"] = WARNING_FLAGS["gcc"]
 WARNING_FLAGS["armclang"]          = WARNING_FLAGS["clang"]
 
+# Use full system libraries for IAR
+COMPILER_FLAGS = {
+    "iar": ["--dlib_config=full"]
+}
+
 TFM_ARMCLANG_TARGET_FLAGS = ["--target=arm-arm-none-eabi", "-mcpu=cortex-m33+nodsp+nofp", "-mthumb"]
 TFM_CONFIG_FILES = [("config-tfm.h", None), ("tfm_mbedcrypto_config_profile_medium.h", "crypto_config_profile_medium.h")]
 COPY_TFM_CONFIG = "//TFM-CONFIG//"
@@ -136,6 +145,7 @@ def clean():
 
 def toolchain_exes(target):
     compiler_exe = target.compiler
+    archiver_exe = None
 
     # construct triple needed in gcc and objdump executable name
     triple_abi = "gnu"
@@ -180,6 +190,10 @@ def toolchain_exes(target):
                         compiler_exe = c
                         break
 
+    elif target.compiler_family == "iar":
+        compiler_exe = "iccarm"
+        archiver_exe = "iarchive"
+
     if target.compiler == "gcc":
         compiler_error = f"could not locate gcc executable {compiler_exe} or {compiler_exe}-<majorversion>"
     elif target.compiler_family == "gcc":
@@ -226,6 +240,7 @@ def toolchain_exes(target):
 
     return {
         "compiler": compiler_exe,
+        "archiver": archiver_exe,
         "objdump": objdump_exe,
         "size": size_exe,
         "triple": triple,
@@ -239,19 +254,28 @@ def toolchain_exes(target):
 
 def toolchain(target, exit_on_failure=True):
     # basic CFLAGS setup
-    # target_c_flags may get overridden by the user (and dropped from the resulting set of flags);
-    # c_flags is always applied
+    # target_c_flags are options generated by mtest, which may get overridden by the user (and dropped from the resulting set of flags)
 
-    target_c_flags = ["-std=c99", f"-I{ROOT}/include"]
+    target_c_flags = [f"-I{ROOT}/include"] + COMPILER_FLAGS.get(target.compiler_family, [])
+
+    if target.compiler_family != "iar":
+        # IAR defaults to C99 and doesn't have an option for it to be explicitly specified
+        target_c_flags += ["-std=c99"]
 
     if args.size_tfm and "clang" in target.compiler:
         target_c_flags += ["-Oz"]
+    elif target.compiler_family == "iar":
+        # -Ohz = high optimization, favouring size
+        # -Ol = fastest compile time (about 3x better than Ohz)
+        target_c_flags += ["-Ol"]
     else:
         target_c_flags += ["-Os"]
 
     if args.no_warnings:
         if target.compiler_family == "clang":
             target_c_flags += ["-Wno-everything"]
+        elif target.compiler_family == "iar":
+            target_c_flags += ["--no_warnings"]
         else:
             target_c_flags += ["-Wno-all", "-Wno-extra"]
     else:
@@ -344,6 +368,28 @@ def toolchain(target, exit_on_failure=True):
             else:
                 error(f"unsupported target {target.arch} {target.isa} for clang")
 
+    elif target.compiler_family == "iar":
+        if target.arch == "armv5" and target.isa == "thumb1":
+            target_c_flags += ["--cpu=ARM926EJ-S", "--thumb"]
+        elif target.arch == "armv5" and target.isa == "arm":
+            target_c_flags += ["--cpu=ARM968E-S", "--arm"]
+        elif target.arch == "armv6" and target.isa == "thumb1":
+            target_c_flags += ["--cpu=ARM1136J-S", "--thumb"]
+        elif target.arch == "armv6" and target.isa == "thumb2":
+            target_c_flags += ["--cpu=ARM1156T2-S", "--thumb"]
+        elif target.arch == "armv6" and target.isa == "arm":
+            target_c_flags += ["--cpu=ARM1156T2-S", "--arm"]
+        elif target.arch == "armv7" and target.isa == "thumb2":
+            target_c_flags += ["--cpu=Cortex-A17", "--thumb"]
+        elif target.arch == "armv7" and target.isa == "arm":
+            target_c_flags += ["--cpu=Cortex-A17", "--arm"]
+        elif target.arch == "armv8" and target.isa == "thumb2":
+            target_c_flags += ["--cpu=Cortex-A32", "--thumb"]
+        elif target.arch == "armv8" and target.isa == "arm":
+            target_c_flags += ["--cpu=Cortex-A32", "--arm"]
+        elif target.arch == "armv8" and target.isa == "aarch64":
+            target_c_flags += ["--cpu=Cortex-A72", "--aarch64"]
+
     # unconditionally add user-specified flags
     c_flags = target.cflags.split(" ")
 
@@ -379,11 +425,20 @@ def toolchain(target, exit_on_failure=True):
     if not target.is_native:
         ld_flags += " --static"
 
+    if target.compiler_family == "iar":
+        # Specify AR_FLAGS for IAR
+        ar_flags = "--create"
+    else:
+        # Do not specify AR_FLAGS - the Makefile will generate some IAR-incompatible flags
+        ar_flags = None
+
     exes = toolchain_exes(target)
     return {
         "CFLAGS": " ".join(x for x in c_flags if x != "").strip(),
         "LDFLAGS": ld_flags.strip(),
+        "ARFLAGS": ar_flags,
         "CC": exes["compiler"],
+        "AR": exes["archiver"],
         "OBJDUMP": exes["objdump"],
         "SIZE": exes["size"]
     }
@@ -425,7 +480,7 @@ def configure_options(target):
     # target-specific options
     options = target.config
     # compiler-specific options
-    options += COMPILER_CONFIGS.get(target.compiler, [])
+    options += COMPILER_CONFIGS.get(target.compiler_family, [])
     # memsan options
     if args.memsan:
         options += MEMSAN_OPTIONS
@@ -553,7 +608,21 @@ def build(target, tests):
         if not args.no_clean:
             clean()
         t = toolchain(target)
-        flags = ["CFLAGS=" + t['CFLAGS'], "LDFLAGS=" + t['LDFLAGS'], "CC=" + t['CC']]
+
+        flags = ["CFLAGS=" + t['CFLAGS'], "CC=" + t['CC']]
+
+        if target.compiler_family == "iar":
+            # Clear WARNING_CFLAGS so that the Makefile doesn't automatically add -Wall etc, which IAR doesn't understand
+            flags += ["WARNING_CFLAGS="]
+
+        if t['LDFLAGS'] != "":
+            flags += ["LDFLAGS=" + t['LDFLAGS']]
+
+        if t['AR'] is not None:
+            flags += ['AR=' + t['AR']]
+
+        if t['ARFLAGS'] is not None:
+            flags += ['ARFLAGS=' + t['ARFLAGS']]
 
         configure_options(target)