From 2903bb43eb98ba16de5e1bcdf4146e27cbe83eaa Mon Sep 17 00:00:00 2001
From: Dan Palermo <dan.palermo@amd.com>
Date: Fri, 8 Nov 2024 15:13:41 -0600
Subject: [PATCH] [flang][OpenMP] Fix FlangRuntime offload build after assign
 change

    - Use actual function for memmove (address taken)
---
 flang/include/flang/Runtime/freestanding-tools.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flang/include/flang/Runtime/freestanding-tools.h b/flang/include/flang/Runtime/freestanding-tools.h
index 8743c4019805d..cdc0b24b4bad9 100644
--- a/flang/include/flang/Runtime/freestanding-tools.h
+++ b/flang/include/flang/Runtime/freestanding-tools.h
@@ -80,7 +80,7 @@
 #define STD_MEMSET_UNSUPPORTED 1
 #define STD_MEMCPY_USE_BUILTIN 1
 #define STD_MEMCPY_UNSUPPORTED 1
-#define STD_MEMMOVE_USE_BUILTIN 1
+// #define STD_MEMMOVE_USE_BUILTIN 1  // address now taken in assign.h
 #define STD_MEMMOVE_UNSUPPORTED 1
 // #define STD_STRLEN_USE_BUILTIN 1  // still resolves to strlen
 #define STD_STRLEN_UNSUPPORTED 1
@@ -162,7 +162,7 @@ static inline RT_API_ATTRS void *memmove(
   const char *from{reinterpret_cast<const char *>(src)};
 
   if (to == from) {
-    return;
+    return dest;
   }
   if (to + count <= from || from + count <= to) {
     memcpy(dest, src, count);