fix ASM issue

Author: Jan Kamidra

CMakeLists.txt

@@ -255,12 +255,7 @@ endif()
 if(NOT MBED_IS_NATIVE_BUILD)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated-headers)
     mbed_write_target_config_header(${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h MBED_TARGET_DEFINITIONS MBED_CONFIG_DEFINITIONS)
-    # Scope preincluded target config to C/C++ only to avoid leaking into ASM builds
-    # Use a single OR-ed generator expression and avoid semicolons to prevent
-    # creation of an empty "-include" argument.
-    target_compile_options(mbed-core-flags INTERFACE
-        $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-include ${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h>
-    )
+    target_compile_options(mbed-core-flags INTERFACE -include ${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h)
     target_include_directories(mbed-core-flags INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated-headers)
 endif()
 

cmsis/CMSIS_cmake/cmsis_rtos_rtx.cmake

@@ -70,10 +70,12 @@ endif()
 # Make RTX headers and Mbed's device RTOS wrapper headers visible to ALL profiles
 # (needed for typedefs like mbed_rtos_storage_* used by headers even in bare-metal)
 target_include_directories(mbed-core-flags
+    BEFORE
     INTERFACE
-    ${CMAKE_CURRENT_LIST_DIR}/../device/rtos/include/RTX
-    ${CMAKE_CURRENT_LIST_DIR}/../CMSIS-RTX/Include
-    ${CMAKE_CURRENT_LIST_DIR}/../CMSIS-RTX/Source
+        ${CMAKE_CURRENT_LIST_DIR}/../device/rtos/include/RTX/RTX_overrides
+        ${CMAKE_CURRENT_LIST_DIR}/../device/rtos/include/RTX
+        ${CMAKE_CURRENT_LIST_DIR}/../CMSIS-RTX/Include
+        ${CMAKE_CURRENT_LIST_DIR}/../CMSIS-RTX/Source
 )
 
 # RTX source files (only compiled when building with RTOS)

cmsis/device/rtos/include/RTX/RTX_Config.h renamed to cmsis/device/rtos/include/RTX/RTX_overrides/RTX_Config.h

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2021-2023 Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * -----------------------------------------------------------------------------
+ *
+ * Project:     CMSIS-RTOS RTX
+ * Title:       RTX derived definitions
+ *
+ * -----------------------------------------------------------------------------
+ */
+
+#ifndef RTX_DEF_H_
+#define RTX_DEF_H_
+
+//# ============================================================================
+// Mbed OS patch: Exclude RTE_Components.h and RTX_Config.h inclusion in .S files only
+// This patch was originally applied in each .S file before including rtx_def.h.
+// Apply it here, but restrict to assembler to avoid impacting C/C++ where
+// RTX_Config.h must be included to provide macros like OS_TICK_FREQ.
+//# ============================================================================
+#if defined(__ASSEMBLER__) || defined(__ASSEMBLY__)
+#define RTX_CONFIG_H_
+#undef _RTE_
+#endif
+//# ============================================================================
+
+#ifdef   _RTE_
+#include "RTE_Components.h"
+#endif
+#include "RTX_Config.h"
+
+#if (defined(OS_SAFETY_FEATURES) && (OS_SAFETY_FEATURES != 0))
+ #define RTX_SAFETY_FEATURES
+ #if (defined(OS_SAFETY_CLASS) && (OS_SAFETY_CLASS != 0))
+  #define RTX_SAFETY_CLASS
+ #endif
+ #if (defined(OS_EXECUTION_ZONE) && (OS_EXECUTION_ZONE != 0))
+  #define RTX_EXECUTION_ZONE
+ #endif
+ #if (defined(OS_THREAD_WATCHDOG) && (OS_THREAD_WATCHDOG != 0))
+  #define RTX_THREAD_WATCHDOG
+ #endif
+ #if (defined(OS_OBJ_PTR_CHECK) && (OS_OBJ_PTR_CHECK != 0))
+  #define RTX_OBJ_PTR_CHECK
+ #endif
+ #if (defined(OS_SVC_PTR_CHECK) && (OS_SVC_PTR_CHECK != 0))
+  #define RTX_SVC_PTR_CHECK
+ #endif
+#endif
+
+#if (defined(OS_OBJ_MEM_USAGE) && (OS_OBJ_MEM_USAGE != 0))
+ #define RTX_OBJ_MEM_USAGE
+#endif
+
+#if (defined(OS_STACK_CHECK) && (OS_STACK_CHECK != 0))
+ #define RTX_STACK_CHECK
+#endif
+
+#if (defined(OS_TZ_CONTEXT) && (OS_TZ_CONTEXT != 0))
+ #define RTX_TZ_CONTEXT
+#endif
+
+#ifndef DOMAIN_NS
+ #ifdef RTE_CMSIS_RTOS2_RTX5_ARMV8M_NS
+  #define DOMAIN_NS             1
+ #else
+  #define DOMAIN_NS             0
+ #endif
+#endif
+
+#endif  // RTX_DEF_H_