Changeset 100474 in vbox for trunk/tools

Timestamp:

Jul 10, 2023 3:58:55 PM (17 months ago)

Author:

vboxsync

Message:

tools: Add gcc cross compile toolchains for baremetal arm and arm64 in order to build UEFI images for arm on linux.amd64, bugref:10400 [scm fix]

Location:

trunk/tools/kBuildTools

Files:

• VBoxXGccArm64Elf.kmk (modified) (11 diffs)
• VBoxXGccArmNoneEabi.kmk (modified) (11 diffs)

trunk/tools/kBuildTools/VBoxXGccArm64Elf.kmk

@@ -134 +134 @@
 TOOL_VBoxXGccArm64Elf_COMPILE_C_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_VBoxXGccArm64Elf_COMPILE_C_CMDS
-if "$(use_objcache)" != ""
+ if "$(use_objcache)" != ""
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).i\
@@ -146 +146 @@
                 -o $(obj)\
                 -
-else
+ else
         $(QUIET)$(TOOL_VBoxXGccArm64Elf_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -152 +152 @@
                 -o $(obj)\
                 $(abspath $(source))
-endif
+ endif
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -174 +174 @@
 TOOL_VBoxXGccArm64Elf_COMPILE_CXX_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_VBoxXGccArm64Elf_COMPILE_CXX_CMDS
-if "$(use_objcache)" != ""
+ if "$(use_objcache)" != ""
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).ii\
@@ -187 +187 @@
                 -o $(obj)\
                 -
-else
+ else
         $(QUIET)$(TOOL_VBoxXGccArm64Elf_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -194 +194 @@
                 ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
                 $(abspath $(source))
-endif
+ endif
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -295 +295 @@
 TOOL_VBoxXGccArm64Elf_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).debug
 TOOL_VBoxXGccArm64Elf_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_VBoxXGccArm64Elf_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-                $(filter %.def, $(othersrc))
+TOOL_VBoxXGccArm64Elf_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) \
+        $(filter %.def, $(othersrc))
 TOOL_VBoxXGccArm64Elf_LINK_PROGRAM_DEPORD =
 define TOOL_VBoxXGccArm64Elf_LINK_PROGRAM_CMDS
@@ -302 +302 @@
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib))) \
                 $(call TOOL_VBoxXGccArm64Elf_LD_MAP,$(outbase).map)
  ifeq ($(ld_debug),split)
@@ -329 +329 @@
 TOOL_VBoxXGccArm64Elf_LINK_DLL_OUTPUT_DEBUG = $(outbase).debug
 TOOL_VBoxXGccArm64Elf_LINK_DLL_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_VBoxXGccArm64Elf_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-                $(filter %.def, $(othersrc))
+TOOL_VBoxXGccArm64Elf_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) \
+        $(filter %.def, $(othersrc))
 TOOL_VBoxXGccArm64Elf_LINK_DLL_DEPORD =
 define TOOL_VBoxXGccArm64Elf_LINK_DLL_CMDS
@@ -338 +338 @@
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib))) \
                 $(call TOOL_VBoxXGccArm64Elf_LD_MAP,$(outbase).map)
  ifeq ($(ld_debug),split)
@@ -365 +365 @@
 TOOL_VBoxXGccArm64Elf_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).debug
 TOOL_VBoxXGccArm64Elf_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_VBoxXGccArm64Elf_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-                $(filter %.def, $(othersrc))
+TOOL_VBoxXGccArm64Elf_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) \
+        $(filter %.def, $(othersrc))
 TOOL_VBoxXGccArm64Elf_LINK_SYSMOD_DEPORD =
 define TOOL_VBoxXGccArm64Elf_LINK_SYSMOD_CMDS
-        $(QUIET)$(TOOL_VBoxXGccArm64Elf_LD_SYSMOD) $(TOOL_VBoxXGccArm64Elf_LDFLAGS.sysmod) $(flags) -o $(out) $(filter-out %.h.gch,$(objs))\
+        $(QUIET)$(TOOL_VBoxXGccArm64Elf_LD_SYSMOD) $(TOOL_VBoxXGccArm64Elf_LDFLAGS.sysmod) $(flags) -o $(out) $(filter-out %.h.gch,$(objs)) \
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\

trunk/tools/kBuildTools/VBoxXGccArmNoneEabi.kmk

@@ -134 +134 @@
 TOOL_VBoxXGccArmNoneEabi_COMPILE_C_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_VBoxXGccArmNoneEabi_COMPILE_C_CMDS
-if "$(use_objcache)" != ""
+ if "$(use_objcache)" != ""
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).i\
@@ -146 +146 @@
                 -o $(obj)\
                 -
-else
+ else
         $(QUIET)$(TOOL_VBoxXGccArmNoneEabi_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -152 +152 @@
                 -o $(obj)\
                 $(abspath $(source))
-endif
+ endif
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -174 +174 @@
 TOOL_VBoxXGccArmNoneEabi_COMPILE_CXX_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_VBoxXGccArmNoneEabi_COMPILE_CXX_CMDS
-if "$(use_objcache)" != ""
+ if "$(use_objcache)" != ""
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).ii\
@@ -187 +187 @@
                 -o $(obj)\
                 -
-else
+ else
         $(QUIET)$(TOOL_VBoxXGccArmNoneEabi_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -194 +194 @@
                 ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
                 $(abspath $(source))
-endif
+ endif
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -270 +270 @@
                 $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
         $(if $(filter %.def %.imp %.dll,$(othersrc))\
-                ,$(TOOL_VBoxXGccArmNoneEabi_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\
+                ,$(TOOL_VBoxXGccArmNoneEabi_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc)) \
                  $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
         $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
@@ -295 +295 @@
 TOOL_VBoxXGccArmNoneEabi_LINK_PROGRAM_OUTPUT_DEBUG = $(outbase).debug
 TOOL_VBoxXGccArmNoneEabi_LINK_PROGRAM_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_VBoxXGccArmNoneEabi_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-                $(filter %.def, $(othersrc))
+TOOL_VBoxXGccArmNoneEabi_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) \
+        $(filter %.def, $(othersrc))
 TOOL_VBoxXGccArmNoneEabi_LINK_PROGRAM_DEPORD =
 define TOOL_VBoxXGccArmNoneEabi_LINK_PROGRAM_CMDS
@@ -302 +302 @@
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib))) \
                 $(call TOOL_VBoxXGccArmNoneEabi_LD_MAP,$(outbase).map)
  ifeq ($(ld_debug),split)
@@ -329 +329 @@
 TOOL_VBoxXGccArmNoneEabi_LINK_DLL_OUTPUT_DEBUG = $(outbase).debug
 TOOL_VBoxXGccArmNoneEabi_LINK_DLL_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_VBoxXGccArmNoneEabi_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-                $(filter %.def, $(othersrc))
+TOOL_VBoxXGccArmNoneEabi_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) \
+        $(filter %.def, $(othersrc))
 TOOL_VBoxXGccArmNoneEabi_LINK_DLL_DEPORD =
 define TOOL_VBoxXGccArmNoneEabi_LINK_DLL_CMDS
         $(QUIET)$(TOOL_VBoxXGccArmNoneEabi_LD) $(TOOL_VBoxXGccArmNoneEabi_LDFLAGS.dll) $(flags) -o $(out)\
-                $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_VBoxXGccArmNoneEabi_LD_SONAME,$(target),$(out)))\
+                $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_VBoxXGccArmNoneEabi_LD_SONAME,$(target),$(out))) \
                 $(filter-out %.h.gch,$(objs))\
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib))) \
                 $(call TOOL_VBoxXGccArmNoneEabi_LD_MAP,$(outbase).map)
  ifeq ($(ld_debug),split)
@@ -365 +365 @@
 TOOL_VBoxXGccArmNoneEabi_LINK_SYSMOD_OUTPUT_DEBUG = $(outbase).debug
 TOOL_VBoxXGccArmNoneEabi_LINK_SYSMOD_DEBUG_INSTALL_FN = $(2).debug=>$(basename $(3)).debug
-TOOL_VBoxXGccArmNoneEabi_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
-                $(filter %.def, $(othersrc))
+TOOL_VBoxXGccArmNoneEabi_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) \
+        $(filter %.def, $(othersrc))
 TOOL_VBoxXGccArmNoneEabi_LINK_SYSMOD_DEPORD =
 define TOOL_VBoxXGccArmNoneEabi_LINK_SYSMOD_CMDS
-        $(QUIET)$(TOOL_VBoxXGccArmNoneEabi_LD_SYSMOD) $(TOOL_VBoxXGccArmNoneEabi_LDFLAGS.sysmod) $(flags) -o $(out) $(filter-out %.h.gch,$(objs))\
+        $(QUIET)$(TOOL_VBoxXGccArmNoneEabi_LD_SYSMOD) $(TOOL_VBoxXGccArmNoneEabi_LDFLAGS.sysmod) $(flags) -o $(out) $(filter-out %.h.gch,$(objs)) \
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib))) \
                 $(call TOOL_VBoxXGccArmNoneEabi_LD_SYSMOD_MAP,$(outbase).map)
  ifeq ($(ld_debug),split)