Changeset 107054 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Nov 20, 2024 11:06:26 AM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

166008

Message:

EFI/Firmware: Fix the DLL -> EFI conversion for GCC & CLANGDWARF so it doesn't modify the source files as this seem to confuse kmk into an infinite loop at times. Also, list all the outputs so kmk don't think dependencies it requires are missing (probably exposed by default -j<cpu-count> feature in kmk). With this we CLANGDWARF should work on windows. jiraref:VBP-1458

Location:

trunk/src/VBox/Devices/EFI/Firmware/BaseTools

Files:

• Conf/build_rule.template (modified) (2 diffs)
• Source/Python/AutoGen/ModuleAutoGen.py (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Conf/build_rule.template

@@ -345 +345 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).map
 
+# vbox: Fixing no-rule-to-make ..\DEBUG\mod.efi
+# Note! Listing .efi more than once causes trouble in ModuleAutoGen.py::_ApplyBuildRule for 
+#       VBoxVgaDxe, so that required hacking as well to make this fix work.
+    <OutputFile.GCC>
+        $(DEBUG_DIR)(+)$(MODULE_NAME).efi
+        $(DEBUG_DIR)(+)$(MODULE_NAME).debug
+        $(DEBUG_DIR)(+)$(MODULE_NAME).efi-tmp
+        $(DEBUG_DIR)(+)$(MODULE_NAME).map
+        $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
+        $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
+
     <Command.MSFT, Command.INTEL, Command.CLANGPDB>
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
@@ -352 +363 @@
         -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
     <Command.GCC>
+# vbox 2024-11-18 bird: This crap modifies the source file, causing EnglishDxe to spin forever
+#        $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
+#        "$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) ${src}
+#
+#        #
+#        #The below 2 lines are only needed for UNIXGCC tool chain, which generates PE image directly
+#        #
+#        -"$(OBJCOPY)" $(OBJCOPY_ADDDEBUGFLAG) ${src}
+#        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
+#
+#        "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
+#        $(CP) ${dst} $(DEBUG_DIR)
+#        $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
+#        -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
+# Rewritten:
         $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
-        "$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) ${src}
-
-        #
-        #The below 2 lines are only needed for UNIXGCC tool chain, which generates PE image directly
-        #
-        -"$(OBJCOPY)" $(OBJCOPY_ADDDEBUGFLAG) ${src}
-        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
-
-        "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
+        $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).efi-tmp
+        "$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) $(DEBUG_DIR)(+)$(MODULE_NAME).efi-tmp
+        "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).efi-tmp $(GENFW_FLAGS)
         $(CP) ${dst} $(DEBUG_DIR)
         $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
-        -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
+        $(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
+        -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).map $(OUTPUT_DIR)
 
     <Command.XCODE>

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py

@@ -907 +907 @@
             # to avoid cyclic rule
             if FileType in RuleChain:
-                EdkLogger.error("build", ERROR_STATEMENT, "Cyclic dependency detected while generating rule for %s" % str(Source))
+                EdkLogger.error("build", ERROR_STATEMENT, "Cyclic dependency detected while generating rule for %s (FileType=%s RuleChain=%s)" % (str(Source), FileType, RuleChain))
 
             RuleChain.add(FileType)
-            SourceList.extend(Target.Outputs)
+            # vbox: HACK ALERT! Only add the first .efi output file, otherwise the cyclic error triggers.   # vbox
+            #                   See modification to [Dynamic-Library-File] in build_rule.template.          # vbox
+            if len(Target.Outputs) > 1 and Target.Outputs[0].Ext == '.efi':                                 # vbox
+                SourceList.append(Target.Outputs[0]);                                                       # vbox
+                for oOutput in Target.Outputs[1:]:                                                          # vbox
+                    if oOutput.Ext != '.efi':                                                               # vbox
+                        SourceList.append(oOutput);                                                         # vbox
+            else:                                                                                           # vbox
+                SourceList.extend(Target.Outputs)
 
         # For each final target name, retrieve the corresponding TargetDescBlock instance.