aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2008-04-15 12:53:19 +0000
committerDaniel Jacobowitz <drow@false.org>2008-04-15 12:53:19 +0000
commit4d7b71aacd51e59961bc2be6aee7e01ee1b34d57 (patch)
treefc9fe1332e00b149d75fde1b4089f4cfe29256b5
parentadd386939dc6fd6b7e5012a89b02e5da4957b787 (diff)
downloadgdb-4d7b71aacd51e59961bc2be6aee7e01ee1b34d57.zip
gdb-4d7b71aacd51e59961bc2be6aee7e01ee1b34d57.tar.gz
gdb-4d7b71aacd51e59961bc2be6aee7e01ee1b34d57.tar.bz2
* gnulib/Makefile.am, gnulib/m4/gnulib-cache.m4,
gnulib/aux/link-warning.h, gnulib/extra/link-warning.h: Adjust by rerunning gnulib-tool with --aux-dir=gnulib/extra. * gnulib/Makefile.in: Regenerate.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/gnulib/Makefile.am6
-rw-r--r--gdb/gnulib/Makefile.in11
-rw-r--r--gdb/gnulib/extra/link-warning.h28
-rw-r--r--gdb/gnulib/m4/gnulib-cache.m42
5 files changed, 45 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7d964a8..983efe8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-15 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * gnulib/Makefile.am, gnulib/m4/gnulib-cache.m4,
+ gnulib/aux/link-warning.h, gnulib/extra/link-warning.h: Adjust
+ by rerunning gnulib-tool with --aux-dir=gnulib/extra.
+ * gnulib/Makefile.in: Regenerate.
+
2008-04-14 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.in (GNULIB_H): New. Trigger all-lib.
diff --git a/gdb/gnulib/Makefile.am b/gdb/gnulib/Makefile.am
index 64c26fe..810723c 100644
--- a/gdb/gnulib/Makefile.am
+++ b/gdb/gnulib/Makefile.am
@@ -9,7 +9,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 --aux-dir=gnulib/aux --no-libtool --macro-prefix=gl memmem
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl memmem
AUTOMAKE_OPTIONS = 1.5 gnits
@@ -36,9 +36,9 @@ EXTRA_libgnu_a_SOURCES =
## begin gnulib module link-warning
-LINK_WARNING_H=$(top_srcdir)/gnulib/aux/link-warning.h
+LINK_WARNING_H=$(top_srcdir)/gnulib/extra/link-warning.h
-EXTRA_DIST += $(top_srcdir)/gnulib/aux/link-warning.h
+EXTRA_DIST += $(top_srcdir)/gnulib/extra/link-warning.h
## end gnulib module link-warning
diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/Makefile.in
index 84710ed..2b1a924 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 --aux-dir=gnulib/aux --no-libtool --macro-prefix=gl memmem
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl memmem
@@ -390,8 +390,9 @@ AUTOMAKE_OPTIONS = 1.5 gnits
noinst_HEADERS =
noinst_LIBRARIES = libgnu.a
noinst_LTLIBRARIES =
-EXTRA_DIST = $(top_srcdir)/gnulib/aux/link-warning.h memchr.c memcmp.c \
- memmem.c str-two-way.h stdint.in.h string.in.h wchar.in.h
+EXTRA_DIST = $(top_srcdir)/gnulib/extra/link-warning.h memchr.c \
+ memcmp.c memmem.c str-two-way.h stdint.in.h string.in.h \
+ wchar.in.h
BUILT_SOURCES = $(STDINT_H) string.h $(WCHAR_H)
SUFFIXES =
MOSTLYCLEANFILES = core *.stackdump stdint.h stdint.h-t string.h \
@@ -405,7 +406,7 @@ libgnu_a_SOURCES = dummy.c
libgnu_a_LIBADD = $(gl_LIBOBJS)
libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
EXTRA_libgnu_a_SOURCES = memchr.c memcmp.c memmem.c
-LINK_WARNING_H = $(top_srcdir)/gnulib/aux/link-warning.h
+LINK_WARNING_H = $(top_srcdir)/gnulib/extra/link-warning.h
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -532,7 +533,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(top_srcdir)/gnulib/aux
+ $(mkdir_p) $(distdir)/$(top_srcdir)/gnulib/extra
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
diff --git a/gdb/gnulib/extra/link-warning.h b/gdb/gnulib/extra/link-warning.h
new file mode 100644
index 0000000..fda0194
--- /dev/null
+++ b/gdb/gnulib/extra/link-warning.h
@@ -0,0 +1,28 @@
+/* GL_LINK_WARNING("literal string") arranges to emit the literal string as
+ a linker warning on most glibc systems.
+ We use a linker warning rather than a preprocessor warning, because
+ #warning cannot be used inside macros. */
+#ifndef GL_LINK_WARNING
+ /* This works on platforms with GNU ld and ELF object format.
+ Testing __GLIBC__ is sufficient for asserting that GNU ld is in use.
+ Testing __ELF__ guarantees the ELF object format.
+ Testing __GNUC__ is necessary for the compound expression syntax. */
+# if defined __GLIBC__ && defined __ELF__ && defined __GNUC__
+# define GL_LINK_WARNING(message) \
+ GL_LINK_WARNING1 (__FILE__, __LINE__, message)
+# define GL_LINK_WARNING1(file, line, message) \
+ GL_LINK_WARNING2 (file, line, message) /* macroexpand file and line */
+# define GL_LINK_WARNING2(file, line, message) \
+ GL_LINK_WARNING3 (file ":" #line ": warning: " message)
+# define GL_LINK_WARNING3(message) \
+ ({ static const char warning[sizeof (message)] \
+ __attribute__ ((__unused__, \
+ __section__ (".gnu.warning"), \
+ __aligned__ (1))) \
+ = message "\n"; \
+ (void)0; \
+ })
+# else
+# define GL_LINK_WARNING(message) ((void) 0)
+# endif
+#endif
diff --git a/gdb/gnulib/m4/gnulib-cache.m4 b/gdb/gnulib/m4/gnulib-cache.m4
index 9f62256..3821557 100644
--- a/gdb/gnulib/m4/gnulib-cache.m4
+++ b/gdb/gnulib/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=gnulib/aux --no-libtool --macro-prefix=gl memmem
+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=gnulib/extra --no-libtool --macro-prefix=gl memmem
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([])