Revert 2020-05-27 changes relating to issue #40438.

diff --git a/ChangeLog b/ChangeLog
index 419e2ae..9d3ac8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2020-06-03  Keith Marshall  <keith@users.osdn.me>
 
+       Revert 2020-05-27 changes relating to issue #40438.
+
+       * VERSION.m4 (LIBMINGWEX): Increment DLL age; this has the effect of
+       indicating restored backward compatibility with linmingwex-2.dll
+
+2020-06-03  Keith Marshall  <keith@users.osdn.me>
+
        Adjust repository version following WSL-5.3.2 release.
 
        * VERSION.m4 (__VERSION__): Increment it to 5.3.3

diff --git a/VERSION.m4 b/VERSION.m4
index 6c848d6..86ee776 100644 (file)
--- a/VERSION.m4
+++ b/VERSION.m4
@@ -23,7 +23,7 @@ m4_define([__VERSION__],[5.3.3])
 #    as required, in accordance with libtool conventions.
 #
 m4_define([MINGW_AC_ENUMERATE_DLLVERSION_SPECS],dnl
-[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [3:0:0])dnl
+[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [3:0:1])dnl
 ])
 
 # $RCSfile$: end of file

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index e6d3cb7..559121a 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,13 @@
+2020-06-03  Keith Marshall  <keith@users.osdn.me>
+
+       Revert 2020-05-27 changes relating to issue #40438.
+
+       * Makefile.in (libmingw32.a): Remove, and relocate...
+       (codeset.$OBJEXT, mbrscan.$OBJEXT): ...each of these, back to...
+       (libmingwex.a): ...here; the previous relocation created more problems
+       than it solved, and indeed, I can no longer reproduce the issue which
+       prompted the earlier relocation.
+
 2020-05-28  Keith Marshall  <keith@users.osdn.me>
 
        Prepare and publish MinGW.org WSL-5.3.2 release.

diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in
index d6bb30c..8b5be97 100644 (file)
--- a/mingwrt/Makefile.in
+++ b/mingwrt/Makefile.in
@@ -468,9 +468,8 @@ libmingwex.a: $(addsuffix .$(OBJEXT), mkstemp mkdtemp cryptnam setenv)
 
 vpath %.s ${mingwrt_srcdir}/mingwex
 vpath %.sx ${mingwrt_srcdir}/mingwex
-libmingw32.a: $(addsuffix .$(OBJEXT), mbrscan wcharmap)
-libmingwex.a: $(addsuffix .$(OBJEXT), codeset mbrconv mbrlen)
-libmingwex.a: $(addsuffix .$(OBJEXT), mbrtowc mbsrtowcs strnlen)
+libmingwex.a: $(addsuffix .$(OBJEXT), codeset mbrconv mbrscan mbrlen)
+libmingwex.a: $(addsuffix .$(OBJEXT), mbrtowc mbsrtowcs strnlen wcharmap)
 libmingwex.a: $(addsuffix .$(OBJEXT), wcrtomb wcsrtombs wcsnlen wcstod wcstof)
 libmingwex.a: $(addsuffix .$(OBJEXT), wcstofp wcstold wctob wctrans wctype)
 libmingwex.a: $(addsuffix .$(OBJEXT), wmemchr wmemcmp wmemcpy wmemmove wmemset)