cmake: add control over inline source code disassembly

By default, the generated disassembly file (i.e: the .lst file) also contains inline source code. This has the potential to become problematic when attempting to compare the generated .lst files accross platforms since they may differ for various reasons. As such, add the option to control whether the disassembly file should contain inline source code or not. The need for this patch was sparked by the differences observed in the generated .lst file for Linux and Windows in one of SOF's CI jobs (details in thesofproject/sof/issues/9034), which were caused by the addition of the inline source code. With this, we can keep testing for reproducible builds while not having to deal with differences in the .lst files caused by things such as having ".." include paths. Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
tsnlab · Apr 22, 2024 · fb7e937 · fb7e937
1 parent 9921483
commit fb7e937
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1704,7 +1704,7 @@ endif()
 if(CONFIG_OUTPUT_DISASSEMBLY)
 if(CONFIG_OUTPUT_DISASSEMBLE_ALL)
     set(disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_all>")
-  else()
+  elseif (CONFIG_OUTPUT_DISASSEMBLY_WITH_SOURCE)
     set(disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_inline_source>")
   endif()
   list(APPEND

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
@@ -567,6 +567,17 @@ config OUTPUT_DISASSEMBLE_ALL
 	  The .lst file will contain complete disassembly of the firmware
 	  not just those expected to contain instructions including zeros
 
+config OUTPUT_DISASSEMBLY_WITH_SOURCE
+	bool "Include source code in output disassembly file"
+	default y
+	depends on OUTPUT_DISASSEMBLY && !OUTPUT_DISASSEMBLE_ALL
+	help
+	  The .lst file will also contain the source code. Having
+	  control over this can be useful for reproducible builds
+	  since it can be used to remove one of the elements of
+	  the .lst file that can vary across platforms because
+	  of reasons such as having ".." include paths.
+
 config OUTPUT_PRINT_MEMORY_USAGE
 	bool "Print memory usage to stdout"
 	default y