From 55a8c0761da53ea56ce6e196110aa8e83dba248f Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sat, 14 Apr 2012 05:24:57 +0000 Subject: gdb/ Import gnulib module inttypes from git (250b80067c1e1d8faa0c42fb572f721975b929c5) * Makefile.in (HFILES_NO_SRCDIR): Add gnulib/inttypes.in.h. (aclocal_m4_deps): Add gnulib/m4/inttypes.m4 and gnulib/m4/inttypes-pri.m4 * aclocal.m4, config.in, configure: Regenerated. * gnulib/Makefile.am: Update. * gnulib/Makefile.in: Update. * gnulib/m4/gnulib-cache.m4: Update. * gnulib/m4/gnulib-comp.m4: Update. * gnulib/inttypes.in.h: New. * gnulib/m4/inttypes-pri.m4: New. * gnulib/m4/inttypes.m4: New. gdb/gdbserver/ Import gnulib module inttypes. * aclocal.m4, config.in, configure: Regenerated. --- gdb/gnulib/Makefile.in | 93 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 17 deletions(-) (limited to 'gdb/gnulib/Makefile.in') diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/Makefile.in index 0a2aad1..4e1b1d8 100644 --- a/gdb/gnulib/Makefile.in +++ b/gdb/gnulib/Makefile.in @@ -23,7 +23,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=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files memmem +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem @@ -51,11 +51,16 @@ subdir = gnulib DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/largefile.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ + $(top_srcdir)/../config/plugins.m4 \ + $(top_srcdir)/gnulib/m4/00gnulib.m4 \ $(top_srcdir)/gnulib/m4/extensions.m4 \ $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ $(top_srcdir)/gnulib/m4/include_next.m4 \ + $(top_srcdir)/gnulib/m4/inttypes-pri.m4 \ + $(top_srcdir)/gnulib/m4/inttypes.m4 \ $(top_srcdir)/gnulib/m4/longlong.m4 \ $(top_srcdir)/gnulib/m4/memchr.m4 \ $(top_srcdir)/gnulib/m4/memmem.m4 \ @@ -68,10 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \ $(top_srcdir)/gnulib/m4/warn-on-use.m4 \ $(top_srcdir)/gnulib/m4/wchar_h.m4 \ $(top_srcdir)/gnulib/m4/wchar_t.m4 \ - $(top_srcdir)/gnulib/m4/wint_t.m4 \ - $(top_srcdir)/../config/largefile.m4 \ - $(top_srcdir)/../config/lead-dot.m4 \ - $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/gnulib/m4/wint_t.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/../bfd/bfd.m4 \ $(top_srcdir)/../config/acinclude.m4 \ $(top_srcdir)/../config/override.m4 \ @@ -198,6 +200,8 @@ GDB_NM_FILE = @GDB_NM_FILE@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ GNULIB_BTOWC = @GNULIB_BTOWC@ +GNULIB_IMAXABS = @GNULIB_IMAXABS@ +GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_MBRLEN = @GNULIB_MBRLEN@ GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ @@ -236,7 +240,9 @@ GNULIB_STRPBRK = @GNULIB_STRPBRK@ GNULIB_STRSEP = @GNULIB_STRSEP@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ GNULIB_STRSTR = @GNULIB_STRSTR@ +GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ @@ -246,13 +252,17 @@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GREP = @GREP@ GUI_CFLAGS_X = @GUI_CFLAGS_X@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ +HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ +HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ +HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -297,6 +307,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ +INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ +INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ +JIT_READER_DIR = @JIT_READER_DIR@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ @@ -312,12 +325,16 @@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKE = @MAKE@ MAKEINFO = @MAKEINFO@ +MAKEINFOFLAGS = @MAKEINFOFLAGS@ +MAKEINFO_EXTRA_FLAGS = @MAKEINFO_EXTRA_FLAGS@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ +NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_STDINT_H = @NEXT_STDINT_H@ NEXT_STRING_H = @NEXT_STRING_H@ @@ -334,13 +351,19 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKGVERSION = @PKGVERSION@ POSUB = @POSUB@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ +PRIPTR_PREFIX = @PRIPTR_PREFIX@ +PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PROFILE_CFLAGS = @PROFILE_CFLAGS@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ +PYTHON_LIBS = @PYTHON_LIBS@ RANLIB = @RANLIB@ +RDYNAMIC = @RDYNAMIC@ READLINE = @READLINE@ READLINE_CFLAGS = @READLINE_CFLAGS@ READLINE_DEPS = @READLINE_DEPS@ +READLINE_TEXI_INCFLAG = @READLINE_TEXI_INCFLAG@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ @@ -380,8 +403,8 @@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ SYSTEM_GDBINIT = @SYSTEM_GDBINIT@ TARGET_OBS = @TARGET_OBS@ +TARGET_PTR = @TARGET_PTR@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ -TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEPS = @TCL_DEPS@ TCL_INCLUDE = @TCL_INCLUDE@ @@ -408,6 +431,8 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@ TK_STUB_LIB_SPEC = @TK_STUB_LIB_SPEC@ TK_VERSION = @TK_VERSION@ TK_XINCLUDES = @TK_XINCLUDES@ +UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ +UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -473,6 +498,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +python_prog_path = @python_prog_path@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -494,9 +520,10 @@ noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = EXTRA_DIST = m4/gnulib-cache.m4 \ $(top_srcdir)/gnulib/extra/arg-nonnull.h \ - $(top_srcdir)/gnulib/extra/c++defs.h memchr.c memchr.valgrind \ - memmem.c str-two-way.h stddef.in.h stdint.in.h string.in.h \ - $(top_srcdir)/gnulib/extra/warn-on-use.h wchar.in.h + $(top_srcdir)/gnulib/extra/c++defs.h inttypes.in.h memchr.c \ + memchr.valgrind memmem.c str-two-way.h stddef.in.h stdint.in.h \ + string.in.h $(top_srcdir)/gnulib/extra/warn-on-use.h \ + wchar.in.h # The BUILT_SOURCES created by this Makefile snippet are not used via #include # statements but through direct file reference. Therefore this snippet must be @@ -507,13 +534,13 @@ EXTRA_DIST = m4/gnulib-cache.m4 \ # statements but through direct file reference. Therefore this snippet must be # present in all Makefile.am that need it. This is ensured by the applicability # 'all' defined above. -BUILT_SOURCES = arg-nonnull.h c++defs.h $(STDDEF_H) $(STDINT_H) \ - string.h warn-on-use.h wchar.h +BUILT_SOURCES = arg-nonnull.h c++defs.h inttypes.h $(STDDEF_H) \ + $(STDINT_H) string.h warn-on-use.h wchar.h SUFFIXES = MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ - c++defs.h c++defs.h-t stddef.h stddef.h-t stdint.h stdint.h-t \ - string.h string.h-t warn-on-use.h warn-on-use.h-t wchar.h \ - wchar.h-t + c++defs.h c++defs.h-t inttypes.h inttypes.h-t stddef.h \ + stddef.h-t stdint.h stdint.h-t string.h string.h-t \ + warn-on-use.h warn-on-use.h-t wchar.h wchar.h-t MOSTLYCLEANDIRS = CLEANFILES = DISTCLEANFILES = @@ -610,7 +637,7 @@ distclean-compile: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -635,7 +662,7 @@ $(RECURSIVE_TARGETS): fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -940,6 +967,38 @@ c++defs.h: $(top_srcdir)/gnulib/extra/c++defs.h > $@-t && \ mv $@-t $@ +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +inttypes.h: inttypes.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ + -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ + -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ + -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ + -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ + -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ + -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ + -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ + -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ + -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ + -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ + -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ + -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ + -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ + -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ + -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ + -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $(srcdir)/inttypes.in.h; \ + } > $@-t && \ + mv $@-t $@ + # We need the following in order to create when the system # doesn't have one that works with the given compiler. stddef.h: stddef.in.h -- cgit v1.1