From 7951c43516f4a92247806dc839b3073f1d45d169 Mon Sep 17 00:00:00 2001
From: Islam Ragimov <islam.ragimov@arm.com>
Date: Tue, 3 Sep 2024 14:08:37 +0100
Subject: [PATCH] Fix CMake build

This fixes issues caused by:
 - a26c0ca326842f31e63b781296cff2da09ff7163
 - b2e187c77c96b9fde89882c762b8e98741db7d77
 - 07c22638016a1c7325edbdf8e1d0969b6c3210d9
 - 80572fa90a91bfa38722be7680cd0ba543100c24
 - 1c7da703a58cf0541482cde41240f3ed54780dc2
 - 57e48e4d9786fa4148f3d9b209b930e6ebae7dc8

Corresponding upstream commits:
 - 2f1e70744dfd87d41425bd8c685cc846a306a54f
 - 234d6367f9080bc65708049de42a58514bb723ed
 - 54c91a630b634b87c0b6eff24c99d3ec7cae6460
 - 2c988f4009b7eb5ef8c162b2a3b1841a1001f7fe
 - 31918449e6ca18a669030886533d6ca548f3bf5f
 - 9fd521fcd85eb1053388ce455c42edbc5e836e0f

Change-Id: Id8fe9307f71262260d51aac81151d8ca66ca9e93
---
 lib/CMakeLists.txt          | 13 ++++++++++---
 test/kat-app/CMakeLists.txt |  7 ++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 60d665be..7fb957c2 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -35,9 +35,16 @@ endif()
 ########################################
 # setup NASM
 ########################################
-enable_language(ASM_NASM)
-if(NOT CMAKE_ASM_NASM_COMPILER_LOADED)
-  message(FATAL_ERROR "Can't find assembler")
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
+  enable_language(ASM)
+  if(NOT CMAKE_ASM_COMPILER_LOADED)
+    message(FATAL_ERROR "Can't find assembler")
+  endif()
+else()
+  enable_language(ASM_NASM)
+  if(NOT CMAKE_ASM_NASM_COMPILER_LOADED)
+    message(FATAL_ERROR "Can't find assembler")
+  endif()
 endif()
 
 set(NASM_VERSION_REQUIRED "2.14")
diff --git a/test/kat-app/CMakeLists.txt b/test/kat-app/CMakeLists.txt
index 2f64b0f2..9b6766bc 100644
--- a/test/kat-app/CMakeLists.txt
+++ b/test/kat-app/CMakeLists.txt
@@ -42,7 +42,12 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
   set(TEST_APP_SRC_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.c
     ${CMAKE_CURRENT_SOURCE_DIR}/api_test.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_test.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eea3_128.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eea3_256.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eia3_128.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eia3_256.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eea3_test.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eia3_test.c
     ${CMAKE_CURRENT_SOURCE_DIR}/snow3g_test.c
     ${CMAKE_CURRENT_SOURCE_DIR}/snow3g_test_f8_vectors.json.c
     ${CMAKE_CURRENT_SOURCE_DIR}/snow3g_test_f9_vectors.json.c
-- 
GitLab