Changeset 80721 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/CryptoPkg/Library/IntrinsicLib/CopyMem.c

Timestamp:

Sep 11, 2019 8:46:37 AM (5 years ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Start upgrade process to edk2-stable201908 (compiles on Windows and works to some extent), bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• CryptoPkg/Library/IntrinsicLib/CopyMem.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/CryptoPkg/Library/IntrinsicLib/CopyMem.c

@@ -4 +4 @@
 
 Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -17 +11 @@
 #include <Library/BaseMemoryLib.h>
 
+#if defined(__clang__) && !defined(__APPLE__)
+
+/* Copies bytes between buffers */
+static __attribute__((__used__))
+void * __memcpy (void *dest, const void *src, unsigned int count)
+{
+  return CopyMem (dest, src, (UINTN)count);
+}
+__attribute__((__alias__("__memcpy")))
+void * memcpy (void *dest, const void *src, unsigned int count);
+
+#else
 /* Copies bytes between buffers */
 void * memcpy (void *dest, const void *src, unsigned int count)
@@ -22 +28 @@
   return CopyMem (dest, src, (UINTN)count);
 }
+#endif