Google Git
Sign in
mingw/mingw-w64/ec1ff7764fbea4eefbb290c9ba888af3386ede8e^!/.
commit
ec1ff7764fbea4eefbb290c9ba888af3386ede8e
[log]
author
Jonathan Yong <10walls@gmail.com>
Wed Jul 30 18:17:20 2014 +0800
committer
Jonathan Yong <10walls@gmail.com>
Thu Jul 31 06:01:15 2014 +0800
tree
b079f290cef926d2ca687105dd94533a535774d5
parent
88ab6fbdd0a185702a1fce4db935e303030e082f [diff]
Add memmove_s emu

Some applications, like CryptoPP, won't run on Windows XP, because
memmove_s isn't defined in that OS. As I needed CryptoPP to compile
easily, I wrote this patch. It emulates the method by checking for the
availability and falling back on memmove (without s).

Patch by Ruben de Smet ruben.de.smet a telenet.be

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 2c0d85e..c2b5ff6 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am

@@ -185,6 +185,7 @@
   secapi/_wstrdate_s.c \
   secapi/asctime_s.c \
   secapi/memcpy_s.c \
+  secapi/memmove_s.c \
   secapi/rand_s.c \
   secapi/sprintf_s.c \
   secapi/strerror_s.c \

diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 96d1ea0..10e73a4 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in

@@ -1135,9 +1135,10 @@
 	secapi/_vcwprintf_s_l.c secapi/_waccess_s.c \
 	secapi/_wasctime_s.c secapi/_wctime32_s.c secapi/_wctime64_s.c \
 	secapi/_wstrtime_s.c secapi/_wmktemp_s.c secapi/_wstrdate_s.c \
-	secapi/asctime_s.c secapi/memcpy_s.c secapi/rand_s.c \
-	secapi/sprintf_s.c secapi/strerror_s.c secapi/vsprintf_s.c \
-	secapi/wmemcpy_s.c misc/lc_locale_func.c lib32/msvcrt.def.in
+	secapi/asctime_s.c secapi/memcpy_s.c secapi/memmove_s.c \
+	secapi/rand_s.c secapi/sprintf_s.c secapi/strerror_s.c \
+	secapi/vsprintf_s.c secapi/wmemcpy_s.c misc/lc_locale_func.c \
+	lib32/msvcrt.def.in
 am__objects_21 =  \
 	misc/lib32_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
 	misc/lib32_libmsvcrt_a-output_format.$(OBJEXT) \
@@ -1173,6 +1174,7 @@
 	secapi/lib32_libmsvcrt_a-_wstrdate_s.$(OBJEXT) \
 	secapi/lib32_libmsvcrt_a-asctime_s.$(OBJEXT) \
 	secapi/lib32_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+	secapi/lib32_libmsvcrt_a-memmove_s.$(OBJEXT) \
 	secapi/lib32_libmsvcrt_a-rand_s.$(OBJEXT) \
 	secapi/lib32_libmsvcrt_a-sprintf_s.$(OBJEXT) \
 	secapi/lib32_libmsvcrt_a-strerror_s.$(OBJEXT) \
@@ -2270,9 +2272,9 @@
 	secapi/_vcwprintf_s_l.c secapi/_waccess_s.c \
 	secapi/_wasctime_s.c secapi/_wctime32_s.c secapi/_wctime64_s.c \
 	secapi/_wstrtime_s.c secapi/_wmktemp_s.c secapi/_wstrdate_s.c \
-	secapi/asctime_s.c secapi/memcpy_s.c secapi/rand_s.c \
-	secapi/sprintf_s.c secapi/strerror_s.c secapi/vsprintf_s.c \
-	secapi/wmemcpy_s.c lib64/msvcrt.def.in
+	secapi/asctime_s.c secapi/memcpy_s.c secapi/memmove_s.c \
+	secapi/rand_s.c secapi/sprintf_s.c secapi/strerror_s.c \
+	secapi/vsprintf_s.c secapi/wmemcpy_s.c lib64/msvcrt.def.in
 am__objects_54 =  \
 	misc/lib64_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
 	misc/lib64_libmsvcrt_a-output_format.$(OBJEXT) \
@@ -2308,6 +2310,7 @@
 	secapi/lib64_libmsvcrt_a-_wstrdate_s.$(OBJEXT) \
 	secapi/lib64_libmsvcrt_a-asctime_s.$(OBJEXT) \
 	secapi/lib64_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+	secapi/lib64_libmsvcrt_a-memmove_s.$(OBJEXT) \
 	secapi/lib64_libmsvcrt_a-rand_s.$(OBJEXT) \
 	secapi/lib64_libmsvcrt_a-sprintf_s.$(OBJEXT) \
 	secapi/lib64_libmsvcrt_a-strerror_s.$(OBJEXT) \
@@ -3334,8 +3337,9 @@
 	secapi/_waccess_s.c secapi/_wasctime_s.c secapi/_wctime32_s.c \
 	secapi/_wctime64_s.c secapi/_wstrtime_s.c secapi/_wmktemp_s.c \
 	secapi/_wstrdate_s.c secapi/asctime_s.c secapi/memcpy_s.c \
-	secapi/rand_s.c secapi/sprintf_s.c secapi/strerror_s.c \
-	secapi/vsprintf_s.c secapi/wmemcpy_s.c misc/lc_locale_func.c
+	secapi/memmove_s.c secapi/rand_s.c secapi/sprintf_s.c \
+	secapi/strerror_s.c secapi/vsprintf_s.c secapi/wmemcpy_s.c \
+	misc/lc_locale_func.c
 am__objects_83 =  \
 	misc/libarm32_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
 	misc/libarm32_libmsvcrt_a-output_format.$(OBJEXT) \
@@ -3371,6 +3375,7 @@
 	secapi/libarm32_libmsvcrt_a-_wstrdate_s.$(OBJEXT) \
 	secapi/libarm32_libmsvcrt_a-asctime_s.$(OBJEXT) \
 	secapi/libarm32_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+	secapi/libarm32_libmsvcrt_a-memmove_s.$(OBJEXT) \
 	secapi/libarm32_libmsvcrt_a-rand_s.$(OBJEXT) \
 	secapi/libarm32_libmsvcrt_a-sprintf_s.$(OBJEXT) \
 	secapi/libarm32_libmsvcrt_a-strerror_s.$(OBJEXT) \
@@ -5060,6 +5065,7 @@
   secapi/_wstrdate_s.c \
   secapi/asctime_s.c \
   secapi/memcpy_s.c \
+  secapi/memmove_s.c \
   secapi/rand_s.c \
   secapi/sprintf_s.c \
   secapi/strerror_s.c \
@@ -9055,6 +9061,8 @@
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib32_libmsvcrt_a-memcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/lib32_libmsvcrt_a-memmove_s.$(OBJEXT): secapi/$(am__dirstamp) \
+	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib32_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib32_libmsvcrt_a-sprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
@@ -10655,6 +10663,8 @@
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib64_libmsvcrt_a-memcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/lib64_libmsvcrt_a-memmove_s.$(OBJEXT): secapi/$(am__dirstamp) \
+	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib64_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/lib64_libmsvcrt_a-sprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
@@ -12187,6 +12197,8 @@
 	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/libarm32_libmsvcrt_a-memcpy_s.$(OBJEXT):  \
 	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
+secapi/libarm32_libmsvcrt_a-memmove_s.$(OBJEXT):  \
+	secapi/$(am__dirstamp) secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/libarm32_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
 	secapi/$(DEPDIR)/$(am__dirstamp)
 secapi/libarm32_libmsvcrt_a-sprintf_s.$(OBJEXT):  \
@@ -15112,6 +15124,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-_wstrtime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-asctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-memcpy_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-rand_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-sprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Po@am__quote@
@@ -15148,6 +15161,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-_wstrtime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-asctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-memcpy_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-rand_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-sprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Po@am__quote@
@@ -15184,6 +15198,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-_wstrtime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-asctime_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memcpy_s.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-rand_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-sprintf_s.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@secapi/$(DEPDIR)/libarm32_libmsvcrt_a-strerror_s.Po@am__quote@
@@ -25130,6 +25145,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmsvcrt_a-memcpy_s.obj `if test -f 'secapi/memcpy_s.c'; then $(CYGPATH_W) 'secapi/memcpy_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memcpy_s.c'; fi`
 
+secapi/lib32_libmsvcrt_a-memmove_s.o: secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmsvcrt_a-memmove_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Tpo -c -o secapi/lib32_libmsvcrt_a-memmove_s.o `test -f 'secapi/memmove_s.c' || echo '$(srcdir)/'`secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='secapi/memmove_s.c' object='secapi/lib32_libmsvcrt_a-memmove_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmsvcrt_a-memmove_s.o `test -f 'secapi/memmove_s.c' || echo '$(srcdir)/'`secapi/memmove_s.c
+
+secapi/lib32_libmsvcrt_a-memmove_s.obj: secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmsvcrt_a-memmove_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Tpo -c -o secapi/lib32_libmsvcrt_a-memmove_s.obj `if test -f 'secapi/memmove_s.c'; then $(CYGPATH_W) 'secapi/memmove_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memmove_s.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-memmove_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='secapi/memmove_s.c' object='secapi/lib32_libmsvcrt_a-memmove_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib32_libmsvcrt_a-memmove_s.obj `if test -f 'secapi/memmove_s.c'; then $(CYGPATH_W) 'secapi/memmove_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memmove_s.c'; fi`
+
 secapi/lib32_libmsvcrt_a-rand_s.o: secapi/rand_s.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib32_libmsvcrt_a-rand_s.o -MD -MP -MF secapi/$(DEPDIR)/lib32_libmsvcrt_a-rand_s.Tpo -c -o secapi/lib32_libmsvcrt_a-rand_s.o `test -f 'secapi/rand_s.c' || echo '$(srcdir)/'`secapi/rand_s.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib32_libmsvcrt_a-rand_s.Tpo secapi/$(DEPDIR)/lib32_libmsvcrt_a-rand_s.Po
@@ -34230,6 +34259,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmsvcrt_a-memcpy_s.obj `if test -f 'secapi/memcpy_s.c'; then $(CYGPATH_W) 'secapi/memcpy_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memcpy_s.c'; fi`
 
+secapi/lib64_libmsvcrt_a-memmove_s.o: secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmsvcrt_a-memmove_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Tpo -c -o secapi/lib64_libmsvcrt_a-memmove_s.o `test -f 'secapi/memmove_s.c' || echo '$(srcdir)/'`secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='secapi/memmove_s.c' object='secapi/lib64_libmsvcrt_a-memmove_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmsvcrt_a-memmove_s.o `test -f 'secapi/memmove_s.c' || echo '$(srcdir)/'`secapi/memmove_s.c
+
+secapi/lib64_libmsvcrt_a-memmove_s.obj: secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmsvcrt_a-memmove_s.obj -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Tpo -c -o secapi/lib64_libmsvcrt_a-memmove_s.obj `if test -f 'secapi/memmove_s.c'; then $(CYGPATH_W) 'secapi/memmove_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memmove_s.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-memmove_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='secapi/memmove_s.c' object='secapi/lib64_libmsvcrt_a-memmove_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/lib64_libmsvcrt_a-memmove_s.obj `if test -f 'secapi/memmove_s.c'; then $(CYGPATH_W) 'secapi/memmove_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memmove_s.c'; fi`
+
 secapi/lib64_libmsvcrt_a-rand_s.o: secapi/rand_s.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/lib64_libmsvcrt_a-rand_s.o -MD -MP -MF secapi/$(DEPDIR)/lib64_libmsvcrt_a-rand_s.Tpo -c -o secapi/lib64_libmsvcrt_a-rand_s.o `test -f 'secapi/rand_s.c' || echo '$(srcdir)/'`secapi/rand_s.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/lib64_libmsvcrt_a-rand_s.Tpo secapi/$(DEPDIR)/lib64_libmsvcrt_a-rand_s.Po
@@ -42924,6 +42967,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/libarm32_libmsvcrt_a-memcpy_s.obj `if test -f 'secapi/memcpy_s.c'; then $(CYGPATH_W) 'secapi/memcpy_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memcpy_s.c'; fi`
 
+secapi/libarm32_libmsvcrt_a-memmove_s.o: secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/libarm32_libmsvcrt_a-memmove_s.o -MD -MP -MF secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Tpo -c -o secapi/libarm32_libmsvcrt_a-memmove_s.o `test -f 'secapi/memmove_s.c' || echo '$(srcdir)/'`secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Tpo secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='secapi/memmove_s.c' object='secapi/libarm32_libmsvcrt_a-memmove_s.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/libarm32_libmsvcrt_a-memmove_s.o `test -f 'secapi/memmove_s.c' || echo '$(srcdir)/'`secapi/memmove_s.c
+
+secapi/libarm32_libmsvcrt_a-memmove_s.obj: secapi/memmove_s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/libarm32_libmsvcrt_a-memmove_s.obj -MD -MP -MF secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Tpo -c -o secapi/libarm32_libmsvcrt_a-memmove_s.obj `if test -f 'secapi/memmove_s.c'; then $(CYGPATH_W) 'secapi/memmove_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memmove_s.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Tpo secapi/$(DEPDIR)/libarm32_libmsvcrt_a-memmove_s.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='secapi/memmove_s.c' object='secapi/libarm32_libmsvcrt_a-memmove_s.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o secapi/libarm32_libmsvcrt_a-memmove_s.obj `if test -f 'secapi/memmove_s.c'; then $(CYGPATH_W) 'secapi/memmove_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/memmove_s.c'; fi`
+
 secapi/libarm32_libmsvcrt_a-rand_s.o: secapi/rand_s.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT secapi/libarm32_libmsvcrt_a-rand_s.o -MD -MP -MF secapi/$(DEPDIR)/libarm32_libmsvcrt_a-rand_s.Tpo -c -o secapi/libarm32_libmsvcrt_a-rand_s.o `test -f 'secapi/rand_s.c' || echo '$(srcdir)/'`secapi/rand_s.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) secapi/$(DEPDIR)/libarm32_libmsvcrt_a-rand_s.Tpo secapi/$(DEPDIR)/libarm32_libmsvcrt_a-rand_s.Po

diff --git a/mingw-w64-crt/lib32/msvcrt.def.in b/mingw-w64-crt/lib32/msvcrt.def.in
index f473f45..0b4de3f 100644
--- a/mingw-w64-crt/lib32/msvcrt.def.in
+++ b/mingw-w64-crt/lib32/msvcrt.def.in

@@ -1194,7 +1194,7 @@
 mbsrtowcs_s
 mbstowcs_s
 ; memcpy_s replaced by emu
-memmove_s
+; memmove_s replaced by emu
 printf_s
 qsort_s
 scanf_s

diff --git a/mingw-w64-crt/lib64/msvcrt.def.in b/mingw-w64-crt/lib64/msvcrt.def.in
index f42d1fc..dbe5022 100644
--- a/mingw-w64-crt/lib64/msvcrt.def.in
+++ b/mingw-w64-crt/lib64/msvcrt.def.in

@@ -1141,7 +1141,7 @@
 memcpy
 ; memcpy_s replaced by emu
 memmove
-memmove_s
+; memmove_s replaced by emu
 memset
 mktime
 modf