Changeset 106534 in vbox for trunk/src/libs

Timestamp:

Oct 21, 2024 12:11:58 AM (3 months ago)

Author:

vboxsync

Message:

libs/openssl-3.1.7/Config.kmk: Assembler config update. jiraref:VBP-1171

File:

• trunk/src/libs/openssl-3.1.7/Config.kmk (modified) (1 diff)

trunk/src/libs/openssl-3.1.7/Config.kmk

@@ -242 +242 @@
 TEMPLATE_LibCrypto_EXTENDS = VBoxR3RuntimeDllNonPedantic
 ifneq ($(KBUILD_TARGET),win)
- TEMPLATE_LibCrypto_ASTOOL          = $(TEMPLATE_VBoxR3RuntimeDllNonPedantic_TOOL)
- TEMPLATE_LibCrypto_ASFLAGS         = -include $(VBOX_PATH_OPENSSL)/openssl-mangling.h
- TEMPLATE_LibCrypto_ASFLAGS.x86     = -m32
- TEMPLATE_LibCrypto_ASFLAGS.amd64   = -m64
- TEMPLATE_LibCrypto_ASDEFS          = $(NO_SUCH_VARIABLE)
- TEMPLATE_LibCrypto_ASDEFS.darwin   = OPENSSL_MANGLE_ASM
+ TEMPLATE_LibCrypto_ASTOOL.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)  = $(VBOX_GCC_TOOL)
+ TEMPLATE_LibCrypto_ASFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(VBOX_$(VBOX_GCC_TOOL)_ASFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
+ TEMPLATE_LibCrypto_ASFLAGS.$(KBUILD_TARGET).x86                   = $(VBOX_$(VBOX_GCC_TOOL)_ASFLAGS.$(KBUILD_TARGET).x86)
+ TEMPLATE_LibCrypto_ASFLAGS.$(KBUILD_TARGET).amd64                 = $(VBOX_$(VBOX_GCC_TOOL)_ASFLAGS.$(KBUILD_TARGET).amd64)
+ TEMPLATE_LibCrypto_ASFLAGS                                        = -include $(VBOX_PATH_OPENSSL)/openssl-mangling.h
+ TEMPLATE_LibCrypto_ASDEFS                                         = $(NO_SUCH_VARIABLE)
+ TEMPLATE_LibCrypto_ASDEFS.darwin                                  = OPENSSL_MANGLE_ASM
  if "$(VBOX_AS_VERSION)" != "" && "$(VBOX_AS_VERSION)" vlt "GNU assembler version 2.20"
   TEMPLATE_LibCrypto_ASFLAGS.solaris = -include $(VBOX_PATH_OPENSSL)/crypto/old-solaris-asm-trick.h