Import strchrnul from gnulib and use it

Message ID 56AA6310.6050000@ericsson.com
State Committed
Headers

Commit Message

Simon Marchi Jan. 28, 2016, 6:50 p.m. UTC
  On 16-01-28 12:44 PM, Yao Qi wrote:
> Yes, it was discussed before,
> https://sourceware.org/ml/gdb-patches/2014-10/msg00842.html and I think
> we'd better list all of them explicitly to know what do we import to
> GDB.

Ok, I just pushed this patch:


From 56e374a6bcc87f7ac8aeb09887628a3286908545 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Thu, 28 Jan 2016 13:49:46 -0500
Subject: [PATCH] Add rawmemchr to imported gnulib modules

rawmemchr is a dependency of strchrnul, so it should be explicitly
listed.

gdb/ChangeLog:

	* gnulib/import/Makefile.am: Regenerate.
	* gnulib/import/Makefile.in: Regenerate.
	* gnulib/import/m4/gnulib-cache.m4: Regenerate.
	* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add rawmemchr.
---
 gdb/ChangeLog                        | 7 +++++++
 gdb/gnulib/import/Makefile.am        | 2 +-
 gdb/gnulib/import/Makefile.in        | 2 +-
 gdb/gnulib/import/m4/gnulib-cache.m4 | 3 ++-
 gdb/gnulib/update-gnulib.sh          | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)
  

Comments

Matt Rice Jan. 30, 2016, 6:01 p.m. UTC | #1
On Thu, Jan 28, 2016 at 10:50 AM, Simon Marchi
<simon.marchi@ericsson.com> wrote:
> On 16-01-28 12:44 PM, Yao Qi wrote:
>> Yes, it was discussed before,
>> https://sourceware.org/ml/gdb-patches/2014-10/msg00842.html and I think
>> we'd better list all of them explicitly to know what do we import to
>> GDB.
>
> Ok, I just pushed this patch:
>

FWIW there was a script posted recently to gnulib that lists module dependencies

http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00013.html

and the old thing i'd done reference from that thread is back...
https://gitorious.org/gnulib-module-graph/gnulib-module-graph
  

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 93eadfb..0e191d7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@ 
 2016-01-28  Simon Marchi  <simon.marchi@ericsson.com>

+	* gnulib/import/Makefile.am: Regenerate.
+	* gnulib/import/Makefile.in: Regenerate.
+	* gnulib/import/m4/gnulib-cache.m4: Regenerate.
+	* gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add rawmemchr.
+
+2016-01-28  Simon Marchi  <simon.marchi@ericsson.com>
+
 	* remote.c (skip_to_semicolon): Remove.
 	(remote_parse_stop_reply): Use strchrnul instead of
 	skip_to_semicolon.
diff --git a/gdb/gnulib/import/Makefile.am b/gdb/gnulib/import/Makefile.am
index 3fb324b..7307aa5 100644
--- a/gdb/gnulib/import/Makefile.am
+++ b/gdb/gnulib/import/Makefile.am
@@ -21,7 +21,7 @@ 
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca canonicalize-lgpl dirent dirfd errno fnmatch-gnu frexpl inttypes lstat memchr memmem pathmax readlink rename signal-h strchrnul strstr strtok_r sys_stat unistd update-copyright wchar wctype-h
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca canonicalize-lgpl dirent dirfd errno fnmatch-gnu frexpl inttypes lstat memchr memmem pathmax rawmemchr readlink rename signal-h strchrnul strstr strtok_r sys_stat unistd update-copyright wchar wctype-h

 AUTOMAKE_OPTIONS = 1.9.6 gnits

diff --git a/gdb/gnulib/import/Makefile.in b/gdb/gnulib/import/Makefile.in
index d771e15..6e66ba5 100644
--- a/gdb/gnulib/import/Makefile.in
+++ b/gdb/gnulib/import/Makefile.in
@@ -36,7 +36,7 @@ 
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca canonicalize-lgpl dirent dirfd errno fnmatch-gnu frexpl inttypes lstat memchr memmem pathmax readlink rename signal-h strchrnul strstr strtok_r sys_stat unistd update-copyright wchar wctype-h
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca canonicalize-lgpl dirent dirfd errno fnmatch-gnu frexpl inttypes lstat memchr memmem pathmax rawmemchr readlink rename signal-h strchrnul strstr strtok_r sys_stat unistd update-copyright wchar wctype-h



diff --git a/gdb/gnulib/import/m4/gnulib-cache.m4 b/gdb/gnulib/import/m4/gnulib-cache.m4
index a52dec6..6f3477c 100644
--- a/gdb/gnulib/import/m4/gnulib-cache.m4
+++ b/gdb/gnulib/import/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@ 


 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca canonicalize-lgpl dirent dirfd errno fnmatch-gnu frexpl inttypes lstat memchr memmem pathmax readlink rename signal-h strchrnul strstr strtok_r sys_stat unistd update-copyright wchar wctype-h
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca canonicalize-lgpl dirent dirfd errno fnmatch-gnu frexpl inttypes lstat memchr memmem pathmax rawmemchr readlink rename signal-h strchrnul strstr strtok_r sys_stat unistd update-copyright wchar wctype-h

 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -44,6 +44,7 @@  gl_MODULES([
   memchr
   memmem
   pathmax
+  rawmemchr
   readlink
   rename
   signal-h
diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh
index 07de4c6..b92f284 100755
--- a/gdb/gnulib/update-gnulib.sh
+++ b/gdb/gnulib/update-gnulib.sh
@@ -42,6 +42,7 @@  IMPORTED_GNULIB_MODULES="\
     memchr \
     memmem \
     pathmax \
+    rawmemchr \
     readlink \
     rename \
     signal-h \