Make sure memcpy() works in 16bit mode also.

[seabios.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 1faca26053c5019a30dccafec130db6799db8938..283ec088c185b6572dcc5067a70faa9fcf67e6e0 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -182,8 +182,11 @@ memcpy_far(u16 d_seg, void *d_far, u16 s_seg, const void *s_far, size_t len)
 void *
 #undef memcpy
 memcpy(void *d1, const void *s1, size_t len)
+#if MODE16 == 0
 #define memcpy __builtin_memcpy
+#endif
 {
+    SET_SEG(ES, GET_SEG(SS));
     void *d = d1;
     if (((u32)d1 | (u32)s1 | len) & 3) {
         // non-aligned memcpy