Flatten bison/gnulib/src to bison/lib to match upstream layout

2f47b5eab59c8031971bd995b703c854fd6f106d

314 files changed, 270 insertions, 270 deletions

diff --git a/build/sysincl/misc-win.yml b/build/sysincl/misc-win.yml
index ae0fdb2abd..8e89403406 100644
--- a/build/sysincl/misc-win.yml
+++ b/build/sysincl/misc-win.yml
@@ -80,20 +80,20 @@
 
 - source_filter: "^contrib/tools/(bison|m4)"
   includes:
-  - alloca.h:      contrib/tools/bison/gnulib/platform/win64/alloca.h
-  - getopt.h:      contrib/tools/bison/gnulib/platform/win64/getopt.h
-  - fcntl.h:       contrib/tools/bison/gnulib/platform/win64/fcntl.h
-  - langinfo.h:    contrib/tools/bison/gnulib/platform/win64/langinfo.h
-  - locale.h:      contrib/tools/bison/gnulib/platform/win64/locale.h
-  - math.h:        contrib/tools/bison/gnulib/platform/win64/math.h
-  - sched.h:       contrib/tools/bison/gnulib/platform/win64/sched.h
-  - signal.h:      contrib/tools/bison/gnulib/platform/win64/signal.h
-  - spawn.h:       contrib/tools/bison/gnulib/platform/win64/spawn.h
-  - stdbool.h:     contrib/tools/bison/gnulib/platform/win64/stdbool.h
-  - sys/stat.h:    contrib/tools/bison/gnulib/platform/win64/sys/stat.h
-  - sys/time.h:    contrib/tools/bison/gnulib/platform/win64/sys/time.h
-  - sys/wait.h:    contrib/tools/bison/gnulib/platform/win64/sys/wait.h
-  - unistd.h:      contrib/tools/bison/gnulib/platform/win64/unistd.h
+  - alloca.h:      contrib/tools/bison/lib/platform/win64/alloca.h
+  - getopt.h:      contrib/tools/bison/lib/platform/win64/getopt.h
+  - fcntl.h:       contrib/tools/bison/lib/platform/win64/fcntl.h
+  - langinfo.h:    contrib/tools/bison/lib/platform/win64/langinfo.h
+  - locale.h:      contrib/tools/bison/lib/platform/win64/locale.h
+  - math.h:        contrib/tools/bison/lib/platform/win64/math.h
+  - sched.h:       contrib/tools/bison/lib/platform/win64/sched.h
+  - signal.h:      contrib/tools/bison/lib/platform/win64/signal.h
+  - spawn.h:       contrib/tools/bison/lib/platform/win64/spawn.h
+  - stdbool.h:     contrib/tools/bison/lib/platform/win64/stdbool.h
+  - sys/stat.h:    contrib/tools/bison/lib/platform/win64/sys/stat.h
+  - sys/time.h:    contrib/tools/bison/lib/platform/win64/sys/time.h
+  - sys/wait.h:    contrib/tools/bison/lib/platform/win64/sys/wait.h
+  - unistd.h:      contrib/tools/bison/lib/platform/win64/unistd.h
 
 - source_filter: "^contrib/libs/libpq"
   includes:
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index ebd781959d..52f5ba3a2c 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -47,14 +47,14 @@
 
 - source_filter: "^contrib/tools/(bison|m4)/"
   includes:
-    - error.h:       contrib/tools/bison/gnulib/src/error.h
-    - fcntl.h:       contrib/tools/bison/gnulib/platform/posix/fcntl.h
-    - getopt.h:      contrib/tools/bison/gnulib/platform/posix/getopt.h
-    - obstack.h:     contrib/tools/bison/gnulib/src/obstack.h
-    - regex.h:       contrib/tools/bison/gnulib/src/regex.h
+    - error.h:       contrib/tools/bison/lib/error.h
+    - fcntl.h:       contrib/tools/bison/lib/platform/posix/fcntl.h
+    - getopt.h:      contrib/tools/bison/lib/platform/posix/getopt.h
+    - obstack.h:     contrib/tools/bison/lib/obstack.h
+    - regex.h:       contrib/tools/bison/lib/regex.h
     - system.h
-    - unlocked-io.h: contrib/tools/bison/gnulib/src/unlocked-io.h
-    # ucrt headers are included by bison/gnulib in a very specific way
+    - unlocked-io.h: contrib/tools/bison/lib/unlocked-io.h
+    # ucrt headers are included by bison/lib in a very specific way
     - ../ucrt/fcntl.h
     - ../ucrt/locale.h
     - ../ucrt/math.h
diff --git a/contrib/tools/bison/gnulib/ya.make b/contrib/tools/bison/gnulib/ya.make
deleted file mode 100644
index 47f6a742dc..0000000000
--- a/contrib/tools/bison/gnulib/ya.make
+++ /dev/null
@@ -1,244 +0,0 @@
-LIBRARY()
-
-LICENSE(
-    BSD-3-Clause AND
-    GPL-3.0-or-later AND
-    LGPL-2.0-or-later
-)
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-
-IF (NOT MUSL)
-    NO_RUNTIME()
-ENDIF()
-
-NO_COMPILER_WARNINGS()
-
-ADDINCL(
-    GLOBAL contrib/tools/bison/gnulib/src
-)
-
-IF (OS_WINDOWS)
-    ADDINCL(
-        GLOBAL contrib/tools/bison/gnulib/platform/win64
-    )
-ELSE()
-    ADDINCL(
-        GLOBAL contrib/tools/bison/gnulib/platform/posix
-    )
-ENDIF()
-
-IF (OS_DARWIN)
-    CFLAGS(
-        -D_XOPEN_SOURCE=600
-    )
-ENDIF()
-
-IF (NOT OS_WINDOWS)
-    CFLAGS(
-        GLOBAL -Dregcomp=gnu_regcomp
-        GLOBAL -Dregerror=gnu_regerror
-        GLOBAL -Dregfree=gnu_regfree
-        GLOBAL -Dregexec=gnu_regexec
-    )
-ENDIF()
-
-SRCS(
-    src/abitset.c
-    src/argmatch.c
-    src/asnprintf.c
-    src/basename-lgpl.c
-    src/basename.c
-    src/binary-io.c
-    src/bitrotate.c
-    src/bitset.c
-    src/bitset_stats.c
-    src/bitsetv-print.c
-    src/bitsetv.c
-    src/c-ctype.c
-    src/c-stack.c
-    src/c-strcasecmp.c
-    src/c-strncasecmp.c
-    src/calloc.c
-    src/clean-temp.c
-    src/cloexec.c
-    src/close-stream.c
-    src/close.c
-    src/closein.c
-    src/closeout.c
-    src/concat-filename.c
-    src/dirname-lgpl.c
-    src/dirname.c
-    src/dup-safer-flag.c
-    src/dup-safer.c
-    src/dup2.c
-    src/ebitset.c
-    src/error.c
-    src/execute.c
-    src/exitfail.c
-    src/fatal-signal.c
-    src/fclose.c
-    src/fcntl.c
-    src/fd-hook.c
-    src/fd-safer-flag.c
-    src/fd-safer.c
-    src/fflush.c
-    src/filenamecat-lgpl.c
-    src/filenamecat.c
-    src/float.c
-    src/fopen-safer.c
-    src/fpurge.c
-    src/freading.c
-    src/fstat.c
-    src/get-errno.c
-    src/getdtablesize.c
-    src/getopt.c
-    src/getopt1.c
-    src/gl_avltree_oset.c
-    src/gl_linkedhash_list.c
-    src/gl_list.c
-    src/gl_oset.c
-    src/gl_xlist.c
-    src/gl_xoset.c
-    src/hash.c
-    src/isnand.c
-    src/isnanf.c
-    src/isnanl.c
-    src/itold.c
-    src/lbitset.c
-    src/localcharset.c
-    src/lseek.c
-    src/lstat.c
-    src/malloc.c
-    src/malloca.c
-    src/mbrtowc.c
-    src/mbswidth.c
-    src/memchr2.c
-    src/mkstemp-safer.c
-    src/nl_langinfo.c
-    src/pipe-safer.c
-    src/pipe2-safer.c
-    src/printf-args.c
-    src/printf-frexp.c
-    src/printf-frexpl.c
-    src/printf-parse.c
-    src/progname.c
-    src/quotearg.c
-    src/raise.c
-    src/rawmemchr.c
-    src/readlink.c
-    src/realloc.c
-    src/regex.c
-    src/rename.c
-    src/rmdir.c
-    src/secure_getenv.c
-    src/sig-handler.c
-    src/signbitd.c
-    src/signbitf.c
-    src/signbitl.c
-    src/spawn-pipe.c
-    src/stat.c
-    src/stpcpy.c
-    src/strchrnul.c
-    src/strdup.c
-    src/stripslash.c
-    src/tempname.c
-    src/timevar.c
-    src/tmpdir.c
-    src/unistd.c
-    src/unsetenv.c
-    src/vasnprintf.c
-    src/vbitset.c
-    src/verror.c
-    src/version-etc-fsf.c
-    src/version-etc.c
-    src/wait-process.c
-    src/wctype-h.c
-    src/xalloc-die.c
-    src/xasprintf.c
-    src/xconcat-filename.c
-    src/xmalloc.c
-    src/xmalloca.c
-    src/xmemdup0.c
-    src/xprintf.c
-    src/xsize.c
-    src/xstrndup.c
-    src/xvasprintf.c
-)
-
-IF (NOT MUSL)
-    SRCS(
-        src/freadahead.c
-        src/fseterr.c
-        #        src/fseek.c
-    )
-ENDIF()
-
-IF (NOT OS_LINUX)
-    SRCS(
-        src/pipe2.c
-        src/strverscmp.c
-    )
-ENDIF()
-
-IF (NOT OS_WINDOWS)
-    SRCS(
-        src/stdio-write.c
-    )
-ENDIF()
-
-IF (OS_WINDOWS)
-    SRCS(
-        src/frexp.c
-        src/wcrtomb.c
-        src/perror.c
-        src/strstr.c
-        src/mkstemp.c
-        src/vasprintf.c
-        src/strsignal.c
-        src/mkdtemp.c
-        src/fseeko.c
-        src/fopen.c
-        src/ftello.c
-        src/gettimeofday.c
-        src/localeconv.c
-        src/msvc-inval.c
-        src/msvc-nothrow.c
-        src/open.c
-        src/sigaction.c
-        src/sigprocmask.c
-        src/snprintf.c
-        src/spawn_faction_addclose.c
-        src/spawn_faction_adddup2.c
-        src/spawn_faction_addopen.c
-        src/spawn_faction_destroy.c
-        src/spawn_faction_init.c
-        src/spawnattr_destroy.c
-        src/spawnattr_init.c
-        src/spawnattr_setflags.c
-        src/spawnattr_setsigmask.c
-        src/spawni.c
-        src/spawnp.c
-        src/strndup.c
-        src/waitpid.c
-        src/wcwidth.c
-        src/uniwidth/width.c
-    )
-ENDIF()
-
-IF (NOT OS_LINUX OR MUSL)
-    SRCS(
-        src/obstack.c
-        src/obstack_printf.c
-    )
-ENDIF()
-
-IF (OS_CYGWIN OR OS_LINUX)
-    #not need it
-ELSE()
-    SRCS(
-        src/fpending.c
-    )
-ENDIF()
-
-END()
diff --git a/contrib/tools/bison/gnulib/src/abitset.c b/contrib/tools/bison/lib/abitset.c
index f876996bcf..f876996bcf 100644
--- a/contrib/tools/bison/gnulib/src/abitset.c
+++ b/contrib/tools/bison/lib/abitset.c
diff --git a/contrib/tools/bison/gnulib/src/abitset.h b/contrib/tools/bison/lib/abitset.h
index f66122894a..f66122894a 100644
--- a/contrib/tools/bison/gnulib/src/abitset.h
+++ b/contrib/tools/bison/lib/abitset.h
diff --git a/contrib/tools/bison/gnulib/src/argmatch.c b/contrib/tools/bison/lib/argmatch.c
index 9125e2af04..9125e2af04 100644
--- a/contrib/tools/bison/gnulib/src/argmatch.c
+++ b/contrib/tools/bison/lib/argmatch.c
diff --git a/contrib/tools/bison/gnulib/src/argmatch.h b/contrib/tools/bison/lib/argmatch.h
index e4c8027144..e4c8027144 100644
--- a/contrib/tools/bison/gnulib/src/argmatch.h
+++ b/contrib/tools/bison/lib/argmatch.h
diff --git a/contrib/tools/bison/gnulib/src/asnprintf.c b/contrib/tools/bison/lib/asnprintf.c
index 76e228d860..76e228d860 100644
--- a/contrib/tools/bison/gnulib/src/asnprintf.c
+++ b/contrib/tools/bison/lib/asnprintf.c
diff --git a/contrib/tools/bison/gnulib/src/basename-lgpl.c b/contrib/tools/bison/lib/basename-lgpl.c
index 9307e83142..9307e83142 100644
--- a/contrib/tools/bison/gnulib/src/basename-lgpl.c
+++ b/contrib/tools/bison/lib/basename-lgpl.c
diff --git a/contrib/tools/bison/gnulib/src/basename.c b/contrib/tools/bison/lib/basename.c
index d73fd41aa1..d73fd41aa1 100644
--- a/contrib/tools/bison/gnulib/src/basename.c
+++ b/contrib/tools/bison/lib/basename.c
diff --git a/contrib/tools/bison/gnulib/src/bbitset.h b/contrib/tools/bison/lib/bbitset.h
index 443d2da2e8..443d2da2e8 100644
--- a/contrib/tools/bison/gnulib/src/bbitset.h
+++ b/contrib/tools/bison/lib/bbitset.h
diff --git a/contrib/tools/bison/gnulib/src/binary-io.c b/contrib/tools/bison/lib/binary-io.c
index 8bbdb44d12..8bbdb44d12 100644
--- a/contrib/tools/bison/gnulib/src/binary-io.c
+++ b/contrib/tools/bison/lib/binary-io.c
diff --git a/contrib/tools/bison/gnulib/src/binary-io.h b/contrib/tools/bison/lib/binary-io.h
index 423c2ae3ff..423c2ae3ff 100644
--- a/contrib/tools/bison/gnulib/src/binary-io.h
+++ b/contrib/tools/bison/lib/binary-io.h
diff --git a/contrib/tools/bison/gnulib/src/bison-system.h b/contrib/tools/bison/lib/bison-system.h
index 472a1921a7..472a1921a7 100644
--- a/contrib/tools/bison/gnulib/src/bison-system.h
+++ b/contrib/tools/bison/lib/bison-system.h
diff --git a/contrib/tools/bison/gnulib/src/bitrotate.c b/contrib/tools/bison/lib/bitrotate.c
index a8f602889d..a8f602889d 100644
--- a/contrib/tools/bison/gnulib/src/bitrotate.c
+++ b/contrib/tools/bison/lib/bitrotate.c
diff --git a/contrib/tools/bison/gnulib/src/bitrotate.h b/contrib/tools/bison/lib/bitrotate.h
index 9e10a45f43..9e10a45f43 100644
--- a/contrib/tools/bison/gnulib/src/bitrotate.h
+++ b/contrib/tools/bison/lib/bitrotate.h
diff --git a/contrib/tools/bison/gnulib/src/bitset.c b/contrib/tools/bison/lib/bitset.c
index f7a9996afb..f7a9996afb 100644
--- a/contrib/tools/bison/gnulib/src/bitset.c
+++ b/contrib/tools/bison/lib/bitset.c
diff --git a/contrib/tools/bison/gnulib/src/bitset.h b/contrib/tools/bison/lib/bitset.h
index ef44ea4cf8..ef44ea4cf8 100644
--- a/contrib/tools/bison/gnulib/src/bitset.h
+++ b/contrib/tools/bison/lib/bitset.h
diff --git a/contrib/tools/bison/gnulib/src/bitset_stats.c b/contrib/tools/bison/lib/bitset_stats.c
index 8316302616..8316302616 100644
--- a/contrib/tools/bison/gnulib/src/bitset_stats.c
+++ b/contrib/tools/bison/lib/bitset_stats.c
diff --git a/contrib/tools/bison/gnulib/src/bitset_stats.h b/contrib/tools/bison/lib/bitset_stats.h
index d65fcad93c..d65fcad93c 100644
--- a/contrib/tools/bison/gnulib/src/bitset_stats.h
+++ b/contrib/tools/bison/lib/bitset_stats.h
diff --git a/contrib/tools/bison/gnulib/src/bitsetv-print.c b/contrib/tools/bison/lib/bitsetv-print.c
index dd544a9c9e..dd544a9c9e 100644
--- a/contrib/tools/bison/gnulib/src/bitsetv-print.c
+++ b/contrib/tools/bison/lib/bitsetv-print.c
diff --git a/contrib/tools/bison/gnulib/src/bitsetv-print.h b/contrib/tools/bison/lib/bitsetv-print.h
index a7cc8bc106..a7cc8bc106 100644
--- a/contrib/tools/bison/gnulib/src/bitsetv-print.h
+++ b/contrib/tools/bison/lib/bitsetv-print.h
diff --git a/contrib/tools/bison/gnulib/src/bitsetv.c b/contrib/tools/bison/lib/bitsetv.c
index 2bdf1bfa1a..2bdf1bfa1a 100644
--- a/contrib/tools/bison/gnulib/src/bitsetv.c
+++ b/contrib/tools/bison/lib/bitsetv.c
diff --git a/contrib/tools/bison/gnulib/src/bitsetv.h b/contrib/tools/bison/lib/bitsetv.h
index 2472a82a5c..2472a82a5c 100644
--- a/contrib/tools/bison/gnulib/src/bitsetv.h
+++ b/contrib/tools/bison/lib/bitsetv.h
diff --git a/contrib/tools/bison/gnulib/src/c-ctype.c b/contrib/tools/bison/lib/c-ctype.c
index 752d2e32ae..752d2e32ae 100644
--- a/contrib/tools/bison/gnulib/src/c-ctype.c
+++ b/contrib/tools/bison/lib/c-ctype.c
diff --git a/contrib/tools/bison/gnulib/src/c-ctype.h b/contrib/tools/bison/lib/c-ctype.h
index ad589b5c20..ad589b5c20 100644
--- a/contrib/tools/bison/gnulib/src/c-ctype.h
+++ b/contrib/tools/bison/lib/c-ctype.h
diff --git a/contrib/tools/bison/gnulib/src/c-stack.c b/contrib/tools/bison/lib/c-stack.c
index 52e46f83de..52e46f83de 100644
--- a/contrib/tools/bison/gnulib/src/c-stack.c
+++ b/contrib/tools/bison/lib/c-stack.c
diff --git a/contrib/tools/bison/gnulib/src/c-stack.h b/contrib/tools/bison/lib/c-stack.h
index 2e61bdf01d..2e61bdf01d 100644
--- a/contrib/tools/bison/gnulib/src/c-stack.h
+++ b/contrib/tools/bison/lib/c-stack.h
diff --git a/contrib/tools/bison/gnulib/src/c-strcase.h b/contrib/tools/bison/lib/c-strcase.h
index 49e1bb03dd..49e1bb03dd 100644
--- a/contrib/tools/bison/gnulib/src/c-strcase.h
+++ b/contrib/tools/bison/lib/c-strcase.h
diff --git a/contrib/tools/bison/gnulib/src/c-strcasecmp.c b/contrib/tools/bison/lib/c-strcasecmp.c
index cd4e4d49cb..cd4e4d49cb 100644
--- a/contrib/tools/bison/gnulib/src/c-strcasecmp.c
+++ b/contrib/tools/bison/lib/c-strcasecmp.c
diff --git a/contrib/tools/bison/gnulib/src/c-strcaseeq.h b/contrib/tools/bison/lib/c-strcaseeq.h
index afdea26ba9..afdea26ba9 100644
--- a/contrib/tools/bison/gnulib/src/c-strcaseeq.h
+++ b/contrib/tools/bison/lib/c-strcaseeq.h
diff --git a/contrib/tools/bison/gnulib/src/c-strncasecmp.c b/contrib/tools/bison/lib/c-strncasecmp.c
index 053c70a73a..053c70a73a 100644
--- a/contrib/tools/bison/gnulib/src/c-strncasecmp.c
+++ b/contrib/tools/bison/lib/c-strncasecmp.c
diff --git a/contrib/tools/bison/gnulib/src/calloc.c b/contrib/tools/bison/lib/calloc.c
index 475d0aeab9..475d0aeab9 100644
--- a/contrib/tools/bison/gnulib/src/calloc.c
+++ b/contrib/tools/bison/lib/calloc.c
diff --git a/contrib/tools/bison/gnulib/src/clean-temp.c b/contrib/tools/bison/lib/clean-temp.c
index 2961114168..2961114168 100644
--- a/contrib/tools/bison/gnulib/src/clean-temp.c
+++ b/contrib/tools/bison/lib/clean-temp.c
diff --git a/contrib/tools/bison/gnulib/src/clean-temp.h b/contrib/tools/bison/lib/clean-temp.h
index 24aeca83eb..24aeca83eb 100644
--- a/contrib/tools/bison/gnulib/src/clean-temp.h
+++ b/contrib/tools/bison/lib/clean-temp.h
diff --git a/contrib/tools/bison/gnulib/src/cloexec.c b/contrib/tools/bison/lib/cloexec.c
index e3e42d2855..e3e42d2855 100644
--- a/contrib/tools/bison/gnulib/src/cloexec.c
+++ b/contrib/tools/bison/lib/cloexec.c
diff --git a/contrib/tools/bison/gnulib/src/cloexec.h b/contrib/tools/bison/lib/cloexec.h
index 0c5935ba56..0c5935ba56 100644
--- a/contrib/tools/bison/gnulib/src/cloexec.h
+++ b/contrib/tools/bison/lib/cloexec.h
diff --git a/contrib/tools/bison/gnulib/src/close-stream.c b/contrib/tools/bison/lib/close-stream.c
index d6a869287e..d6a869287e 100644
--- a/contrib/tools/bison/gnulib/src/close-stream.c
+++ b/contrib/tools/bison/lib/close-stream.c
diff --git a/contrib/tools/bison/gnulib/src/close-stream.h b/contrib/tools/bison/lib/close-stream.h
index be3d4196b0..be3d4196b0 100644
--- a/contrib/tools/bison/gnulib/src/close-stream.h
+++ b/contrib/tools/bison/lib/close-stream.h
diff --git a/contrib/tools/bison/gnulib/src/close.c b/contrib/tools/bison/lib/close.c
index f620e54bba..f620e54bba 100644
--- a/contrib/tools/bison/gnulib/src/close.c
+++ b/contrib/tools/bison/lib/close.c
diff --git a/contrib/tools/bison/gnulib/src/closein.c b/contrib/tools/bison/lib/closein.c
index c9bf73781f..c9bf73781f 100644
--- a/contrib/tools/bison/gnulib/src/closein.c
+++ b/contrib/tools/bison/lib/closein.c
diff --git a/contrib/tools/bison/gnulib/src/closein.h b/contrib/tools/bison/lib/closein.h
index 84bbeefceb..84bbeefceb 100644
--- a/contrib/tools/bison/gnulib/src/closein.h
+++ b/contrib/tools/bison/lib/closein.h
diff --git a/contrib/tools/bison/gnulib/src/closeout.c b/contrib/tools/bison/lib/closeout.c
index d4d3edca4e..d4d3edca4e 100644
--- a/contrib/tools/bison/gnulib/src/closeout.c
+++ b/contrib/tools/bison/lib/closeout.c
diff --git a/contrib/tools/bison/gnulib/src/closeout.h b/contrib/tools/bison/lib/closeout.h
index 131fe864ec..131fe864ec 100644
--- a/contrib/tools/bison/gnulib/src/closeout.h
+++ b/contrib/tools/bison/lib/closeout.h
diff --git a/contrib/tools/bison/gnulib/src/concat-filename.c b/contrib/tools/bison/lib/concat-filename.c
index b749d6838b..b749d6838b 100644
--- a/contrib/tools/bison/gnulib/src/concat-filename.c
+++ b/contrib/tools/bison/lib/concat-filename.c
diff --git a/contrib/tools/bison/gnulib/src/concat-filename.h b/contrib/tools/bison/lib/concat-filename.h
index 898dcee2d6..898dcee2d6 100644
--- a/contrib/tools/bison/gnulib/src/concat-filename.h
+++ b/contrib/tools/bison/lib/concat-filename.h
diff --git a/contrib/tools/bison/gnulib/src/dirname-lgpl.c b/contrib/tools/bison/lib/dirname-lgpl.c
index 82f66301f2..82f66301f2 100644
--- a/contrib/tools/bison/gnulib/src/dirname-lgpl.c
+++ b/contrib/tools/bison/lib/dirname-lgpl.c
diff --git a/contrib/tools/bison/gnulib/src/dirname.c b/contrib/tools/bison/lib/dirname.c
index 1fb65888bb..1fb65888bb 100644
--- a/contrib/tools/bison/gnulib/src/dirname.c
+++ b/contrib/tools/bison/lib/dirname.c
diff --git a/contrib/tools/bison/gnulib/src/dirname.h b/contrib/tools/bison/lib/dirname.h
index 4ad0312008..4ad0312008 100644
--- a/contrib/tools/bison/gnulib/src/dirname.h
+++ b/contrib/tools/bison/lib/dirname.h
diff --git a/contrib/tools/bison/gnulib/src/dosname.h b/contrib/tools/bison/lib/dosname.h
index ba63ce4bd3..ba63ce4bd3 100644
--- a/contrib/tools/bison/gnulib/src/dosname.h
+++ b/contrib/tools/bison/lib/dosname.h
diff --git a/contrib/tools/bison/gnulib/src/dup-safer-flag.c b/contrib/tools/bison/lib/dup-safer-flag.c
index 8a09821dc8..8a09821dc8 100644
--- a/contrib/tools/bison/gnulib/src/dup-safer-flag.c
+++ b/contrib/tools/bison/lib/dup-safer-flag.c
diff --git a/contrib/tools/bison/gnulib/src/dup-safer.c b/contrib/tools/bison/lib/dup-safer.c
index c20310785a..c20310785a 100644
--- a/contrib/tools/bison/gnulib/src/dup-safer.c
+++ b/contrib/tools/bison/lib/dup-safer.c
diff --git a/contrib/tools/bison/gnulib/src/dup2.c b/contrib/tools/bison/lib/dup2.c
index 9219eb3823..9219eb3823 100644
--- a/contrib/tools/bison/gnulib/src/dup2.c
+++ b/contrib/tools/bison/lib/dup2.c
diff --git a/contrib/tools/bison/gnulib/src/ebitset.c b/contrib/tools/bison/lib/ebitset.c
index e5d6c9239b..e5d6c9239b 100644
--- a/contrib/tools/bison/gnulib/src/ebitset.c
+++ b/contrib/tools/bison/lib/ebitset.c
diff --git a/contrib/tools/bison/gnulib/src/ebitset.h b/contrib/tools/bison/lib/ebitset.h
index d31bda7d50..d31bda7d50 100644
--- a/contrib/tools/bison/gnulib/src/ebitset.h
+++ b/contrib/tools/bison/lib/ebitset.h
diff --git a/contrib/tools/bison/gnulib/src/error.c b/contrib/tools/bison/lib/error.c
index 3078dd1b51..3078dd1b51 100644
--- a/contrib/tools/bison/gnulib/src/error.c
+++ b/contrib/tools/bison/lib/error.c
diff --git a/contrib/tools/bison/gnulib/src/error.h b/contrib/tools/bison/lib/error.h
index afcb0e10c8..afcb0e10c8 100644
--- a/contrib/tools/bison/gnulib/src/error.h
+++ b/contrib/tools/bison/lib/error.h
diff --git a/contrib/tools/bison/gnulib/src/execute.c b/contrib/tools/bison/lib/execute.c
index 1bb577100e..1bb577100e 100644
--- a/contrib/tools/bison/gnulib/src/execute.c
+++ b/contrib/tools/bison/lib/execute.c
diff --git a/contrib/tools/bison/gnulib/src/execute.h b/contrib/tools/bison/lib/execute.h
index 1fdc2abbad..1fdc2abbad 100644
--- a/contrib/tools/bison/gnulib/src/execute.h
+++ b/contrib/tools/bison/lib/execute.h
diff --git a/contrib/tools/bison/gnulib/src/exitfail.c b/contrib/tools/bison/lib/exitfail.c
index b0b4ebe45a..b0b4ebe45a 100644
--- a/contrib/tools/bison/gnulib/src/exitfail.c
+++ b/contrib/tools/bison/lib/exitfail.c
diff --git a/contrib/tools/bison/gnulib/src/exitfail.h b/contrib/tools/bison/lib/exitfail.h
index e54333bdd2..e54333bdd2 100644
--- a/contrib/tools/bison/gnulib/src/exitfail.h
+++ b/contrib/tools/bison/lib/exitfail.h
diff --git a/contrib/tools/bison/gnulib/src/fatal-signal.c b/contrib/tools/bison/lib/fatal-signal.c
index 8f7cb8ea3b..8f7cb8ea3b 100644
--- a/contrib/tools/bison/gnulib/src/fatal-signal.c
+++ b/contrib/tools/bison/lib/fatal-signal.c
diff --git a/contrib/tools/bison/gnulib/src/fatal-signal.h b/contrib/tools/bison/lib/fatal-signal.h
index f5df78a048..f5df78a048 100644
--- a/contrib/tools/bison/gnulib/src/fatal-signal.h
+++ b/contrib/tools/bison/lib/fatal-signal.h
diff --git a/contrib/tools/bison/gnulib/src/fclose.c b/contrib/tools/bison/lib/fclose.c
index 90ed653a0e..90ed653a0e 100644
--- a/contrib/tools/bison/gnulib/src/fclose.c
+++ b/contrib/tools/bison/lib/fclose.c
diff --git a/contrib/tools/bison/gnulib/src/fcntl.c b/contrib/tools/bison/lib/fcntl.c
index 735fa66f4d..735fa66f4d 100644
--- a/contrib/tools/bison/gnulib/src/fcntl.c
+++ b/contrib/tools/bison/lib/fcntl.c
diff --git a/contrib/tools/bison/gnulib/src/fd-hook.c b/contrib/tools/bison/lib/fd-hook.c
index e158a52aa3..e158a52aa3 100644
--- a/contrib/tools/bison/gnulib/src/fd-hook.c
+++ b/contrib/tools/bison/lib/fd-hook.c
diff --git a/contrib/tools/bison/gnulib/src/fd-hook.h b/contrib/tools/bison/lib/fd-hook.h
index d15b577114..d15b577114 100644
--- a/contrib/tools/bison/gnulib/src/fd-hook.h
+++ b/contrib/tools/bison/lib/fd-hook.h
diff --git a/contrib/tools/bison/gnulib/src/fd-safer-flag.c b/contrib/tools/bison/lib/fd-safer-flag.c
index 8bc14bda2c..8bc14bda2c 100644
--- a/contrib/tools/bison/gnulib/src/fd-safer-flag.c
+++ b/contrib/tools/bison/lib/fd-safer-flag.c
diff --git a/contrib/tools/bison/gnulib/src/fd-safer.c b/contrib/tools/bison/lib/fd-safer.c
index 8ded8886a5..8ded8886a5 100644
--- a/contrib/tools/bison/gnulib/src/fd-safer.c
+++ b/contrib/tools/bison/lib/fd-safer.c
diff --git a/contrib/tools/bison/gnulib/src/fflush.c b/contrib/tools/bison/lib/fflush.c
index c182ac1fa4..c182ac1fa4 100644
--- a/contrib/tools/bison/gnulib/src/fflush.c
+++ b/contrib/tools/bison/lib/fflush.c
diff --git a/contrib/tools/bison/gnulib/src/filename.h b/contrib/tools/bison/lib/filename.h
index b82a0ac389..b82a0ac389 100644
--- a/contrib/tools/bison/gnulib/src/filename.h
+++ b/contrib/tools/bison/lib/filename.h
diff --git a/contrib/tools/bison/gnulib/src/filenamecat-lgpl.c b/contrib/tools/bison/lib/filenamecat-lgpl.c
index 60c4988b4d..60c4988b4d 100644
--- a/contrib/tools/bison/gnulib/src/filenamecat-lgpl.c
+++ b/contrib/tools/bison/lib/filenamecat-lgpl.c
diff --git a/contrib/tools/bison/gnulib/src/filenamecat.c b/contrib/tools/bison/lib/filenamecat.c
index 8809b571f5..8809b571f5 100644
--- a/contrib/tools/bison/gnulib/src/filenamecat.c
+++ b/contrib/tools/bison/lib/filenamecat.c
diff --git a/contrib/tools/bison/gnulib/src/filenamecat.h b/contrib/tools/bison/lib/filenamecat.h
index 1476e14c74..1476e14c74 100644
--- a/contrib/tools/bison/gnulib/src/filenamecat.h
+++ b/contrib/tools/bison/lib/filenamecat.h
diff --git a/contrib/tools/bison/gnulib/src/float+.h b/contrib/tools/bison/lib/float+.h
index 32fb790bb5..32fb790bb5 100644
--- a/contrib/tools/bison/gnulib/src/float+.h
+++ b/contrib/tools/bison/lib/float+.h
diff --git a/contrib/tools/bison/gnulib/src/float.c b/contrib/tools/bison/lib/float.c
index 366945fa38..366945fa38 100644
--- a/contrib/tools/bison/gnulib/src/float.c
+++ b/contrib/tools/bison/lib/float.c
diff --git a/contrib/tools/bison/gnulib/src/fopen-safer.c b/contrib/tools/bison/lib/fopen-safer.c
index 917920d904..917920d904 100644
--- a/contrib/tools/bison/gnulib/src/fopen-safer.c
+++ b/contrib/tools/bison/lib/fopen-safer.c
diff --git a/contrib/tools/bison/gnulib/src/fopen.c b/contrib/tools/bison/lib/fopen.c
index f9d6763d21..f9d6763d21 100644
--- a/contrib/tools/bison/gnulib/src/fopen.c
+++ b/contrib/tools/bison/lib/fopen.c
diff --git a/contrib/tools/bison/gnulib/src/fpending.c b/contrib/tools/bison/lib/fpending.c
index 1bc4568923..1bc4568923 100644
--- a/contrib/tools/bison/gnulib/src/fpending.c
+++ b/contrib/tools/bison/lib/fpending.c
diff --git a/contrib/tools/bison/gnulib/src/fpending.h b/contrib/tools/bison/lib/fpending.h
index 4eca3f18e1..4eca3f18e1 100644
--- a/contrib/tools/bison/gnulib/src/fpending.h
+++ b/contrib/tools/bison/lib/fpending.h
diff --git a/contrib/tools/bison/gnulib/src/fpucw.h b/contrib/tools/bison/lib/fpucw.h
index 0b7f5284a1..0b7f5284a1 100644
--- a/contrib/tools/bison/gnulib/src/fpucw.h
+++ b/contrib/tools/bison/lib/fpucw.h
diff --git a/contrib/tools/bison/gnulib/src/fpurge.c b/contrib/tools/bison/lib/fpurge.c
index 09c9ea82c7..09c9ea82c7 100644
--- a/contrib/tools/bison/gnulib/src/fpurge.c
+++ b/contrib/tools/bison/lib/fpurge.c
diff --git a/contrib/tools/bison/gnulib/src/freadahead.c b/contrib/tools/bison/lib/freadahead.c
index ae24e3b8a3..ae24e3b8a3 100644
--- a/contrib/tools/bison/gnulib/src/freadahead.c
+++ b/contrib/tools/bison/lib/freadahead.c
diff --git a/contrib/tools/bison/gnulib/src/freadahead.h b/contrib/tools/bison/lib/freadahead.h
index c691f89c0f..c691f89c0f 100644
--- a/contrib/tools/bison/gnulib/src/freadahead.h
+++ b/contrib/tools/bison/lib/freadahead.h
diff --git a/contrib/tools/bison/gnulib/src/freading.c b/contrib/tools/bison/lib/freading.c
index c2ffd93735..c2ffd93735 100644
--- a/contrib/tools/bison/gnulib/src/freading.c
+++ b/contrib/tools/bison/lib/freading.c
diff --git a/contrib/tools/bison/gnulib/src/freading.h b/contrib/tools/bison/lib/freading.h
index 88ea789ea4..88ea789ea4 100644
--- a/contrib/tools/bison/gnulib/src/freading.h
+++ b/contrib/tools/bison/lib/freading.h
diff --git a/contrib/tools/bison/gnulib/src/frexp.c b/contrib/tools/bison/lib/frexp.c
index d847fa38b3..d847fa38b3 100644
--- a/contrib/tools/bison/gnulib/src/frexp.c
+++ b/contrib/tools/bison/lib/frexp.c
diff --git a/contrib/tools/bison/gnulib/src/fseeko.c b/contrib/tools/bison/lib/fseeko.c
index 0c326592b9..0c326592b9 100644
--- a/contrib/tools/bison/gnulib/src/fseeko.c
+++ b/contrib/tools/bison/lib/fseeko.c
diff --git a/contrib/tools/bison/gnulib/src/fseterr.c b/contrib/tools/bison/lib/fseterr.c
index f2191b6923..f2191b6923 100644
--- a/contrib/tools/bison/gnulib/src/fseterr.c
+++ b/contrib/tools/bison/lib/fseterr.c
diff --git a/contrib/tools/bison/gnulib/src/fseterr.h b/contrib/tools/bison/lib/fseterr.h
index 630fa8647f..630fa8647f 100644
--- a/contrib/tools/bison/gnulib/src/fseterr.h
+++ b/contrib/tools/bison/lib/fseterr.h
diff --git a/contrib/tools/bison/gnulib/src/fstat.c b/contrib/tools/bison/lib/fstat.c
index dc802f502b..dc802f502b 100644
--- a/contrib/tools/bison/gnulib/src/fstat.c
+++ b/contrib/tools/bison/lib/fstat.c
diff --git a/contrib/tools/bison/gnulib/src/ftello.c b/contrib/tools/bison/lib/ftello.c
index 3a2a0f2012..3a2a0f2012 100644
--- a/contrib/tools/bison/gnulib/src/ftello.c
+++ b/contrib/tools/bison/lib/ftello.c
diff --git a/contrib/tools/bison/gnulib/src/get-errno.c b/contrib/tools/bison/lib/get-errno.c
index 7865212cc7..7865212cc7 100644
--- a/contrib/tools/bison/gnulib/src/get-errno.c
+++ b/contrib/tools/bison/lib/get-errno.c
diff --git a/contrib/tools/bison/gnulib/src/get-errno.h b/contrib/tools/bison/lib/get-errno.h
index 04b3d4c8de..04b3d4c8de 100644
--- a/contrib/tools/bison/gnulib/src/get-errno.h
+++ b/contrib/tools/bison/lib/get-errno.h
diff --git a/contrib/tools/bison/gnulib/src/getdtablesize.c b/contrib/tools/bison/lib/getdtablesize.c
index 212b3c0f96..212b3c0f96 100644
--- a/contrib/tools/bison/gnulib/src/getdtablesize.c
+++ b/contrib/tools/bison/lib/getdtablesize.c
diff --git a/contrib/tools/bison/gnulib/src/getopt.c b/contrib/tools/bison/lib/getopt.c
index 4b3d267067..4b3d267067 100644
--- a/contrib/tools/bison/gnulib/src/getopt.c
+++ b/contrib/tools/bison/lib/getopt.c
diff --git a/contrib/tools/bison/gnulib/src/getopt1.c b/contrib/tools/bison/lib/getopt1.c
index 55a6b4eae4..55a6b4eae4 100644
--- a/contrib/tools/bison/gnulib/src/getopt1.c
+++ b/contrib/tools/bison/lib/getopt1.c
diff --git a/contrib/tools/bison/gnulib/src/getopt_int.h b/contrib/tools/bison/lib/getopt_int.h
index a6e4b9ea71..a6e4b9ea71 100644
--- a/contrib/tools/bison/gnulib/src/getopt_int.h
+++ b/contrib/tools/bison/lib/getopt_int.h
diff --git a/contrib/tools/bison/gnulib/src/gettext.h b/contrib/tools/bison/lib/gettext.h
index d0215715a9..d0215715a9 100644
--- a/contrib/tools/bison/gnulib/src/gettext.h
+++ b/contrib/tools/bison/lib/gettext.h
diff --git a/contrib/tools/bison/gnulib/src/gettimeofday.c b/contrib/tools/bison/lib/gettimeofday.c
index ad65c6da8b..ad65c6da8b 100644
--- a/contrib/tools/bison/gnulib/src/gettimeofday.c
+++ b/contrib/tools/bison/lib/gettimeofday.c
diff --git a/contrib/tools/bison/gnulib/src/gl_anyhash_list1.h b/contrib/tools/bison/lib/gl_anyhash_list1.h
index 57ead45073..57ead45073 100644
--- a/contrib/tools/bison/gnulib/src/gl_anyhash_list1.h
+++ b/contrib/tools/bison/lib/gl_anyhash_list1.h
diff --git a/contrib/tools/bison/gnulib/src/gl_anyhash_list2.h b/contrib/tools/bison/lib/gl_anyhash_list2.h
index 3791ae2432..3791ae2432 100644
--- a/contrib/tools/bison/gnulib/src/gl_anyhash_list2.h
+++ b/contrib/tools/bison/lib/gl_anyhash_list2.h
diff --git a/contrib/tools/bison/gnulib/src/gl_anylinked_list1.h b/contrib/tools/bison/lib/gl_anylinked_list1.h
index c8879f0f68..c8879f0f68 100644
--- a/contrib/tools/bison/gnulib/src/gl_anylinked_list1.h
+++ b/contrib/tools/bison/lib/gl_anylinked_list1.h
diff --git a/contrib/tools/bison/gnulib/src/gl_anylinked_list2.h b/contrib/tools/bison/lib/gl_anylinked_list2.h
index 45ca7c829a..45ca7c829a 100644
--- a/contrib/tools/bison/gnulib/src/gl_anylinked_list2.h
+++ b/contrib/tools/bison/lib/gl_anylinked_list2.h
diff --git a/contrib/tools/bison/gnulib/src/gl_anytree_oset.h b/contrib/tools/bison/lib/gl_anytree_oset.h
index e1f90a99a2..e1f90a99a2 100644
--- a/contrib/tools/bison/gnulib/src/gl_anytree_oset.h
+++ b/contrib/tools/bison/lib/gl_anytree_oset.h
diff --git a/contrib/tools/bison/gnulib/src/gl_avltree_oset.c b/contrib/tools/bison/lib/gl_avltree_oset.c
index 09202ae0cc..09202ae0cc 100644
--- a/contrib/tools/bison/gnulib/src/gl_avltree_oset.c
+++ b/contrib/tools/bison/lib/gl_avltree_oset.c
diff --git a/contrib/tools/bison/gnulib/src/gl_avltree_oset.h b/contrib/tools/bison/lib/gl_avltree_oset.h
index abac895f08..abac895f08 100644
--- a/contrib/tools/bison/gnulib/src/gl_avltree_oset.h
+++ b/contrib/tools/bison/lib/gl_avltree_oset.h
diff --git a/contrib/tools/bison/gnulib/src/gl_linkedhash_list.c b/contrib/tools/bison/lib/gl_linkedhash_list.c
index 2f4e05f3a7..2f4e05f3a7 100644
--- a/contrib/tools/bison/gnulib/src/gl_linkedhash_list.c
+++ b/contrib/tools/bison/lib/gl_linkedhash_list.c
diff --git a/contrib/tools/bison/gnulib/src/gl_linkedhash_list.h b/contrib/tools/bison/lib/gl_linkedhash_list.h
index 577756c9d4..577756c9d4 100644
--- a/contrib/tools/bison/gnulib/src/gl_linkedhash_list.h
+++ b/contrib/tools/bison/lib/gl_linkedhash_list.h
diff --git a/contrib/tools/bison/gnulib/src/gl_list.c b/contrib/tools/bison/lib/gl_list.c
index 8793298070..8793298070 100644
--- a/contrib/tools/bison/gnulib/src/gl_list.c
+++ b/contrib/tools/bison/lib/gl_list.c
diff --git a/contrib/tools/bison/gnulib/src/gl_list.h b/contrib/tools/bison/lib/gl_list.h
index 9094723fe5..9094723fe5 100644
--- a/contrib/tools/bison/gnulib/src/gl_list.h
+++ b/contrib/tools/bison/lib/gl_list.h
diff --git a/contrib/tools/bison/gnulib/src/gl_oset.c b/contrib/tools/bison/lib/gl_oset.c
index 21f731a31a..21f731a31a 100644
--- a/contrib/tools/bison/gnulib/src/gl_oset.c
+++ b/contrib/tools/bison/lib/gl_oset.c
diff --git a/contrib/tools/bison/gnulib/src/gl_oset.h b/contrib/tools/bison/lib/gl_oset.h
index 5134065e5e..5134065e5e 100644
--- a/contrib/tools/bison/gnulib/src/gl_oset.h
+++ b/contrib/tools/bison/lib/gl_oset.h
diff --git a/contrib/tools/bison/gnulib/src/gl_xlist.c b/contrib/tools/bison/lib/gl_xlist.c
index fe3c893396..fe3c893396 100644
--- a/contrib/tools/bison/gnulib/src/gl_xlist.c
+++ b/contrib/tools/bison/lib/gl_xlist.c
diff --git a/contrib/tools/bison/gnulib/src/gl_xlist.h b/contrib/tools/bison/lib/gl_xlist.h
index 1c9451c1ab..1c9451c1ab 100644
--- a/contrib/tools/bison/gnulib/src/gl_xlist.h
+++ b/contrib/tools/bison/lib/gl_xlist.h
diff --git a/contrib/tools/bison/gnulib/src/gl_xoset.c b/contrib/tools/bison/lib/gl_xoset.c
index 6b05d94996..6b05d94996 100644
--- a/contrib/tools/bison/gnulib/src/gl_xoset.c
+++ b/contrib/tools/bison/lib/gl_xoset.c
diff --git a/contrib/tools/bison/gnulib/src/gl_xoset.h b/contrib/tools/bison/lib/gl_xoset.h
index b30b2ced83..b30b2ced83 100644
--- a/contrib/tools/bison/gnulib/src/gl_xoset.h
+++ b/contrib/tools/bison/lib/gl_xoset.h
diff --git a/contrib/tools/bison/gnulib/src/glthread/lock.h b/contrib/tools/bison/lib/glthread/lock.h
index 42228df80f..42228df80f 100644
--- a/contrib/tools/bison/gnulib/src/glthread/lock.h
+++ b/contrib/tools/bison/lib/glthread/lock.h
diff --git a/contrib/tools/bison/gnulib/src/glthread/tls.h b/contrib/tools/bison/lib/glthread/tls.h
index 2afe0b43c3..2afe0b43c3 100644
--- a/contrib/tools/bison/gnulib/src/glthread/tls.h
+++ b/contrib/tools/bison/lib/glthread/tls.h
diff --git a/contrib/tools/bison/gnulib/src/hash.c b/contrib/tools/bison/lib/hash.c
index 685928ec0c..685928ec0c 100644
--- a/contrib/tools/bison/gnulib/src/hash.c
+++ b/contrib/tools/bison/lib/hash.c
diff --git a/contrib/tools/bison/gnulib/src/hash.h b/contrib/tools/bison/lib/hash.h
index bcd0d1d96b..bcd0d1d96b 100644
--- a/contrib/tools/bison/gnulib/src/hash.h
+++ b/contrib/tools/bison/lib/hash.h
diff --git a/contrib/tools/bison/gnulib/src/ignore-value.h b/contrib/tools/bison/lib/ignore-value.h
index ebd6bf42f5..ebd6bf42f5 100644
--- a/contrib/tools/bison/gnulib/src/ignore-value.h
+++ b/contrib/tools/bison/lib/ignore-value.h
diff --git a/contrib/tools/bison/gnulib/src/isnan.c b/contrib/tools/bison/lib/isnan.c
index d95e4bac77..d95e4bac77 100644
--- a/contrib/tools/bison/gnulib/src/isnan.c
+++ b/contrib/tools/bison/lib/isnan.c
diff --git a/contrib/tools/bison/gnulib/src/isnand-nolibm.h b/contrib/tools/bison/lib/isnand-nolibm.h
index 8a84ff8140..8a84ff8140 100644
--- a/contrib/tools/bison/gnulib/src/isnand-nolibm.h
+++ b/contrib/tools/bison/lib/isnand-nolibm.h
diff --git a/contrib/tools/bison/gnulib/src/isnand.c b/contrib/tools/bison/lib/isnand.c
index cbad17b583..cbad17b583 100644
--- a/contrib/tools/bison/gnulib/src/isnand.c
+++ b/contrib/tools/bison/lib/isnand.c
diff --git a/contrib/tools/bison/gnulib/src/isnanf-nolibm.h b/contrib/tools/bison/lib/isnanf-nolibm.h
index 804c65f06c..804c65f06c 100644
--- a/contrib/tools/bison/gnulib/src/isnanf-nolibm.h
+++ b/contrib/tools/bison/lib/isnanf-nolibm.h
diff --git a/contrib/tools/bison/gnulib/src/isnanf.c b/contrib/tools/bison/lib/isnanf.c
index 946cb69ce0..946cb69ce0 100644
--- a/contrib/tools/bison/gnulib/src/isnanf.c
+++ b/contrib/tools/bison/lib/isnanf.c
diff --git a/contrib/tools/bison/gnulib/src/isnanl-nolibm.h b/contrib/tools/bison/lib/isnanl-nolibm.h
index a011374da7..a011374da7 100644
--- a/contrib/tools/bison/gnulib/src/isnanl-nolibm.h
+++ b/contrib/tools/bison/lib/isnanl-nolibm.h
diff --git a/contrib/tools/bison/gnulib/src/isnanl.c b/contrib/tools/bison/lib/isnanl.c
index 9d9d84b974..9d9d84b974 100644
--- a/contrib/tools/bison/gnulib/src/isnanl.c
+++ b/contrib/tools/bison/lib/isnanl.c
diff --git a/contrib/tools/bison/gnulib/src/itold.c b/contrib/tools/bison/lib/itold.c
index 9aabc7e464..9aabc7e464 100644
--- a/contrib/tools/bison/gnulib/src/itold.c
+++ b/contrib/tools/bison/lib/itold.c
diff --git a/contrib/tools/bison/gnulib/src/lbitset.c b/contrib/tools/bison/lib/lbitset.c
index 7a638c6f9b..7a638c6f9b 100644
--- a/contrib/tools/bison/gnulib/src/lbitset.c
+++ b/contrib/tools/bison/lib/lbitset.c
diff --git a/contrib/tools/bison/gnulib/src/lbitset.h b/contrib/tools/bison/lib/lbitset.h
index 8ccaca74da..8ccaca74da 100644
--- a/contrib/tools/bison/gnulib/src/lbitset.h
+++ b/contrib/tools/bison/lib/lbitset.h
diff --git a/contrib/tools/bison/gnulib/src/libiberty.h b/contrib/tools/bison/lib/libiberty.h
index ec1467c59b..ec1467c59b 100644
--- a/contrib/tools/bison/gnulib/src/libiberty.h
+++ b/contrib/tools/bison/lib/libiberty.h
diff --git a/contrib/tools/bison/gnulib/src/localcharset.c b/contrib/tools/bison/lib/localcharset.c
index 2c31399da5..2c31399da5 100644
--- a/contrib/tools/bison/gnulib/src/localcharset.c
+++ b/contrib/tools/bison/lib/localcharset.c
diff --git a/contrib/tools/bison/gnulib/src/localcharset.h b/contrib/tools/bison/lib/localcharset.h
index c209829867..c209829867 100644
--- a/contrib/tools/bison/gnulib/src/localcharset.h
+++ b/contrib/tools/bison/lib/localcharset.h
diff --git a/contrib/tools/bison/gnulib/src/localeconv.c b/contrib/tools/bison/lib/localeconv.c
index 7c7c77cfd4..7c7c77cfd4 100644
--- a/contrib/tools/bison/gnulib/src/localeconv.c
+++ b/contrib/tools/bison/lib/localeconv.c
diff --git a/contrib/tools/bison/gnulib/src/lseek.c b/contrib/tools/bison/lib/lseek.c
index fa7440d151..fa7440d151 100644
--- a/contrib/tools/bison/gnulib/src/lseek.c
+++ b/contrib/tools/bison/lib/lseek.c
diff --git a/contrib/tools/bison/gnulib/src/lstat.c b/contrib/tools/bison/lib/lstat.c
index 1a613a89c8..1a613a89c8 100644
--- a/contrib/tools/bison/gnulib/src/lstat.c
+++ b/contrib/tools/bison/lib/lstat.c
diff --git a/contrib/tools/bison/gnulib/src/malloc.c b/contrib/tools/bison/lib/malloc.c
index 908735d278..908735d278 100644
--- a/contrib/tools/bison/gnulib/src/malloc.c
+++ b/contrib/tools/bison/lib/malloc.c
diff --git a/contrib/tools/bison/gnulib/src/malloca.c b/contrib/tools/bison/lib/malloca.c
index 311be569bc..311be569bc 100644
--- a/contrib/tools/bison/gnulib/src/malloca.c
+++ b/contrib/tools/bison/lib/malloca.c
diff --git a/contrib/tools/bison/gnulib/src/malloca.h b/contrib/tools/bison/lib/malloca.h
index 8ec4465dc7..8ec4465dc7 100644
--- a/contrib/tools/bison/gnulib/src/malloca.h
+++ b/contrib/tools/bison/lib/malloca.h
diff --git a/contrib/tools/bison/gnulib/src/mbrtowc.c b/contrib/tools/bison/lib/mbrtowc.c
index 5ee44aea48..5ee44aea48 100644
--- a/contrib/tools/bison/gnulib/src/mbrtowc.c
+++ b/contrib/tools/bison/lib/mbrtowc.c
diff --git a/contrib/tools/bison/gnulib/src/mbswidth.c b/contrib/tools/bison/lib/mbswidth.c
index 6571037592..6571037592 100644
--- a/contrib/tools/bison/gnulib/src/mbswidth.c
+++ b/contrib/tools/bison/lib/mbswidth.c
diff --git a/contrib/tools/bison/gnulib/src/mbswidth.h b/contrib/tools/bison/lib/mbswidth.h
index e9c0b03938..e9c0b03938 100644
--- a/contrib/tools/bison/gnulib/src/mbswidth.h
+++ b/contrib/tools/bison/lib/mbswidth.h
diff --git a/contrib/tools/bison/gnulib/src/memchr2.c b/contrib/tools/bison/lib/memchr2.c
index 8b105b7f27..8b105b7f27 100644
--- a/contrib/tools/bison/gnulib/src/memchr2.c
+++ b/contrib/tools/bison/lib/memchr2.c
diff --git a/contrib/tools/bison/gnulib/src/memchr2.h b/contrib/tools/bison/lib/memchr2.h
index cc04889f12..cc04889f12 100644
--- a/contrib/tools/bison/gnulib/src/memchr2.h
+++ b/contrib/tools/bison/lib/memchr2.h
diff --git a/contrib/tools/bison/gnulib/src/mkdtemp.c b/contrib/tools/bison/lib/mkdtemp.c
index 6ba8b65d52..6ba8b65d52 100644
--- a/contrib/tools/bison/gnulib/src/mkdtemp.c
+++ b/contrib/tools/bison/lib/mkdtemp.c
diff --git a/contrib/tools/bison/gnulib/src/mkstemp-safer.c b/contrib/tools/bison/lib/mkstemp-safer.c
index 9ddf86fb60..9ddf86fb60 100644
--- a/contrib/tools/bison/gnulib/src/mkstemp-safer.c
+++ b/contrib/tools/bison/lib/mkstemp-safer.c
diff --git a/contrib/tools/bison/gnulib/src/mkstemp.c b/contrib/tools/bison/lib/mkstemp.c
index 7a9af6c8cc..7a9af6c8cc 100644
--- a/contrib/tools/bison/gnulib/src/mkstemp.c
+++ b/contrib/tools/bison/lib/mkstemp.c
diff --git a/contrib/tools/bison/gnulib/src/msvc-inval.c b/contrib/tools/bison/lib/msvc-inval.c
index 396031e4c2..396031e4c2 100644
--- a/contrib/tools/bison/gnulib/src/msvc-inval.c
+++ b/contrib/tools/bison/lib/msvc-inval.c
diff --git a/contrib/tools/bison/gnulib/src/msvc-inval.h b/contrib/tools/bison/lib/msvc-inval.h
index dcb0353dcd..dcb0353dcd 100644
--- a/contrib/tools/bison/gnulib/src/msvc-inval.h
+++ b/contrib/tools/bison/lib/msvc-inval.h
diff --git a/contrib/tools/bison/gnulib/src/msvc-nothrow.c b/contrib/tools/bison/lib/msvc-nothrow.c
index 8d65472a82..8d65472a82 100644
--- a/contrib/tools/bison/gnulib/src/msvc-nothrow.c
+++ b/contrib/tools/bison/lib/msvc-nothrow.c
diff --git a/contrib/tools/bison/gnulib/src/msvc-nothrow.h b/contrib/tools/bison/lib/msvc-nothrow.h
index 5f521813df..5f521813df 100644
--- a/contrib/tools/bison/gnulib/src/msvc-nothrow.h
+++ b/contrib/tools/bison/lib/msvc-nothrow.h
diff --git a/contrib/tools/bison/gnulib/src/nl_langinfo.c b/contrib/tools/bison/lib/nl_langinfo.c
index 771c9533ae..771c9533ae 100644
--- a/contrib/tools/bison/gnulib/src/nl_langinfo.c
+++ b/contrib/tools/bison/lib/nl_langinfo.c
diff --git a/contrib/tools/bison/gnulib/src/obstack.c b/contrib/tools/bison/lib/obstack.c
index 9b2883e4ac..9b2883e4ac 100644
--- a/contrib/tools/bison/gnulib/src/obstack.c
+++ b/contrib/tools/bison/lib/obstack.c
diff --git a/contrib/tools/bison/gnulib/src/obstack.h b/contrib/tools/bison/lib/obstack.h
index 046fc58546..046fc58546 100644
--- a/contrib/tools/bison/gnulib/src/obstack.h
+++ b/contrib/tools/bison/lib/obstack.h
diff --git a/contrib/tools/bison/gnulib/src/obstack_printf.c b/contrib/tools/bison/lib/obstack_printf.c
index 291dcd52a4..291dcd52a4 100644
--- a/contrib/tools/bison/gnulib/src/obstack_printf.c
+++ b/contrib/tools/bison/lib/obstack_printf.c
diff --git a/contrib/tools/bison/gnulib/src/open.c b/contrib/tools/bison/lib/open.c
index a0c43eadf9..a0c43eadf9 100644
--- a/contrib/tools/bison/gnulib/src/open.c
+++ b/contrib/tools/bison/lib/open.c
diff --git a/contrib/tools/bison/gnulib/src/palloca.h b/contrib/tools/bison/lib/palloca.h
index a7ed8a2f9c..a7ed8a2f9c 100644
--- a/contrib/tools/bison/gnulib/src/palloca.h
+++ b/contrib/tools/bison/lib/palloca.h
diff --git a/contrib/tools/bison/gnulib/src/pathmax.h b/contrib/tools/bison/lib/pathmax.h
index a9ddc33d17..a9ddc33d17 100644
--- a/contrib/tools/bison/gnulib/src/pathmax.h
+++ b/contrib/tools/bison/lib/pathmax.h
diff --git a/contrib/tools/bison/gnulib/src/penviron.h b/contrib/tools/bison/lib/penviron.h
index fd83197378..fd83197378 100644
--- a/contrib/tools/bison/gnulib/src/penviron.h
+++ b/contrib/tools/bison/lib/penviron.h
diff --git a/contrib/tools/bison/gnulib/src/perror.c b/contrib/tools/bison/lib/perror.c
index 74e088cc73..74e088cc73 100644
--- a/contrib/tools/bison/gnulib/src/perror.c
+++ b/contrib/tools/bison/lib/perror.c
diff --git a/contrib/tools/bison/gnulib/src/pipe-safer.c b/contrib/tools/bison/lib/pipe-safer.c
index f2e0ad6fb0..f2e0ad6fb0 100644
--- a/contrib/tools/bison/gnulib/src/pipe-safer.c
+++ b/contrib/tools/bison/lib/pipe-safer.c
diff --git a/contrib/tools/bison/gnulib/src/pipe2-safer.c b/contrib/tools/bison/lib/pipe2-safer.c
index e831d0c6c1..e831d0c6c1 100644
--- a/contrib/tools/bison/gnulib/src/pipe2-safer.c
+++ b/contrib/tools/bison/lib/pipe2-safer.c
diff --git a/contrib/tools/bison/gnulib/src/pipe2.c b/contrib/tools/bison/lib/pipe2.c
index 211d75545c..211d75545c 100644
--- a/contrib/tools/bison/gnulib/src/pipe2.c
+++ b/contrib/tools/bison/lib/pipe2.c
diff --git a/contrib/tools/bison/gnulib/platform/posix/config.h b/contrib/tools/bison/lib/platform/posix/config.h
index 8fa4b4f092..8fa4b4f092 100644
--- a/contrib/tools/bison/gnulib/platform/posix/config.h
+++ b/contrib/tools/bison/lib/platform/posix/config.h
diff --git a/contrib/tools/bison/gnulib/platform/posix/configmake.h b/contrib/tools/bison/lib/platform/posix/configmake.h
index 75ea1d7d03..75ea1d7d03 100644
--- a/contrib/tools/bison/gnulib/platform/posix/configmake.h
+++ b/contrib/tools/bison/lib/platform/posix/configmake.h
diff --git a/contrib/tools/bison/gnulib/platform/posix/fcntl.h b/contrib/tools/bison/lib/platform/posix/fcntl.h
index a7a7d03b20..a7a7d03b20 100644
--- a/contrib/tools/bison/gnulib/platform/posix/fcntl.h
+++ b/contrib/tools/bison/lib/platform/posix/fcntl.h
diff --git a/contrib/tools/bison/gnulib/platform/posix/getopt.h b/contrib/tools/bison/lib/platform/posix/getopt.h
index 2096ceacfe..2096ceacfe 100644
--- a/contrib/tools/bison/gnulib/platform/posix/getopt.h
+++ b/contrib/tools/bison/lib/platform/posix/getopt.h
diff --git a/contrib/tools/bison/gnulib/platform/posix/unused-parameter.h b/contrib/tools/bison/lib/platform/posix/unused-parameter.h
index 53474b5754..53474b5754 100644
--- a/contrib/tools/bison/gnulib/platform/posix/unused-parameter.h
+++ b/contrib/tools/bison/lib/platform/posix/unused-parameter.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/alloca.h b/contrib/tools/bison/lib/platform/win64/alloca.h
index 4f6716faa0..4f6716faa0 100644
--- a/contrib/tools/bison/gnulib/platform/win64/alloca.h
+++ b/contrib/tools/bison/lib/platform/win64/alloca.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/config.h b/contrib/tools/bison/lib/platform/win64/config.h
index cf3d366e18..7b03effd7b 100644
--- a/contrib/tools/bison/gnulib/platform/win64/config.h
+++ b/contrib/tools/bison/lib/platform/win64/config.h
@@ -1,7 +1,7 @@
 /* lib/config.h.  Generated from config.hin by configure.  */
 /* lib/config.hin.  Generated from configure.ac by autoheader.  */
 
-#include <contrib/tools/bison/gnulib/win_sdk10.h>
+#include <contrib/tools/bison/lib/win_sdk10.h>
 
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
diff --git a/contrib/tools/bison/gnulib/platform/win64/configmake.h b/contrib/tools/bison/lib/platform/win64/configmake.h
index 736cfb1bc6..736cfb1bc6 100644
--- a/contrib/tools/bison/gnulib/platform/win64/configmake.h
+++ b/contrib/tools/bison/lib/platform/win64/configmake.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/fcntl.h b/contrib/tools/bison/lib/platform/win64/fcntl.h
index 0637e64b9f..0637e64b9f 100644
--- a/contrib/tools/bison/gnulib/platform/win64/fcntl.h
+++ b/contrib/tools/bison/lib/platform/win64/fcntl.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/getopt.h b/contrib/tools/bison/lib/platform/win64/getopt.h
index a80aa65455..a80aa65455 100644
--- a/contrib/tools/bison/gnulib/platform/win64/getopt.h
+++ b/contrib/tools/bison/lib/platform/win64/getopt.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/langinfo.h b/contrib/tools/bison/lib/platform/win64/langinfo.h
index 3fac25a2a7..3fac25a2a7 100644
--- a/contrib/tools/bison/gnulib/platform/win64/langinfo.h
+++ b/contrib/tools/bison/lib/platform/win64/langinfo.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/locale.h b/contrib/tools/bison/lib/platform/win64/locale.h
index cd77270e4d..cd77270e4d 100644
--- a/contrib/tools/bison/gnulib/platform/win64/locale.h
+++ b/contrib/tools/bison/lib/platform/win64/locale.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/math.h b/contrib/tools/bison/lib/platform/win64/math.h
index 072a0fbd23..072a0fbd23 100644
--- a/contrib/tools/bison/gnulib/platform/win64/math.h
+++ b/contrib/tools/bison/lib/platform/win64/math.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/sched.h b/contrib/tools/bison/lib/platform/win64/sched.h
index 12968e5f2b..12968e5f2b 100644
--- a/contrib/tools/bison/gnulib/platform/win64/sched.h
+++ b/contrib/tools/bison/lib/platform/win64/sched.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/signal.h b/contrib/tools/bison/lib/platform/win64/signal.h
index be8043dfa7..be8043dfa7 100644
--- a/contrib/tools/bison/gnulib/platform/win64/signal.h
+++ b/contrib/tools/bison/lib/platform/win64/signal.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/spawn.h b/contrib/tools/bison/lib/platform/win64/spawn.h
index 6797832daa..6797832daa 100644
--- a/contrib/tools/bison/gnulib/platform/win64/spawn.h
+++ b/contrib/tools/bison/lib/platform/win64/spawn.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/stdbool.h b/contrib/tools/bison/lib/platform/win64/stdbool.h
index 8f918a3123..8f918a3123 100644
--- a/contrib/tools/bison/gnulib/platform/win64/stdbool.h
+++ b/contrib/tools/bison/lib/platform/win64/stdbool.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/sys/stat.h b/contrib/tools/bison/lib/platform/win64/sys/stat.h
index bf7dc29f6e..bf7dc29f6e 100644
--- a/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
+++ b/contrib/tools/bison/lib/platform/win64/sys/stat.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/sys/time.h b/contrib/tools/bison/lib/platform/win64/sys/time.h
index 3b520228f2..3b520228f2 100644
--- a/contrib/tools/bison/gnulib/platform/win64/sys/time.h
+++ b/contrib/tools/bison/lib/platform/win64/sys/time.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/sys/wait.h b/contrib/tools/bison/lib/platform/win64/sys/wait.h
index 38bbfa81dd..38bbfa81dd 100644
--- a/contrib/tools/bison/gnulib/platform/win64/sys/wait.h
+++ b/contrib/tools/bison/lib/platform/win64/sys/wait.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/unistd.h b/contrib/tools/bison/lib/platform/win64/unistd.h
index 3980820c14..3980820c14 100644
--- a/contrib/tools/bison/gnulib/platform/win64/unistd.h
+++ b/contrib/tools/bison/lib/platform/win64/unistd.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/unitypes.h b/contrib/tools/bison/lib/platform/win64/unitypes.h
index 3d7db7510d..3d7db7510d 100644
--- a/contrib/tools/bison/gnulib/platform/win64/unitypes.h
+++ b/contrib/tools/bison/lib/platform/win64/unitypes.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/uniwidth.h b/contrib/tools/bison/lib/platform/win64/uniwidth.h
index 2ad29275a5..2ad29275a5 100644
--- a/contrib/tools/bison/gnulib/platform/win64/uniwidth.h
+++ b/contrib/tools/bison/lib/platform/win64/uniwidth.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/unused-parameter.h b/contrib/tools/bison/lib/platform/win64/unused-parameter.h
index 53474b5754..53474b5754 100644
--- a/contrib/tools/bison/gnulib/platform/win64/unused-parameter.h
+++ b/contrib/tools/bison/lib/platform/win64/unused-parameter.h
diff --git a/contrib/tools/bison/gnulib/src/printf-args.c b/contrib/tools/bison/lib/printf-args.c
index c27e6bc6b7..c27e6bc6b7 100644
--- a/contrib/tools/bison/gnulib/src/printf-args.c
+++ b/contrib/tools/bison/lib/printf-args.c
diff --git a/contrib/tools/bison/gnulib/src/printf-args.h b/contrib/tools/bison/lib/printf-args.h
index 2a9c2a3f87..2a9c2a3f87 100644
--- a/contrib/tools/bison/gnulib/src/printf-args.h
+++ b/contrib/tools/bison/lib/printf-args.h
diff --git a/contrib/tools/bison/gnulib/src/printf-frexp.c b/contrib/tools/bison/lib/printf-frexp.c
index 1a7b0c438e..1a7b0c438e 100644
--- a/contrib/tools/bison/gnulib/src/printf-frexp.c
+++ b/contrib/tools/bison/lib/printf-frexp.c
diff --git a/contrib/tools/bison/gnulib/src/printf-frexp.h b/contrib/tools/bison/lib/printf-frexp.h
index 3976b73686..3976b73686 100644
--- a/contrib/tools/bison/gnulib/src/printf-frexp.h
+++ b/contrib/tools/bison/lib/printf-frexp.h
diff --git a/contrib/tools/bison/gnulib/src/printf-frexpl.c b/contrib/tools/bison/lib/printf-frexpl.c
index 26987a7bd1..26987a7bd1 100644
--- a/contrib/tools/bison/gnulib/src/printf-frexpl.c
+++ b/contrib/tools/bison/lib/printf-frexpl.c
diff --git a/contrib/tools/bison/gnulib/src/printf-frexpl.h b/contrib/tools/bison/lib/printf-frexpl.h
index 3768b0915e..3768b0915e 100644
--- a/contrib/tools/bison/gnulib/src/printf-frexpl.h
+++ b/contrib/tools/bison/lib/printf-frexpl.h
diff --git a/contrib/tools/bison/gnulib/src/printf-parse.c b/contrib/tools/bison/lib/printf-parse.c
index 23cacc1dab..23cacc1dab 100644
--- a/contrib/tools/bison/gnulib/src/printf-parse.c
+++ b/contrib/tools/bison/lib/printf-parse.c
diff --git a/contrib/tools/bison/gnulib/src/printf-parse.h b/contrib/tools/bison/lib/printf-parse.h
index d8474bee15..d8474bee15 100644
--- a/contrib/tools/bison/gnulib/src/printf-parse.h
+++ b/contrib/tools/bison/lib/printf-parse.h
diff --git a/contrib/tools/bison/gnulib/src/progname.c b/contrib/tools/bison/lib/progname.c
index 0c195e521a..0c195e521a 100644
--- a/contrib/tools/bison/gnulib/src/progname.c
+++ b/contrib/tools/bison/lib/progname.c
diff --git a/contrib/tools/bison/gnulib/src/progname.h b/contrib/tools/bison/lib/progname.h
index b4f3c2778a..b4f3c2778a 100644
--- a/contrib/tools/bison/gnulib/src/progname.h
+++ b/contrib/tools/bison/lib/progname.h
diff --git a/contrib/tools/bison/gnulib/src/quote.h b/contrib/tools/bison/lib/quote.h
index 1679796763..1679796763 100644
--- a/contrib/tools/bison/gnulib/src/quote.h
+++ b/contrib/tools/bison/lib/quote.h
diff --git a/contrib/tools/bison/gnulib/src/quotearg.c b/contrib/tools/bison/lib/quotearg.c
index 40114d7fbd..40114d7fbd 100644
--- a/contrib/tools/bison/gnulib/src/quotearg.c
+++ b/contrib/tools/bison/lib/quotearg.c
diff --git a/contrib/tools/bison/gnulib/src/quotearg.h b/contrib/tools/bison/lib/quotearg.h
index 58ee3f6089..58ee3f6089 100644
--- a/contrib/tools/bison/gnulib/src/quotearg.h
+++ b/contrib/tools/bison/lib/quotearg.h
diff --git a/contrib/tools/bison/gnulib/src/raise.c b/contrib/tools/bison/lib/raise.c
index 5b546d2b8d..5b546d2b8d 100644
--- a/contrib/tools/bison/gnulib/src/raise.c
+++ b/contrib/tools/bison/lib/raise.c
diff --git a/contrib/tools/bison/gnulib/src/rawmemchr.c b/contrib/tools/bison/lib/rawmemchr.c
index a0298ce64e..a0298ce64e 100644
--- a/contrib/tools/bison/gnulib/src/rawmemchr.c
+++ b/contrib/tools/bison/lib/rawmemchr.c
diff --git a/contrib/tools/bison/gnulib/src/readlink.c b/contrib/tools/bison/lib/readlink.c
index f83a1e0123..f83a1e0123 100644
--- a/contrib/tools/bison/gnulib/src/readlink.c
+++ b/contrib/tools/bison/lib/readlink.c
diff --git a/contrib/tools/bison/gnulib/src/realloc.c b/contrib/tools/bison/lib/realloc.c
index b51010a621..b51010a621 100644
--- a/contrib/tools/bison/gnulib/src/realloc.c
+++ b/contrib/tools/bison/lib/realloc.c
diff --git a/contrib/tools/bison/gnulib/src/regcomp.c b/contrib/tools/bison/lib/regcomp.c
index f0b2e52216..f0b2e52216 100644
--- a/contrib/tools/bison/gnulib/src/regcomp.c
+++ b/contrib/tools/bison/lib/regcomp.c
diff --git a/contrib/tools/bison/gnulib/src/regex.c b/contrib/tools/bison/lib/regex.c
index 85091669c7..85091669c7 100644
--- a/contrib/tools/bison/gnulib/src/regex.c
+++ b/contrib/tools/bison/lib/regex.c
diff --git a/contrib/tools/bison/gnulib/src/regex.h b/contrib/tools/bison/lib/regex.h
index 854c6edaf7..854c6edaf7 100644
--- a/contrib/tools/bison/gnulib/src/regex.h
+++ b/contrib/tools/bison/lib/regex.h
diff --git a/contrib/tools/bison/gnulib/src/regex_internal.c b/contrib/tools/bison/lib/regex_internal.c
index 899b0ae67e..899b0ae67e 100644
--- a/contrib/tools/bison/gnulib/src/regex_internal.c
+++ b/contrib/tools/bison/lib/regex_internal.c
diff --git a/contrib/tools/bison/gnulib/src/regex_internal.h b/contrib/tools/bison/lib/regex_internal.h
index 6205dbe726..6205dbe726 100644
--- a/contrib/tools/bison/gnulib/src/regex_internal.h
+++ b/contrib/tools/bison/lib/regex_internal.h
diff --git a/contrib/tools/bison/gnulib/src/regexec.c b/contrib/tools/bison/lib/regexec.c
index d29d442baf..d29d442baf 100644
--- a/contrib/tools/bison/gnulib/src/regexec.c
+++ b/contrib/tools/bison/lib/regexec.c
diff --git a/contrib/tools/bison/gnulib/src/rename.c b/contrib/tools/bison/lib/rename.c
index 3e463ea86a..3e463ea86a 100644
--- a/contrib/tools/bison/gnulib/src/rename.c
+++ b/contrib/tools/bison/lib/rename.c
diff --git a/contrib/tools/bison/gnulib/src/rmdir.c b/contrib/tools/bison/lib/rmdir.c
index a8d907ebf0..a8d907ebf0 100644
--- a/contrib/tools/bison/gnulib/src/rmdir.c
+++ b/contrib/tools/bison/lib/rmdir.c
diff --git a/contrib/tools/bison/gnulib/src/same-inode.h b/contrib/tools/bison/lib/same-inode.h
index 3843b07078..3843b07078 100644
--- a/contrib/tools/bison/gnulib/src/same-inode.h
+++ b/contrib/tools/bison/lib/same-inode.h
diff --git a/contrib/tools/bison/gnulib/src/secure_getenv.c b/contrib/tools/bison/lib/secure_getenv.c
index 6c11c5e0ed..6c11c5e0ed 100644
--- a/contrib/tools/bison/gnulib/src/secure_getenv.c
+++ b/contrib/tools/bison/lib/secure_getenv.c
diff --git a/contrib/tools/bison/gnulib/src/sig-handler.c b/contrib/tools/bison/lib/sig-handler.c
index 52c36217e5..52c36217e5 100644
--- a/contrib/tools/bison/gnulib/src/sig-handler.c
+++ b/contrib/tools/bison/lib/sig-handler.c
diff --git a/contrib/tools/bison/gnulib/src/sig-handler.h b/contrib/tools/bison/lib/sig-handler.h
index 67d061d599..67d061d599 100644
--- a/contrib/tools/bison/gnulib/src/sig-handler.h
+++ b/contrib/tools/bison/lib/sig-handler.h
diff --git a/contrib/tools/bison/gnulib/src/sigaction.c b/contrib/tools/bison/lib/sigaction.c
index 97eb76d92e..97eb76d92e 100644
--- a/contrib/tools/bison/gnulib/src/sigaction.c
+++ b/contrib/tools/bison/lib/sigaction.c
diff --git a/contrib/tools/bison/gnulib/src/siglist.h b/contrib/tools/bison/lib/siglist.h
index 7817c95b31..7817c95b31 100644
--- a/contrib/tools/bison/gnulib/src/siglist.h
+++ b/contrib/tools/bison/lib/siglist.h
diff --git a/contrib/tools/bison/gnulib/src/signbitd.c b/contrib/tools/bison/lib/signbitd.c
index 7a434f8eea..7a434f8eea 100644
--- a/contrib/tools/bison/gnulib/src/signbitd.c
+++ b/contrib/tools/bison/lib/signbitd.c
diff --git a/contrib/tools/bison/gnulib/src/signbitf.c b/contrib/tools/bison/lib/signbitf.c
index f133be57f5..f133be57f5 100644
--- a/contrib/tools/bison/gnulib/src/signbitf.c
+++ b/contrib/tools/bison/lib/signbitf.c
diff --git a/contrib/tools/bison/gnulib/src/signbitl.c b/contrib/tools/bison/lib/signbitl.c
index 9e1e900e16..9e1e900e16 100644
--- a/contrib/tools/bison/gnulib/src/signbitl.c
+++ b/contrib/tools/bison/lib/signbitl.c
diff --git a/contrib/tools/bison/gnulib/src/sigprocmask.c b/contrib/tools/bison/lib/sigprocmask.c
index 8de3777db3..8de3777db3 100644
--- a/contrib/tools/bison/gnulib/src/sigprocmask.c
+++ b/contrib/tools/bison/lib/sigprocmask.c
diff --git a/contrib/tools/bison/gnulib/src/snprintf.c b/contrib/tools/bison/lib/snprintf.c
index 9c34de3bb2..9c34de3bb2 100644
--- a/contrib/tools/bison/gnulib/src/snprintf.c
+++ b/contrib/tools/bison/lib/snprintf.c
diff --git a/contrib/tools/bison/gnulib/src/spawn-pipe.c b/contrib/tools/bison/lib/spawn-pipe.c
index 86b929a7f4..86b929a7f4 100644
--- a/contrib/tools/bison/gnulib/src/spawn-pipe.c
+++ b/contrib/tools/bison/lib/spawn-pipe.c
diff --git a/contrib/tools/bison/gnulib/src/spawn-pipe.h b/contrib/tools/bison/lib/spawn-pipe.h
index ea8284f268..ea8284f268 100644
--- a/contrib/tools/bison/gnulib/src/spawn-pipe.h
+++ b/contrib/tools/bison/lib/spawn-pipe.h
diff --git a/contrib/tools/bison/gnulib/src/spawn_faction_addclose.c b/contrib/tools/bison/lib/spawn_faction_addclose.c
index 86a9aba2e7..86a9aba2e7 100644
--- a/contrib/tools/bison/gnulib/src/spawn_faction_addclose.c
+++ b/contrib/tools/bison/lib/spawn_faction_addclose.c
diff --git a/contrib/tools/bison/gnulib/src/spawn_faction_adddup2.c b/contrib/tools/bison/lib/spawn_faction_adddup2.c
index 56ff1ecc18..56ff1ecc18 100644
--- a/contrib/tools/bison/gnulib/src/spawn_faction_adddup2.c
+++ b/contrib/tools/bison/lib/spawn_faction_adddup2.c
diff --git a/contrib/tools/bison/gnulib/src/spawn_faction_addopen.c b/contrib/tools/bison/lib/spawn_faction_addopen.c
index 8aaeca6a50..8aaeca6a50 100644
--- a/contrib/tools/bison/gnulib/src/spawn_faction_addopen.c
+++ b/contrib/tools/bison/lib/spawn_faction_addopen.c
diff --git a/contrib/tools/bison/gnulib/src/spawn_faction_destroy.c b/contrib/tools/bison/lib/spawn_faction_destroy.c
index 942733dc6b..942733dc6b 100644
--- a/contrib/tools/bison/gnulib/src/spawn_faction_destroy.c
+++ b/contrib/tools/bison/lib/spawn_faction_destroy.c
diff --git a/contrib/tools/bison/gnulib/src/spawn_faction_init.c b/contrib/tools/bison/lib/spawn_faction_init.c
index cf1d0a6adc..cf1d0a6adc 100644
--- a/contrib/tools/bison/gnulib/src/spawn_faction_init.c
+++ b/contrib/tools/bison/lib/spawn_faction_init.c
diff --git a/contrib/tools/bison/gnulib/src/spawn_int.h b/contrib/tools/bison/lib/spawn_int.h
index f22a659fbe..f22a659fbe 100644
--- a/contrib/tools/bison/gnulib/src/spawn_int.h
+++ b/contrib/tools/bison/lib/spawn_int.h
diff --git a/contrib/tools/bison/gnulib/src/spawnattr_destroy.c b/contrib/tools/bison/lib/spawnattr_destroy.c
index ec6c7cf003..ec6c7cf003 100644
--- a/contrib/tools/bison/gnulib/src/spawnattr_destroy.c
+++ b/contrib/tools/bison/lib/spawnattr_destroy.c
diff --git a/contrib/tools/bison/gnulib/src/spawnattr_init.c b/contrib/tools/bison/lib/spawnattr_init.c
index b050fb4ab7..b050fb4ab7 100644
--- a/contrib/tools/bison/gnulib/src/spawnattr_init.c
+++ b/contrib/tools/bison/lib/spawnattr_init.c
diff --git a/contrib/tools/bison/gnulib/src/spawnattr_setflags.c b/contrib/tools/bison/lib/spawnattr_setflags.c
index babbb19593..babbb19593 100644
--- a/contrib/tools/bison/gnulib/src/spawnattr_setflags.c
+++ b/contrib/tools/bison/lib/spawnattr_setflags.c
diff --git a/contrib/tools/bison/gnulib/src/spawnattr_setsigmask.c b/contrib/tools/bison/lib/spawnattr_setsigmask.c
index 8aa6da9437..8aa6da9437 100644
--- a/contrib/tools/bison/gnulib/src/spawnattr_setsigmask.c
+++ b/contrib/tools/bison/lib/spawnattr_setsigmask.c
diff --git a/contrib/tools/bison/gnulib/src/spawni.c b/contrib/tools/bison/lib/spawni.c
index e2f7b45b60..e2f7b45b60 100644
--- a/contrib/tools/bison/gnulib/src/spawni.c
+++ b/contrib/tools/bison/lib/spawni.c
diff --git a/contrib/tools/bison/gnulib/src/spawnp.c b/contrib/tools/bison/lib/spawnp.c
index 8bc5f99aca..8bc5f99aca 100644
--- a/contrib/tools/bison/gnulib/src/spawnp.c
+++ b/contrib/tools/bison/lib/spawnp.c
diff --git a/contrib/tools/bison/gnulib/src/stat.c b/contrib/tools/bison/lib/stat.c
index f888130d26..f888130d26 100644
--- a/contrib/tools/bison/gnulib/src/stat.c
+++ b/contrib/tools/bison/lib/stat.c
diff --git a/contrib/tools/bison/gnulib/src/stdio--.h b/contrib/tools/bison/lib/stdio--.h
index 5d9b19b50a..5d9b19b50a 100644
--- a/contrib/tools/bison/gnulib/src/stdio--.h
+++ b/contrib/tools/bison/lib/stdio--.h
diff --git a/contrib/tools/bison/gnulib/src/stdio-impl.h b/contrib/tools/bison/lib/stdio-impl.h
index e510bb8f42..e510bb8f42 100644
--- a/contrib/tools/bison/gnulib/src/stdio-impl.h
+++ b/contrib/tools/bison/lib/stdio-impl.h
diff --git a/contrib/tools/bison/gnulib/src/stdio-safer.h b/contrib/tools/bison/lib/stdio-safer.h
index 7b67ae059d..7b67ae059d 100644
--- a/contrib/tools/bison/gnulib/src/stdio-safer.h
+++ b/contrib/tools/bison/lib/stdio-safer.h
diff --git a/contrib/tools/bison/gnulib/src/stdio-write.c b/contrib/tools/bison/lib/stdio-write.c
index 68d54ce93e..68d54ce93e 100644
--- a/contrib/tools/bison/gnulib/src/stdio-write.c
+++ b/contrib/tools/bison/lib/stdio-write.c
diff --git a/contrib/tools/bison/gnulib/src/stdlib--.h b/contrib/tools/bison/lib/stdlib--.h
index 28360a2707..28360a2707 100644
--- a/contrib/tools/bison/gnulib/src/stdlib--.h
+++ b/contrib/tools/bison/lib/stdlib--.h
diff --git a/contrib/tools/bison/gnulib/src/stdlib-safer.h b/contrib/tools/bison/lib/stdlib-safer.h
index 1e3149370e..1e3149370e 100644
--- a/contrib/tools/bison/gnulib/src/stdlib-safer.h
+++ b/contrib/tools/bison/lib/stdlib-safer.h
diff --git a/contrib/tools/bison/gnulib/src/stpcpy.c b/contrib/tools/bison/lib/stpcpy.c
index f5aa8d67e9..f5aa8d67e9 100644
--- a/contrib/tools/bison/gnulib/src/stpcpy.c
+++ b/contrib/tools/bison/lib/stpcpy.c
diff --git a/contrib/tools/bison/gnulib/src/str-two-way.h b/contrib/tools/bison/lib/str-two-way.h
index 707145dbdd..707145dbdd 100644
--- a/contrib/tools/bison/gnulib/src/str-two-way.h
+++ b/contrib/tools/bison/lib/str-two-way.h
diff --git a/contrib/tools/bison/gnulib/src/strchrnul.c b/contrib/tools/bison/lib/strchrnul.c
index 4308889950..4308889950 100644
--- a/contrib/tools/bison/gnulib/src/strchrnul.c
+++ b/contrib/tools/bison/lib/strchrnul.c
diff --git a/contrib/tools/bison/gnulib/src/strdup.c b/contrib/tools/bison/lib/strdup.c
index 5826ab02af..5826ab02af 100644
--- a/contrib/tools/bison/gnulib/src/strdup.c
+++ b/contrib/tools/bison/lib/strdup.c
diff --git a/contrib/tools/bison/gnulib/src/streq.h b/contrib/tools/bison/lib/streq.h
index 12c1867c83..12c1867c83 100644
--- a/contrib/tools/bison/gnulib/src/streq.h
+++ b/contrib/tools/bison/lib/streq.h
diff --git a/contrib/tools/bison/gnulib/src/string--.h b/contrib/tools/bison/lib/string--.h
index 24a1932992..24a1932992 100644
--- a/contrib/tools/bison/gnulib/src/string--.h
+++ b/contrib/tools/bison/lib/string--.h
diff --git a/contrib/tools/bison/gnulib/src/stripslash.c b/contrib/tools/bison/lib/stripslash.c
index 0e452a95ef..0e452a95ef 100644
--- a/contrib/tools/bison/gnulib/src/stripslash.c
+++ b/contrib/tools/bison/lib/stripslash.c
diff --git a/contrib/tools/bison/gnulib/src/strndup.c b/contrib/tools/bison/lib/strndup.c
index e60268b86e..e60268b86e 100644
--- a/contrib/tools/bison/gnulib/src/strndup.c
+++ b/contrib/tools/bison/lib/strndup.c
diff --git a/contrib/tools/bison/gnulib/src/strsignal.c b/contrib/tools/bison/lib/strsignal.c
index 20d604ff38..20d604ff38 100644
--- a/contrib/tools/bison/gnulib/src/strsignal.c
+++ b/contrib/tools/bison/lib/strsignal.c
diff --git a/contrib/tools/bison/gnulib/src/strstr.c b/contrib/tools/bison/lib/strstr.c
index b91acec7c8..b91acec7c8 100644
--- a/contrib/tools/bison/gnulib/src/strstr.c
+++ b/contrib/tools/bison/lib/strstr.c
diff --git a/contrib/tools/bison/gnulib/src/strverscmp.c b/contrib/tools/bison/lib/strverscmp.c
index db4f1edc70..db4f1edc70 100644
--- a/contrib/tools/bison/gnulib/src/strverscmp.c
+++ b/contrib/tools/bison/lib/strverscmp.c
diff --git a/contrib/tools/bison/gnulib/src/tempname.c b/contrib/tools/bison/lib/tempname.c
index 9975449a89..9975449a89 100644
--- a/contrib/tools/bison/gnulib/src/tempname.c
+++ b/contrib/tools/bison/lib/tempname.c
diff --git a/contrib/tools/bison/gnulib/src/tempname.h b/contrib/tools/bison/lib/tempname.h
index 333267dfd0..333267dfd0 100644
--- a/contrib/tools/bison/gnulib/src/tempname.h
+++ b/contrib/tools/bison/lib/tempname.h
diff --git a/contrib/tools/bison/gnulib/src/timevar.c b/contrib/tools/bison/lib/timevar.c
index a9dbdbdee5..a9dbdbdee5 100644
--- a/contrib/tools/bison/gnulib/src/timevar.c
+++ b/contrib/tools/bison/lib/timevar.c
diff --git a/contrib/tools/bison/gnulib/src/timevar.def b/contrib/tools/bison/lib/timevar.def
index 484fe35f7b..484fe35f7b 100644
--- a/contrib/tools/bison/gnulib/src/timevar.def
+++ b/contrib/tools/bison/lib/timevar.def
diff --git a/contrib/tools/bison/gnulib/src/timevar.h b/contrib/tools/bison/lib/timevar.h
index d397bd7ff0..d397bd7ff0 100644
--- a/contrib/tools/bison/gnulib/src/timevar.h
+++ b/contrib/tools/bison/lib/timevar.h
diff --git a/contrib/tools/bison/gnulib/src/tmpdir.c b/contrib/tools/bison/lib/tmpdir.c
index 1b3fb023a0..1b3fb023a0 100644
--- a/contrib/tools/bison/gnulib/src/tmpdir.c
+++ b/contrib/tools/bison/lib/tmpdir.c
diff --git a/contrib/tools/bison/gnulib/src/tmpdir.h b/contrib/tools/bison/lib/tmpdir.h
index ff7c70f346..ff7c70f346 100644
--- a/contrib/tools/bison/gnulib/src/tmpdir.h
+++ b/contrib/tools/bison/lib/tmpdir.h
diff --git a/contrib/tools/bison/gnulib/src/unistd--.h b/contrib/tools/bison/lib/unistd--.h
index fee7ecf03d..fee7ecf03d 100644
--- a/contrib/tools/bison/gnulib/src/unistd--.h
+++ b/contrib/tools/bison/lib/unistd--.h
diff --git a/contrib/tools/bison/gnulib/src/unistd-safer.h b/contrib/tools/bison/lib/unistd-safer.h
index 5c2b55ae2f..5c2b55ae2f 100644
--- a/contrib/tools/bison/gnulib/src/unistd-safer.h
+++ b/contrib/tools/bison/lib/unistd-safer.h
diff --git a/contrib/tools/bison/gnulib/src/unistd.c b/contrib/tools/bison/lib/unistd.c
index 6c6a8e268c..6c6a8e268c 100644
--- a/contrib/tools/bison/gnulib/src/unistd.c
+++ b/contrib/tools/bison/lib/unistd.c
diff --git a/contrib/tools/bison/gnulib/src/uniwidth/cjk.h b/contrib/tools/bison/lib/uniwidth/cjk.h
index 11b14dfec5..11b14dfec5 100644
--- a/contrib/tools/bison/gnulib/src/uniwidth/cjk.h
+++ b/contrib/tools/bison/lib/uniwidth/cjk.h
diff --git a/contrib/tools/bison/gnulib/src/uniwidth/width.c b/contrib/tools/bison/lib/uniwidth/width.c
index 173d0872c7..173d0872c7 100644
--- a/contrib/tools/bison/gnulib/src/uniwidth/width.c
+++ b/contrib/tools/bison/lib/uniwidth/width.c
diff --git a/contrib/tools/bison/gnulib/src/unlocked-io.h b/contrib/tools/bison/lib/unlocked-io.h
index df3e13911e..df3e13911e 100644
--- a/contrib/tools/bison/gnulib/src/unlocked-io.h
+++ b/contrib/tools/bison/lib/unlocked-io.h
diff --git a/contrib/tools/bison/gnulib/src/unsetenv.c b/contrib/tools/bison/lib/unsetenv.c
index c58c82f4f4..c58c82f4f4 100644
--- a/contrib/tools/bison/gnulib/src/unsetenv.c
+++ b/contrib/tools/bison/lib/unsetenv.c
diff --git a/contrib/tools/bison/gnulib/src/vasnprintf.c b/contrib/tools/bison/lib/vasnprintf.c
index 4de22819fa..4de22819fa 100644
--- a/contrib/tools/bison/gnulib/src/vasnprintf.c
+++ b/contrib/tools/bison/lib/vasnprintf.c
diff --git a/contrib/tools/bison/gnulib/src/vasnprintf.h b/contrib/tools/bison/lib/vasnprintf.h
index 7658f505e5..7658f505e5 100644
--- a/contrib/tools/bison/gnulib/src/vasnprintf.h
+++ b/contrib/tools/bison/lib/vasnprintf.h
diff --git a/contrib/tools/bison/gnulib/src/vasprintf.c b/contrib/tools/bison/lib/vasprintf.c
index afc8056194..afc8056194 100644
--- a/contrib/tools/bison/gnulib/src/vasprintf.c
+++ b/contrib/tools/bison/lib/vasprintf.c
diff --git a/contrib/tools/bison/gnulib/src/vbitset.c b/contrib/tools/bison/lib/vbitset.c
index e7200cdaa5..e7200cdaa5 100644
--- a/contrib/tools/bison/gnulib/src/vbitset.c
+++ b/contrib/tools/bison/lib/vbitset.c
diff --git a/contrib/tools/bison/gnulib/src/vbitset.h b/contrib/tools/bison/lib/vbitset.h
index b91019bcb1..b91019bcb1 100644
--- a/contrib/tools/bison/gnulib/src/vbitset.h
+++ b/contrib/tools/bison/lib/vbitset.h
diff --git a/contrib/tools/bison/gnulib/src/verify.h b/contrib/tools/bison/lib/verify.h
index d42d0750ee..d42d0750ee 100644
--- a/contrib/tools/bison/gnulib/src/verify.h
+++ b/contrib/tools/bison/lib/verify.h
diff --git a/contrib/tools/bison/gnulib/src/verror.c b/contrib/tools/bison/lib/verror.c
index 5f899c1b7a..5f899c1b7a 100644
--- a/contrib/tools/bison/gnulib/src/verror.c
+++ b/contrib/tools/bison/lib/verror.c
diff --git a/contrib/tools/bison/gnulib/src/verror.h b/contrib/tools/bison/lib/verror.h
index 7e7284ad82..7e7284ad82 100644
--- a/contrib/tools/bison/gnulib/src/verror.h
+++ b/contrib/tools/bison/lib/verror.h
diff --git a/contrib/tools/bison/gnulib/src/version-etc-fsf.c b/contrib/tools/bison/lib/version-etc-fsf.c
index e1c69da94a..e1c69da94a 100644
--- a/contrib/tools/bison/gnulib/src/version-etc-fsf.c
+++ b/contrib/tools/bison/lib/version-etc-fsf.c
diff --git a/contrib/tools/bison/gnulib/src/version-etc.c b/contrib/tools/bison/lib/version-etc.c
index b7d23ab597..b7d23ab597 100644
--- a/contrib/tools/bison/gnulib/src/version-etc.c
+++ b/contrib/tools/bison/lib/version-etc.c
diff --git a/contrib/tools/bison/gnulib/src/version-etc.h b/contrib/tools/bison/lib/version-etc.h
index 6c3d08431c..6c3d08431c 100644
--- a/contrib/tools/bison/gnulib/src/version-etc.h
+++ b/contrib/tools/bison/lib/version-etc.h
diff --git a/contrib/tools/bison/gnulib/src/w32spawn.h b/contrib/tools/bison/lib/w32spawn.h
index 3b5c08afcd..3b5c08afcd 100644
--- a/contrib/tools/bison/gnulib/src/w32spawn.h
+++ b/contrib/tools/bison/lib/w32spawn.h
diff --git a/contrib/tools/bison/gnulib/src/wait-process.c b/contrib/tools/bison/lib/wait-process.c
index 17a2430f91..17a2430f91 100644
--- a/contrib/tools/bison/gnulib/src/wait-process.c
+++ b/contrib/tools/bison/lib/wait-process.c
diff --git a/contrib/tools/bison/gnulib/src/wait-process.h b/contrib/tools/bison/lib/wait-process.h
index 6d8f0d2b94..6d8f0d2b94 100644
--- a/contrib/tools/bison/gnulib/src/wait-process.h
+++ b/contrib/tools/bison/lib/wait-process.h
diff --git a/contrib/tools/bison/gnulib/src/waitpid.c b/contrib/tools/bison/lib/waitpid.c
index d28a70b3ea..d28a70b3ea 100644
--- a/contrib/tools/bison/gnulib/src/waitpid.c
+++ b/contrib/tools/bison/lib/waitpid.c
diff --git a/contrib/tools/bison/gnulib/src/wchar--.h b/contrib/tools/bison/lib/wchar--.h
index 41751e00ac..41751e00ac 100644
--- a/contrib/tools/bison/gnulib/src/wchar--.h
+++ b/contrib/tools/bison/lib/wchar--.h
diff --git a/contrib/tools/bison/gnulib/src/wcrtomb.c b/contrib/tools/bison/lib/wcrtomb.c
index c3cda35803..c3cda35803 100644
--- a/contrib/tools/bison/gnulib/src/wcrtomb.c
+++ b/contrib/tools/bison/lib/wcrtomb.c
diff --git a/contrib/tools/bison/gnulib/src/wctype-h.c b/contrib/tools/bison/lib/wctype-h.c
index bb5f847e33..bb5f847e33 100644
--- a/contrib/tools/bison/gnulib/src/wctype-h.c
+++ b/contrib/tools/bison/lib/wctype-h.c
diff --git a/contrib/tools/bison/gnulib/src/wcwidth.c b/contrib/tools/bison/lib/wcwidth.c
index 253fcaa656..253fcaa656 100644
--- a/contrib/tools/bison/gnulib/src/wcwidth.c
+++ b/contrib/tools/bison/lib/wcwidth.c
diff --git a/contrib/tools/bison/gnulib/win_sdk10.h b/contrib/tools/bison/lib/win_sdk10.h
index 76e5c86ccd..76e5c86ccd 100644
--- a/contrib/tools/bison/gnulib/win_sdk10.h
+++ b/contrib/tools/bison/lib/win_sdk10.h
diff --git a/contrib/tools/bison/gnulib/src/xalloc-die.c b/contrib/tools/bison/lib/xalloc-die.c
index daa403b9c8..daa403b9c8 100644
--- a/contrib/tools/bison/gnulib/src/xalloc-die.c
+++ b/contrib/tools/bison/lib/xalloc-die.c
diff --git a/contrib/tools/bison/gnulib/src/xalloc-oversized.h b/contrib/tools/bison/lib/xalloc-oversized.h
index a971c78ad3..a971c78ad3 100644
--- a/contrib/tools/bison/gnulib/src/xalloc-oversized.h
+++ b/contrib/tools/bison/lib/xalloc-oversized.h
diff --git a/contrib/tools/bison/gnulib/src/xalloc.h b/contrib/tools/bison/lib/xalloc.h
index 6c9b53bf6f..6c9b53bf6f 100644
--- a/contrib/tools/bison/gnulib/src/xalloc.h
+++ b/contrib/tools/bison/lib/xalloc.h
diff --git a/contrib/tools/bison/gnulib/src/xasprintf.c b/contrib/tools/bison/lib/xasprintf.c
index 1808b70182..1808b70182 100644
--- a/contrib/tools/bison/gnulib/src/xasprintf.c
+++ b/contrib/tools/bison/lib/xasprintf.c
diff --git a/contrib/tools/bison/gnulib/src/xconcat-filename.c b/contrib/tools/bison/lib/xconcat-filename.c
index eb2f8a9fb1..eb2f8a9fb1 100644
--- a/contrib/tools/bison/gnulib/src/xconcat-filename.c
+++ b/contrib/tools/bison/lib/xconcat-filename.c
diff --git a/contrib/tools/bison/gnulib/src/xmalloc.c b/contrib/tools/bison/lib/xmalloc.c
index 57e34b7cdb..57e34b7cdb 100644
--- a/contrib/tools/bison/gnulib/src/xmalloc.c
+++ b/contrib/tools/bison/lib/xmalloc.c
diff --git a/contrib/tools/bison/gnulib/src/xmalloca.c b/contrib/tools/bison/lib/xmalloca.c
index 50ee4807fb..50ee4807fb 100644
--- a/contrib/tools/bison/gnulib/src/xmalloca.c
+++ b/contrib/tools/bison/lib/xmalloca.c
diff --git a/contrib/tools/bison/gnulib/src/xmalloca.h b/contrib/tools/bison/lib/xmalloca.h
index 2f7567d498..2f7567d498 100644
--- a/contrib/tools/bison/gnulib/src/xmalloca.h
+++ b/contrib/tools/bison/lib/xmalloca.h
diff --git a/contrib/tools/bison/gnulib/src/xmemdup0.c b/contrib/tools/bison/lib/xmemdup0.c
index c070fa6343..c070fa6343 100644
--- a/contrib/tools/bison/gnulib/src/xmemdup0.c
+++ b/contrib/tools/bison/lib/xmemdup0.c
diff --git a/contrib/tools/bison/gnulib/src/xmemdup0.h b/contrib/tools/bison/lib/xmemdup0.h
index 9ec827107a..9ec827107a 100644
--- a/contrib/tools/bison/gnulib/src/xmemdup0.h
+++ b/contrib/tools/bison/lib/xmemdup0.h
diff --git a/contrib/tools/bison/gnulib/src/xprintf.c b/contrib/tools/bison/lib/xprintf.c
index e24b4f1875..e24b4f1875 100644
--- a/contrib/tools/bison/gnulib/src/xprintf.c
+++ b/contrib/tools/bison/lib/xprintf.c
diff --git a/contrib/tools/bison/gnulib/src/xprintf.h b/contrib/tools/bison/lib/xprintf.h
index 62986a8cee..62986a8cee 100644
--- a/contrib/tools/bison/gnulib/src/xprintf.h
+++ b/contrib/tools/bison/lib/xprintf.h
diff --git a/contrib/tools/bison/gnulib/src/xsize.c b/contrib/tools/bison/lib/xsize.c
index 4b4914c2ca..4b4914c2ca 100644
--- a/contrib/tools/bison/gnulib/src/xsize.c
+++ b/contrib/tools/bison/lib/xsize.c
diff --git a/contrib/tools/bison/gnulib/src/xsize.h b/contrib/tools/bison/lib/xsize.h
index 5675593f54..5675593f54 100644
--- a/contrib/tools/bison/gnulib/src/xsize.h
+++ b/contrib/tools/bison/lib/xsize.h
diff --git a/contrib/tools/bison/gnulib/src/xstrndup.c b/contrib/tools/bison/lib/xstrndup.c
index 741d5a1b05..741d5a1b05 100644
--- a/contrib/tools/bison/gnulib/src/xstrndup.c
+++ b/contrib/tools/bison/lib/xstrndup.c
diff --git a/contrib/tools/bison/gnulib/src/xstrndup.h b/contrib/tools/bison/lib/xstrndup.h
index 59673b0489..59673b0489 100644
--- a/contrib/tools/bison/gnulib/src/xstrndup.h
+++ b/contrib/tools/bison/lib/xstrndup.h
diff --git a/contrib/tools/bison/gnulib/src/xvasprintf.c b/contrib/tools/bison/lib/xvasprintf.c
index 9c93492b80..9c93492b80 100644
--- a/contrib/tools/bison/gnulib/src/xvasprintf.c
+++ b/contrib/tools/bison/lib/xvasprintf.c
diff --git a/contrib/tools/bison/gnulib/src/xvasprintf.h b/contrib/tools/bison/lib/xvasprintf.h
index 1208fa193c..1208fa193c 100644
--- a/contrib/tools/bison/gnulib/src/xvasprintf.h
+++ b/contrib/tools/bison/lib/xvasprintf.h
diff --git a/contrib/tools/bison/lib/ya.make b/contrib/tools/bison/lib/ya.make
new file mode 100644
index 0000000000..c08666010c
--- /dev/null
+++ b/contrib/tools/bison/lib/ya.make
@@ -0,0 +1,244 @@
+LIBRARY()
+
+LICENSE(
+    BSD-3-Clause AND
+    GPL-3.0-or-later AND
+    LGPL-2.0-or-later
+)
+
+LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
+
+IF (NOT MUSL)
+    NO_RUNTIME()
+ENDIF()
+
+NO_COMPILER_WARNINGS()
+
+ADDINCL(
+    GLOBAL contrib/tools/bison/lib
+)
+
+IF (OS_WINDOWS)
+    ADDINCL(
+        GLOBAL contrib/tools/bison/lib/platform/win64
+    )
+ELSE()
+    ADDINCL(
+        GLOBAL contrib/tools/bison/lib/platform/posix
+    )
+ENDIF()
+
+IF (OS_DARWIN)
+    CFLAGS(
+        -D_XOPEN_SOURCE=600
+    )
+ENDIF()
+
+IF (NOT OS_WINDOWS)
+    CFLAGS(
+        GLOBAL -Dregcomp=gnu_regcomp
+        GLOBAL -Dregerror=gnu_regerror
+        GLOBAL -Dregfree=gnu_regfree
+        GLOBAL -Dregexec=gnu_regexec
+    )
+ENDIF()
+
+SRCS(
+    abitset.c
+    argmatch.c
+    asnprintf.c
+    basename-lgpl.c
+    basename.c
+    binary-io.c
+    bitrotate.c
+    bitset.c
+    bitset_stats.c
+    bitsetv-print.c
+    bitsetv.c
+    c-ctype.c
+    c-stack.c
+    c-strcasecmp.c
+    c-strncasecmp.c
+    calloc.c
+    clean-temp.c
+    cloexec.c
+    close-stream.c
+    close.c
+    closein.c
+    closeout.c
+    concat-filename.c
+    dirname-lgpl.c
+    dirname.c
+    dup-safer-flag.c
+    dup-safer.c
+    dup2.c
+    ebitset.c
+    error.c
+    execute.c
+    exitfail.c
+    fatal-signal.c
+    fclose.c
+    fcntl.c
+    fd-hook.c
+    fd-safer-flag.c
+    fd-safer.c
+    fflush.c
+    filenamecat-lgpl.c
+    filenamecat.c
+    float.c
+    fopen-safer.c
+    fpurge.c
+    freading.c
+    fstat.c
+    get-errno.c
+    getdtablesize.c
+    getopt.c
+    getopt1.c
+    gl_avltree_oset.c
+    gl_linkedhash_list.c
+    gl_list.c
+    gl_oset.c
+    gl_xlist.c
+    gl_xoset.c
+    hash.c
+    isnand.c
+    isnanf.c
+    isnanl.c
+    itold.c
+    lbitset.c
+    localcharset.c
+    lseek.c
+    lstat.c
+    malloc.c
+    malloca.c
+    mbrtowc.c
+    mbswidth.c
+    memchr2.c
+    mkstemp-safer.c
+    nl_langinfo.c
+    pipe-safer.c
+    pipe2-safer.c
+    printf-args.c
+    printf-frexp.c
+    printf-frexpl.c
+    printf-parse.c
+    progname.c
+    quotearg.c
+    raise.c
+    rawmemchr.c
+    readlink.c
+    realloc.c
+    regex.c
+    rename.c
+    rmdir.c
+    secure_getenv.c
+    sig-handler.c
+    signbitd.c
+    signbitf.c
+    signbitl.c
+    spawn-pipe.c
+    stat.c
+    stpcpy.c
+    strchrnul.c
+    strdup.c
+    stripslash.c
+    tempname.c
+    timevar.c
+    tmpdir.c
+    unistd.c
+    unsetenv.c
+    vasnprintf.c
+    vbitset.c
+    verror.c
+    version-etc-fsf.c
+    version-etc.c
+    wait-process.c
+    wctype-h.c
+    xalloc-die.c
+    xasprintf.c
+    xconcat-filename.c
+    xmalloc.c
+    xmalloca.c
+    xmemdup0.c
+    xprintf.c
+    xsize.c
+    xstrndup.c
+    xvasprintf.c
+)
+
+IF (NOT MUSL)
+    SRCS(
+        freadahead.c
+        fseterr.c
+        #        fseek.c
+    )
+ENDIF()
+
+IF (NOT OS_LINUX)
+    SRCS(
+        pipe2.c
+        strverscmp.c
+    )
+ENDIF()
+
+IF (NOT OS_WINDOWS)
+    SRCS(
+        stdio-write.c
+    )
+ENDIF()
+
+IF (OS_WINDOWS)
+    SRCS(
+        frexp.c
+        wcrtomb.c
+        perror.c
+        strstr.c
+        mkstemp.c
+        vasprintf.c
+        strsignal.c
+        mkdtemp.c
+        fseeko.c
+        fopen.c
+        ftello.c
+        gettimeofday.c
+        localeconv.c
+        msvc-inval.c
+        msvc-nothrow.c
+        open.c
+        sigaction.c
+        sigprocmask.c
+        snprintf.c
+        spawn_faction_addclose.c
+        spawn_faction_adddup2.c
+        spawn_faction_addopen.c
+        spawn_faction_destroy.c
+        spawn_faction_init.c
+        spawnattr_destroy.c
+        spawnattr_init.c
+        spawnattr_setflags.c
+        spawnattr_setsigmask.c
+        spawni.c
+        spawnp.c
+        strndup.c
+        waitpid.c
+        wcwidth.c
+        uniwidth/width.c
+    )
+ENDIF()
+
+IF (NOT OS_LINUX OR MUSL)
+    SRCS(
+        obstack.c
+        obstack_printf.c
+    )
+ENDIF()
+
+IF (OS_CYGWIN OR OS_LINUX)
+    #not need it
+ELSE()
+    SRCS(
+        fpending.c
+    )
+ENDIF()
+
+END()
diff --git a/contrib/tools/bison/ya.make b/contrib/tools/bison/ya.make
index ad7b56cea3..68c752d860 100644
--- a/contrib/tools/bison/ya.make
+++ b/contrib/tools/bison/ya.make
@@ -65,7 +65,7 @@ CFLAGS(
 )
 
 PEERDIR(
-    contrib/tools/bison/gnulib
+    contrib/tools/bison/lib
 )
 
 END()
diff --git a/contrib/tools/m4/src/builtin.c b/contrib/tools/m4/src/builtin.c
index 01ede38017..b3700c3219 100644
--- a/contrib/tools/m4/src/builtin.c
+++ b/contrib/tools/m4/src/builtin.c
@@ -27,7 +27,7 @@
 #include "execute.h"
 #include "memchr2.h"
 #include "progname.h"
-#include <contrib/tools/bison/gnulib/src/regex.h>
+#include "regex.h"
 #include "spawn-pipe.h"
 #include "wait-process.h"
 
diff --git a/contrib/tools/m4/src/input.c b/contrib/tools/m4/src/input.c
index 836d706489..579faddf4f 100644
--- a/contrib/tools/m4/src/input.c
+++ b/contrib/tools/m4/src/input.c
@@ -60,7 +60,7 @@
    accordingly.  */
 
 #ifdef ENABLE_CHANGEWORD
-#include <contrib/tools/bison/gnulib/src/regex.h>
+#include "regex.h"
 #endif
 
 enum input_type
diff --git a/contrib/tools/m4/ya.make b/contrib/tools/m4/ya.make
index f474cbfb71..f4d1a04138 100644
--- a/contrib/tools/m4/ya.make
+++ b/contrib/tools/m4/ya.make
@@ -30,7 +30,7 @@ SRCS(
 )
 
 PEERDIR(
-    contrib/tools/bison/gnulib
+    contrib/tools/bison/lib
 )
 
 END()