Changeset 87254 in vbox

Timestamp:

Jan 14, 2021 10:58:44 PM (4 years ago)

Author:

vboxsync

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

142212

Message:

xpcom18a4: Adjustments for bugref:9898.

Location:

trunk/src/libs/xpcom18a4

Files:

• Config.kmk (modified) (4 diffs)
• Makefile.kmk (modified) (3 diffs)
• nsprpub/pr/include/md/_darwin.cfg (modified) (1 diff)
• nsprpub/pr/include/md/_darwin.h (modified) (1 diff)
• xpcom/io/nsAppFileLocationProvider.cpp (modified) (2 diffs)
• xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm64_vbox.cpp (added)
• xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm64_vbox.cpp (added)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -51 +51 @@
 TEMPLATE_XPCOM_CXXFLAGS.x86        = -m32
 TEMPLATE_XPCOM_CXXFLAGS.amd64      = -m64
+TEMPLATE_XPCOM_CXXFLAGS.arm64      = -m64
 TEMPLATE_XPCOM_CXXFLAGS.darwin     = -fpascal-strings -fshort-wchar -fno-common -fno-rtti $(VBOX_DARWIN_DEF_SDK_CXXFLAGS)
 TEMPLATE_XPCOM_CXXFLAGS.freebsd    = -pthread
@@ -59 +60 @@
 TEMPLATE_XPCOM_CFLAGS.x86          = -m32
 TEMPLATE_XPCOM_CFLAGS.amd64        = -m64
+TEMPLATE_XPCOM_CFLAGS.arm64        = -m64
 TEMPLATE_XPCOM_CFLAGS.freebsd      = -pthread
 TEMPLATE_XPCOM_CFLAGS.linux        = -pthread -ansi
@@ -75 +77 @@
 TEMPLATE_XPCOM_DEFS.x86            = i386=1
 TEMPLATE_XPCOM_DEFS.amd64          = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\)
+TEMPLATE_XPCOM_DEFS.arm64          = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\)
 TEMPLATE_XPCOM_DEFS.darwin         = OSTYPE=\"Darwin8.8.1\" OSARCH=\"Darwin\" XP_UNIX=1 XP_MACOSX=1 TARGET_CARBON=1 HAVE_VISIBILITY_ATTRIBUTE=1 DARWIN=1 $(TEMPLATE_VBOXR3NP_DEFS.darwin)
 TEMPLATE_XPCOM_DEFS.darwin.amd64   = VBOX_MACOSX_FOLLOWS_UNIX_IO
+TEMPLATE_XPCOM_DEFS.darwin.arm64   = VBOX_MACOSX_FOLLOWS_UNIX_IO
 TEMPLATE_XPCOM_DEFS.freebsd        = OSTYPE=\"FreeBSD5+\"   OSARCH=\"FreeBSD\" XP_UNIX=1 FREEBSD=1 HAVE_VISIBILITY_ATTRIBUTE=1
 TEMPLATE_XPCOM_DEFS.linux          = OSTYPE=\"Linux2.6\"    OSARCH=\"Linux\"  XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1 ## @todo LINUX=1
@@ -90 +94 @@
 TEMPLATE_XPCOM_LDFLAGS.x86         = -m32
 TEMPLATE_XPCOM_LDFLAGS.amd64       = -m64
+TEMPLATE_XPCOM_LDFLAGS.arm64       = -m64
 TEMPLATE_XPCOM_LDFLAGS.darwin      = $(TEMPLATE_VBOXR3NP_LDFLAGS.darwin) \
         -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -516 +516 @@
 VBox-xpcom-nspr_DEFS.darwin.amd64 = \
         VBOX_USE_MORE_IPRT_IN_NSPR
+VBox-xpcom-nspr_DEFS.darwin.arm64 = \
+        VBOX_USE_MORE_IPRT_IN_NSPR
 VBox-xpcom-nspr_DEFS.darwin = \
         HAVE_BSD_FLOCK=1 \
@@ -805 +807 @@
         xpcom/MoreFiles/FSCopyObject.c \
         xpcom/MoreFiles/MoreFilesX.c
-if1of ($(KBUILD_TARGET) $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd linux netbsd openbsd solaris darwin.amd64)
+if1of ($(KBUILD_TARGET) $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd linux netbsd openbsd solaris darwin.amd64 darwin.arm64)
 VBox-xpcom-io_SOURCES += \
         xpcom/io/nsLocalFileUnix.cpp
@@ -875 +877 @@
                                            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.arm64         = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm64_vbox.cpp \
+                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm64_vbox.cpp
 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

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_darwin.cfg

@@ -49 +49 @@
 #define PR_AF_INET6 30  /* same as AF_INET6 */
 
-#if defined(i386) || defined(__i386__) || defined(__amd64__)
+#if defined(i386) || defined(__i386__) || defined(__amd64__) || defined(__arm64__) || defined(__arm__)
 #undef IS_BIG_ENDIAN
 #define  IS_LITTLE_ENDIAN 1

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_darwin.h

@@ -55 +55 @@
 #elif defined(__amd64__)
 #define _PR_SI_ARCHITECTURE "amd64"
+#elif defined(__arm__)
+#define _PR_SI_ARCHITECTURE "arm"
+#elif defined(__arm64__)
+#define _PR_SI_ARCHITECTURE "arm64"
 #else
 #error "unknown architecture."

trunk/src/libs/xpcom18a4/xpcom/io/nsAppFileLocationProvider.cpp

@@ -150 +150 @@
 #if (defined (XP_MAC) || defined(XP_MACOSX)) && !defined(VBOX_MACOSX_FOLLOWS_UNIX_IO)
     short foundVRefNum;
-    long foundDirID;
+    SInt32 foundDirID;
     FSSpec fileSpec;
     nsCOMPtr<nsILocalFileMac> macFile;
@@ -588 +588 @@
         if (!keys) {
             OSErr err;
-            long response;
+            SInt32 response;
             err = ::Gestalt(gestaltSystemVersion, &response);
             keys = (!err && response >= 0x00001000) ? osXKeys : os9Keys;