cmake: compiler: Add compiler property for no-builtin

Abstracts these flags for multiple toolchain support Signed-off-by: Grant Ramsay <[email protected]>
zephyrproject-rtos · Nov 13, 2023 · a3ff19a · a3ff19a
1 parent 679d82c
commit a3ff19a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt
@@ -94,12 +94,12 @@ elseif (CONFIG_NATIVE_LIBRARY)
 
     # Do not use the C library from this compiler/host,
     # but still use the basic compiler headers
-    # -fno-builtin to avoid the compiler using builtin replacements for std library functions
+    # no_builtin to avoid the compiler using builtin replacements for std library functions
     zephyr_compile_options(
       -nostdinc
       -isystem ${COMPILER_OWN_INCLUDE_PATH}
       $<TARGET_PROPERTY:compiler,freestanding>
-      -fno-builtin
+      $<TARGET_PROPERTY:compiler,no_builtin>
     )
   endif()
 endif()

diff --git a/cmake/compiler/arcmwdt/compiler_flags.cmake b/cmake/compiler/arcmwdt/compiler_flags.cmake
@@ -206,3 +206,6 @@ endif()
 
 # Remove after testing that -Wshadow works
 set_compiler_property(PROPERTY warning_shadow_variables)
+
+set_compiler_property(PROPERTY no_builtin -fno-builtin)
+set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
diff --git a/cmake/compiler/compiler_flags_template.cmake b/cmake/compiler/compiler_flags_template.cmake
@@ -133,3 +133,7 @@ set_compiler_property(PROPERTY no_global_merge)
 
 # Compiler flag for warning about shadow variables
 set_compiler_property(PROPERTY warning_shadow_variables)
+
+# Compiler flags to avoid recognizing built-in functions
+set_compiler_property(PROPERTY no_builtin)
+set_compiler_property(PROPERTY no_builtin_malloc)
diff --git a/cmake/compiler/gcc/compiler_flags.cmake b/cmake/compiler/gcc/compiler_flags.cmake
@@ -227,3 +227,6 @@ set_compiler_property(PROPERTY no_position_independent
 set_compiler_property(PROPERTY no_global_merge "")
 
 set_compiler_property(PROPERTY warning_shadow_variables -Wshadow)
+
+set_compiler_property(PROPERTY no_builtin -fno-builtin)
+set_compiler_property(PROPERTY no_builtin_malloc -fno-builtin-malloc)
diff --git a/lib/libc/common/CMakeLists.txt b/lib/libc/common/CMakeLists.txt
@@ -8,4 +8,4 @@ zephyr_library_sources_ifdef(CONFIG_COMMON_LIBC_MALLOC source/stdlib/malloc.c)
 zephyr_library_sources_ifdef(CONFIG_COMMON_LIBC_STRNLEN source/string/strnlen.c)
 
 # Prevent compiler from optimizing calloc into an infinite recursive call
-zephyr_library_cc_option(-fno-builtin-malloc)
+zephyr_library_compile_options($<TARGET_PROPERTY:compiler,no_builtin_malloc>)
diff --git a/lib/libc/minimal/CMakeLists.txt b/lib/libc/minimal/CMakeLists.txt
@@ -7,7 +7,7 @@ zephyr_library()
 set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated)
 set(STRERROR_TABLE_H ${GEN_DIR}/libc/minimal/strerror_table.h)
 
-zephyr_library_cc_option(-fno-builtin)
+zephyr_library_compile_options($<TARGET_PROPERTY:compiler,no_builtin>)
 
 zephyr_library_sources(
   source/stdlib/atoi.c

diff --git a/modules/openthread/CMakeLists.txt b/modules/openthread/CMakeLists.txt
@@ -547,7 +547,8 @@ target_compile_definitions(ot-config INTERFACE
 # libraries do not include this header. So we add the defines to all
 # OpenThread files through the gcc flag -imacros instead.
 target_compile_options(ot-config INTERFACE
-    $<TARGET_PROPERTY:zephyr_interface,INTERFACE_COMPILE_OPTIONS> -fno-builtin
+    $<TARGET_PROPERTY:zephyr_interface,INTERFACE_COMPILE_OPTIONS>
+    $<TARGET_PROPERTY:compiler,no_builtin>
     -imacros ${AUTOCONF_H}
 )
 
@@ -600,7 +601,8 @@ endif()
 
 if(CONFIG_OPENTHREAD_SETTINGS_RAM)
   target_compile_options(openthread-platform-utils PRIVATE
-    $<TARGET_PROPERTY:zephyr_interface,INTERFACE_COMPILE_OPTIONS> -fno-builtin)
+    $<TARGET_PROPERTY:zephyr_interface,INTERFACE_COMPILE_OPTIONS>
+    $<TARGET_PROPERTY:compiler,no_builtin>)
   add_dependencies(openthread-platform-utils syscall_list_h_target)
 
   list(APPEND ot_libs openthread-platform-utils-static)