Merge pull request #154 from valeriosetti/issue60-framework

[framework] Add components-compiler.sh

scripts/all-core.sh

@@ -853,6 +853,7 @@ pre_check_tools () {
     case " $RUN_COMPONENTS " in
         *_armcc*)
             ARMC6_CC="$ARMC6_BIN_DIR/armclang"
+            ARMC6_LINK="$ARMC6_BIN_DIR/armlink"
             ARMC6_AR="$ARMC6_BIN_DIR/armar"
             ARMC6_FROMELF="$ARMC6_BIN_DIR/fromelf"
             check_tools "$ARMC6_CC" "$ARMC6_AR" "$ARMC6_FROMELF";;

scripts/all-helpers.sh

@@ -258,9 +258,10 @@ helper_armc6_build_test()
     FLAGS="$1"
 
     msg "build: ARM Compiler 6 ($FLAGS)"
+
     make clean
     ARM_TOOL_VARIANT="ult" CC="$ARMC6_CC" AR="$ARMC6_AR" CFLAGS="$FLAGS" \
-                    WARNING_CFLAGS='-Werror -xc -std=c99' make lib
+                        WARNING_CFLAGS='-Werror -xc -std=c99' make lib
 
     msg "size: ARM Compiler 6 ($FLAGS)"
     "$ARMC6_FROMELF" -z library/*.o
@@ -272,6 +273,24 @@ helper_armc6_build_test()
     fi
 }
 
+helper_armc6_cmake_build_test()
+{
+    FLAGS="$1"
+
+    msg "build: CMake + ARM Compiler 6 ($FLAGS)"
+
+    cmake -DCMAKE_SYSTEM_NAME="Generic" -DCMAKE_SYSTEM_PROCESSOR="cortex-m0" \
+            -DCMAKE_C_COMPILER="$ARMC6_CC" -DCMAKE_C_LINKER="$ARMC6_LINK" \
+            -DCMAKE_AR="$ARMC6_AR" -DCMAKE_C_FLAGS="$FLAGS" \
+            -DCMAKE_C_COMPILER_WORKS=TRUE -DENABLE_TESTING=OFF \
+            -DENABLE_PROGRAMS=OFF "$TF_PSA_CRYPTO_ROOT_DIR"
+    make
+
+    msg "size: ARM Compiler 6 ($FLAGS)"
+    "$ARMC6_FROMELF" -z ${PSA_CORE_PATH}/CMakeFiles/tfpsacrypto.dir/*.o
+    "$ARMC6_FROMELF" -z ${BUILTIN_SRC_PATH}/../CMakeFiles/builtin.dir/src/*.o
+}
+
 clang_version() {
     if command -v clang > /dev/null ; then
         clang --version|grep version|sed -E 's#.*version ([0-9]+).*#\1#'

tests/programs/test_zeroize.gdb

@@ -33,12 +33,19 @@
 
 set confirm off
 
-file ./programs/test/zeroize
+# TF-PSA-Crypto uses a different name for the executable and also a build out
+# of tree.
+if $_isvoid($is_tf_psa_crypto)
+    file ./programs/test/zeroize
+else
+    file ./programs/test/tf_psa_crypto_zeroize
+end
+
+set args ./framework/tests/programs/zeroize.c
 
 search GDB_BREAK_HERE
 break $_
 
-set args ./framework/tests/programs/zeroize.c
 run
 
 set $i = 0