fixup! Make ENABLE_MULTILIB_HEADER_OPTIMISATION is ON by default

simpal01 · simpal01 · commit 2f51b287456d · 2025-07-28T11:57:51.000+01:00
diff --git a/arm-software/embedded/CMakeLists.txt b/arm-software/embedded/CMakeLists.txt
@@ -182,11 +182,8 @@ option(
 
 option(
     ENABLE_MULTILIB_HEADER_OPTIMISATION "Enable multilib header optimisation phase"
-    OFF
+    ON
 )
-if(ENABLE_MULTILIB_HEADER_OPTIMISATION)
-    message(WARNING "ENABLE_MULTILIB_HEADER_OPTIMISATION is not recommended to be enabled. This feature is not fully supported from the toolchain.")
-endif()
 
 # Previously, the LLVM_TOOLCHAIN_LIBRARY_OVERLAY_INSTALL option was
 # called LLVM_TOOLCHAIN_NEWLIB_OVERLAY_INSTALL. Detect a setting of
diff --git a/arm-software/embedded/arm-multilib/CMakeLists.txt b/arm-software/embedded/arm-multilib/CMakeLists.txt
@@ -48,7 +48,7 @@ set(
     fvp/get_fvps.sh"
 )
 set(FVP_CONFIG_DIR "${TOOLCHAIN_SOURCE_DIR}/fvp/config" CACHE STRING "The directory in which the FVP models are installed.")
-option(ENABLE_MULTILIB_HEADER_OPTIMISATION "Enable multilib header optimisation phase" OFF)
+option(ENABLE_MULTILIB_HEADER_OPTIMISATION "Enable multilib header optimisation phase" ON)
 option(
     ENABLE_PARALLEL_LIB_CONFIG
     "Run the library variant configuration steps in parallel."

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ set(`
`48`	`48`	`fvp/get_fvps.sh"`
`49`	`49`	`)`
`50`	`50`	`set(FVP_CONFIG_DIR "${TOOLCHAIN_SOURCE_DIR}/fvp/config" CACHE STRING "The directory in which the FVP models are installed.")`
`51`		`-option(ENABLE_MULTILIB_HEADER_OPTIMISATION "Enable multilib header optimisation phase" OFF)`
	`51`	`+option(ENABLE_MULTILIB_HEADER_OPTIMISATION "Enable multilib header optimisation phase" ON)`
`52`	`52`	`option(`
`53`	`53`	`ENABLE_PARALLEL_LIB_CONFIG`
`54`	`54`	`"Run the library variant configuration steps in parallel."`