diff --git a/arch/arm/src/cmake/gcc.cmake b/arch/arm/src/cmake/gcc.cmake
index f0adea0456..0191e8c36c 100644
--- a/arch/arm/src/cmake/gcc.cmake
+++ b/arch/arm/src/cmake/gcc.cmake
@@ -136,7 +136,7 @@ if(CONFIG_STACK_USAGE_WARNING AND NOT "${CONFIG_STACK_USAGE_WARNING}" STREQUAL
 endif()
 
 if(CONFIG_COVERAGE_ALL)
-  add_compile_options(-fprofile-generate -ftest-coverage)
+  add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
 endif()
 
 if(CONFIG_MM_UBSAN_ALL)
diff --git a/arch/arm/src/cmake/ghs.cmake b/arch/arm/src/cmake/ghs.cmake
index d45d521bbf..397602210c 100644
--- a/arch/arm/src/cmake/ghs.cmake
+++ b/arch/arm/src/cmake/ghs.cmake
@@ -89,7 +89,7 @@ if(CONFIG_STACK_USAGE_WARNING AND NOT "${CONFIG_STACK_USAGE_WARNING}" STREQUAL
 endif()
 
 if(CONFIG_COVERAGE_ALL)
-  add_compile_options(-fprofile-generate -ftest-coverage)
+  add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
 endif()
 
 if(CONFIG_PROFILE_ALL)
diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
index 257e69943d..9d2dc1fcfb 100644
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@@ -74,7 +74,7 @@ endif
 
 ifeq ($(CONFIG_COVERAGE_ALL),y)
   ifeq ($(CONFIG_ARCH_TOOLCHAIN_GCC),y)
-    ARCHOPTIMIZATION += -fprofile-generate -ftest-coverage
+    ARCHOPTIMIZATION += -fprofile-arcs -ftest-coverage -fno-inline
   else ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
     ARCHOPTIMIZATION += -fprofile-instr-generate -fcoverage-mapping
   endif
diff --git a/arch/arm64/src/Toolchain.defs b/arch/arm64/src/Toolchain.defs
index e4e85b21be..bf482ffc7e 100644
--- a/arch/arm64/src/Toolchain.defs
+++ b/arch/arm64/src/Toolchain.defs
@@ -98,7 +98,7 @@ endif
 
 ifeq ($(CONFIG_COVERAGE_ALL),y)
   ifeq ($(CONFIG_ARCH_TOOLCHAIN_GCC),y)
-    ARCHOPTIMIZATION += -fprofile-generate -ftest-coverage
+    ARCHOPTIMIZATION += -fprofile-arcs -ftest-coverage -fno-inline
   else ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
     ARCHOPTIMIZATION += -fprofile-instr-generate -fcoverage-mapping
   endif
diff --git a/arch/arm64/src/cmake/Toolchain.cmake b/arch/arm64/src/cmake/Toolchain.cmake
index ed5fee4005..653ab10c7c 100644
--- a/arch/arm64/src/cmake/Toolchain.cmake
+++ b/arch/arm64/src/cmake/Toolchain.cmake
@@ -137,7 +137,7 @@ endif()
 
 if(CONFIG_COVERAGE_ALL)
   if(CONFIG_ARCH_TOOLCHAIN_GCC)
-    add_compile_options(-fprofile-generate -ftest-coverage)
+    add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
   elseif(CONFIG_ARCH_TOOLCHAIN_CLANG)
     add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
   endif()
diff --git a/arch/risc-v/src/cmake/Toolchain.cmake b/arch/risc-v/src/cmake/Toolchain.cmake
index 75c5ad9cac..3bc71ce57f 100644
--- a/arch/risc-v/src/cmake/Toolchain.cmake
+++ b/arch/risc-v/src/cmake/Toolchain.cmake
@@ -160,7 +160,7 @@ if(${CONFIG_STACK_USAGE_WARNING})
 endif()
 
 if(CONFIG_COVERAGE_ALL)
-  add_compile_options(-fprofile-generate -ftest-coverage)
+  add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
 endif()
 
 add_compile_options(
diff --git a/arch/sim/src/cmake/Toolchain.cmake b/arch/sim/src/cmake/Toolchain.cmake
index 4d8688f06e..bbfe239cac 100644
--- a/arch/sim/src/cmake/Toolchain.cmake
+++ b/arch/sim/src/cmake/Toolchain.cmake
@@ -87,7 +87,7 @@ if(CONFIG_STACK_USAGE_WARNING)
 endif()
 
 if(CONFIG_COVERAGE_ALL)
-  add_compile_options(-fprofile-generate -ftest-coverage)
+  add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
 endif()
 
 if(CONFIG_PROFILE_ALL OR CONFIG_SIM_PROFILE)
diff --git a/arch/tricore/src/cmake/ToolchainGnuc.cmake b/arch/tricore/src/cmake/ToolchainGnuc.cmake
index 59b665c000..4744d97145 100644
--- a/arch/tricore/src/cmake/ToolchainGnuc.cmake
+++ b/arch/tricore/src/cmake/ToolchainGnuc.cmake
@@ -85,7 +85,7 @@ if(CONFIG_STACK_CANARIES)
 endif()
 
 if(CONFIG_COVERAGE_ALL)
-  add_compile_options(-fprofile-generate -ftest-coverage)
+  add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
 endif()
 
 # Optimization of unused sections
diff --git a/arch/tricore/src/common/ToolchainGnuc.defs b/arch/tricore/src/common/ToolchainGnuc.defs
index ed961a4a20..ef1eb33afe 100644
--- a/arch/tricore/src/common/ToolchainGnuc.defs
+++ b/arch/tricore/src/common/ToolchainGnuc.defs
@@ -59,7 +59,7 @@ ifneq ($(CONFIG_STACK_USAGE_WARNING),0)
 endif
 
 ifeq ($(CONFIG_COVERAGE_ALL),y)
-  ARCHOPTIMIZATION += -fprofile-generate -ftest-coverage
+  ARCHOPTIMIZATION += -fprofile-arcs -ftest-coverage -fno-inline
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
diff --git a/arch/x86_64/src/cmake/Toolchain.cmake b/arch/x86_64/src/cmake/Toolchain.cmake
index aa862a16d9..fcafa727fd 100644
--- a/arch/x86_64/src/cmake/Toolchain.cmake
+++ b/arch/x86_64/src/cmake/Toolchain.cmake
@@ -76,7 +76,7 @@ if(${CONFIG_STACK_USAGE_WARNING})
 endif()
 
 if(CONFIG_COVERAGE_ALL)
-  add_compile_options(-fprofile-generate -ftest-coverage)
+  add_compile_options(-fprofile-arcs -ftest-coverage -fno-inline)
 endif()
 
 if(CONFIG_DEBUG_SYMBOLS)
diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
index de066ec371..921828824a 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -76,7 +76,7 @@ endif
 
 ifeq ($(CONFIG_COVERAGE_ALL),y)
   ifeq ($(CONFIG_ARCH_TOOLCHAIN_GCC),y)
-    ARCHOPTIMIZATION += -fprofile-generate -ftest-coverage
+    ARCHOPTIMIZATION += -fprofile-arcs -ftest-coverage -fno-inline
   else ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
     ARCHOPTIMIZATION += -fprofile-instr-generate -fcoverage-mapping
   endif