Changeset 86259 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Sep 24, 2020 10:12:08 AM (4 years ago)

Author:

vboxsync

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

140532

Message:

xpcom/xptcall: Use xptcinvoke_amd64_vbox.asm on all amd64 targets. bugref:9790

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -856 +856 @@
 
 
-VBox-xpcom-xptcall_TEMPLATE = XPCOM
+VBox-xpcom-xptcall_TEMPLATE = XPCOMYASM
 VBox-xpcom-xptcall_INSTTYPE = none
-VBox-xpcom-xptcall_DEFS                = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTC_API
-VBox-xpcom-xptcall_DEFS.darwin         = KEEP_STACK_16_BYTE_ALIGNED
-VBox-xpcom-xptcall_DEFS.os2            = MOZ_NEED_LEADING_UNDERSCORE
-VBox-xpcom-xptcall_INCS.os2            = xpcom/reflect/xptcall/src/md/unix
-VBox-xpcom-xptcall_SOURCES             = xpcom/reflect/xptcall/src/xptcall.cpp
-VBox-xpcom-xptcall_SOURCES.darwin.x86  = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
-VBox-xpcom-xptcall_SOURCES.darwin.amd64= xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_darwin.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_darwin.cpp
-VBox-xpcom-xptcall_SOURCES.freebsd.x86 = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
-VBox-xpcom-xptcall_SOURCES.freebsd.amd64=xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
-VBox-xpcom-xptcall_SOURCES.linux.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
-VBox-xpcom-xptcall_SOURCES.linux.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
-VBox-xpcom-xptcall_SOURCES.os2         = xpcom/reflect/xptcall/src/md/os2/xptcinvoke_gcc_x86_os2.cpp \
-                                         xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp
-VBox-xpcom-xptcall_SOURCES.solaris.x86 = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp \
-                                         xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
-ifdef VBOX_GCC_USING_SOLARIS_AS
- VBox-xpcom-xptcall_SOURCES.solaris.amd64 = \
-    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp \
-    xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
+VBox-xpcom-xptcall_DEFS                  = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTC_API
+VBox-xpcom-xptcall_DEFS.darwin           = KEEP_STACK_16_BYTE_ALIGNED
+VBox-xpcom-xptcall_DEFS.os2              = MOZ_NEED_LEADING_UNDERSCORE
+VBox-xpcom-xptcall_INCS.os2              = xpcom/reflect/xptcall/src/md/unix
+VBox-xpcom-xptcall_SOURCES               = xpcom/reflect/xptcall/src/xptcall.cpp
+VBox-xpcom-xptcall_SOURCES.darwin.x86    = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp \
+                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
+VBox-xpcom-xptcall_SOURCES.freebsd.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
+                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
+VBox-xpcom-xptcall_SOURCES.linux.x86     = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
+                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
+VBox-xpcom-xptcall_SOURCES.os2           = xpcom/reflect/xptcall/src/md/os2/xptcinvoke_gcc_x86_os2.cpp \
+                                           xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp
+VBox-xpcom-xptcall_SOURCES.solaris.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp \
+                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
+VBox-xpcom-xptcall_SOURCES.amd64         = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_vbox.asm
+VBox-xpcom-xptcall_SOURCES.darwin.amd64  = xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_darwin.cpp # Underscore prefix.
+VBox-xpcom-xptcall_SOURCES.freebsd.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
+VBox-xpcom-xptcall_SOURCES.linux.amd64   = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
+ifndef VBOX_GCC_USING_SOLARIS_AS
+VBox-xpcom-xptcall_SOURCES.solaris.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
 else
- VBox-xpcom-xptcall_SOURCES.solaris.amd64 = \
-    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp \
-    xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
-endif
+VBox-xpcom-xptcall_SOURCES.solaris.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
+endif
+
 xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp_CXXFLAGS = -O0
 # -O0 works fine, while -O1 doesn't. The gcc man page can't be listing all the -f*