From patchwork Sat Nov 15 13:20:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 3763 Received: (qmail 28900 invoked by alias); 15 Nov 2014 13:20:39 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 28704 invoked by uid 89); 15 Nov 2014 13:20:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, T_FROM_12LTRDOM autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 15 Nov 2014 13:20:35 +0000 Received: from svr-orw-fem-02x.mgc.mentorg.com ([147.34.96.206] helo=SVR-ORW-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XpdHH-0005Ui-C0 from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Sat, 15 Nov 2014 05:20:35 -0800 Received: from qiyao.dyndns.org.com (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.3.181.6; Sat, 15 Nov 2014 05:20:34 -0800 From: Yao Qi To: Subject: [PATCH 5/7] Import wchar and wctype-h explicitly Date: Sat, 15 Nov 2014 21:20:10 +0800 Message-ID: <1416057612-16155-6-git-send-email-yao@codesourcery.com> In-Reply-To: <1416057612-16155-1-git-send-email-yao@codesourcery.com> References: <1416057612-16155-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes gnulib module wchar and wctype-h was imported as a dependency, but they are used by gdb_wchar.h too. This patch is to import them explicitly. gdb: * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add wchar and wctype-h. * gnulib/import/Makefile.am: Re-generated. * gnulib/import/Makefile.in: Likewise. * gnulib/import/m4/gnulib-cache.m4: Likewise. --- gdb/gnulib/import/Makefile.am | 2 +- gdb/gnulib/import/Makefile.in | 2 +- gdb/gnulib/import/m4/gnulib-cache.m4 | 4 +++- gdb/gnulib/update-gnulib.sh | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gdb/gnulib/import/Makefile.am b/gdb/gnulib/import/Makefile.am index a2824d2..1d89e65 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 dirent dirfd fnmatch-gnu frexpl inttypes memchr memmem pathmax strstr sys_stat unistd update-copyright +# 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 dirent dirfd fnmatch-gnu frexpl inttypes memchr memmem pathmax strstr sys_stat unistd update-copyright wchar wctype-h AUTOMAKE_OPTIONS = 1.5 gnits diff --git a/gdb/gnulib/import/Makefile.in b/gdb/gnulib/import/Makefile.in index 8355e1d..8a1a5fb 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 dirent dirfd fnmatch-gnu frexpl inttypes memchr memmem pathmax strstr sys_stat unistd update-copyright +# 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 dirent dirfd fnmatch-gnu frexpl inttypes memchr memmem pathmax strstr 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 b1af1a7..2544842 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 dirent dirfd fnmatch-gnu frexpl inttypes memchr memmem pathmax strstr sys_stat unistd update-copyright +# 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 dirent dirfd fnmatch-gnu frexpl inttypes memchr memmem pathmax strstr sys_stat unistd update-copyright wchar wctype-h # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -45,6 +45,8 @@ gl_MODULES([ sys_stat unistd update-copyright + wchar + wctype-h ]) gl_AVOID([]) gl_SOURCE_BASE([import]) diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh index 6b745ac..a0f6826 100644 --- a/gdb/gnulib/update-gnulib.sh +++ b/gdb/gnulib/update-gnulib.sh @@ -43,6 +43,8 @@ IMPORTED_GNULIB_MODULES="\ sys_stat \ unistd \ update-copyright \ + wchar \ + wctype-h \ " # The gnulib commit ID to use for the update.