summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--config/srclist.txt8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b20008a175..1400624d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-06 Paul Eggert <eggert@cs.ucla.edu>
+
+ regex: now back in sync with glibc
+ * config/srclist.txt: regcomp.c, regex_internal.c, regex_internal.h,
+ regexec.c got merged into glibc and are now copies again.
+
2019-10-27 Bruno Haible <bruno@clisp.org>
host-cpu-c-abi: Recognize i386 and a couple of other CPUs as 32-bit.
diff --git a/config/srclist.txt b/config/srclist.txt
index e001d15c36..4a3a5a7af0 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -52,12 +52,12 @@ $LIBCSRC malloc/scratch_buffer_grow_preserve.c lib/malloc
$LIBCSRC malloc/scratch_buffer_set_array_size.c lib/malloc
# Temporarily newer in Gnulib than in glibc.
#$LIBCSRC include/intprops.h lib
-#$LIBCSRC posix/regcomp.c lib
+$LIBCSRC posix/regcomp.c lib
$LIBCSRC posix/regex.c lib
$LIBCSRC posix/regex.h lib
-#$LIBCSRC posix/regex_internal.c lib
-#$LIBCSRC posix/regex_internal.h lib
-#$LIBCSRC posix/regexec.c lib
+$LIBCSRC posix/regex_internal.c lib
+$LIBCSRC posix/regex_internal.h lib
+$LIBCSRC posix/regexec.c lib
$LIBCSRC time/timegm.c lib
$LIBCSRC time/mktime.c lib
$LIBCSRC time/mktime-internal.h lib