Changeset 93958 in vbox

Timestamp:

Feb 27, 2022 1:46:29 PM (3 years ago)

Author:

vboxsync

Message:

IPRT: Expose mempcpy on darwin so we can build DevFwCommon after r150183. Added C++ version of it for arm64.

Location:

trunk

Files:

• include/iprt/string.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/string/mempcpy.cpp (added)

trunk/include/iprt/string.h

@@ -75 +75 @@
  * IPRT instead of the operating environment.
  */
-#if defined(RT_OS_DARWIN) && defined(KERNEL)
+#if defined(RT_OS_DARWIN)
 RT_C_DECLS_BEGIN
+# ifdef KERNEL
 void *memchr(const void *pv, int ch, size_t cb);
 char *strpbrk(const char *pszStr, const char *pszChars);
+# endif
+RTDECL(void *) mempcpy(void *pvDst, const void *pvSrc, size_t cb);
 RT_C_DECLS_END
 #endif

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1325 +1325 @@
         r3/posix/tls-posix.cpp \
         r3/posix/utf8-posix.cpp
-RuntimeR3_SOURCES.darwin.x86   += common/string/memrchr.asm
-RuntimeR3_SOURCES.darwin.amd64 += common/string/memrchr.asm
+RuntimeR3_SOURCES.darwin.x86   += \
+        common/string/mempcpy.asm \
+        common/string/memrchr.asm
+RuntimeR3_SOURCES.darwin.amd64 += \
+        common/string/mempcpy.asm \
+        common/string/memrchr.asm
 RuntimeR3_SOURCES.darwin.arm32 += \
+        common/string/mempcpy.cpp \
         common/string/memrchr.cpp \
         r3/darwin/RTMpGetDescription-generic.cpp
 RuntimeR3_SOURCES.darwin.arm64 += \
+        common/string/mempcpy.cpp \
         common/string/memrchr.cpp \
         r3/darwin/RTMpGetDescription-generic.cpp