This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFA] lmemmem.patch
- From: 'Daniel Jacobowitz' <drow at false dot org>
- To: Pierre Muller <muller at ics dot u-strasbg dot fr>
- Cc: 'Doug Evans' <dje at google dot com>, gdb-patches at sourceware dot org
- Date: Tue, 15 Apr 2008 08:53:44 -0400
- Subject: Re: [RFA] lmemmem.patch
- References: <20080324203738.GC29991@ins.uni-bonn.de> <e394668d0803241346h5006b63du8997cf9e081dc907@mail.gmail.com> <20080324205119.GE29991@ins.uni-bonn.de> <e394668d0803241420w3db1813bj4aa7803b74f3d40b@mail.gmail.com> <20080324212354.GA16323@caradoc.them.org> <e394668d0803241436w5160a2dfodd33d44b174cb9bf@mail.gmail.com> <20080330213540.GA2856@caradoc.them.org> <e394668d0803311033l23a950b5l49e7b411559d0bab@mail.gmail.com> <20080414180543.GB1968@caradoc.them.org> <001201c89eec$a2d2bed0$e8783c70$@u-strasbg.fr>
On Tue, Apr 15, 2008 at 01:34:15PM +0200, Pierre Muller wrote:
> Hi Daniel,
>
> I have a problem for gnulib on cygwin:
> 'aux' seems to be a reserved name for Microsoft Windows OS
> (at least XP, but it probably comes right from Dos...)
> Thus when I do a 'cvs up -d'
> in gdb directory, it fails to
> create the gnulib/aux subdirectory.
>
> I can still compile Cygwin GDB but
> I was wondering if it could become a problem
> later, if gnulib becomes required.
>
>
> Is there any solution for this?
Whoops. Sure, this is easy to fix. This patch (applied) moves the
file to gnulib/extra/.
--
Daniel Jacobowitz
CodeSourcery
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.
Index: gnulib/Makefile.am
===================================================================
RCS file: /cvs/src/src/gdb/gnulib/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- gnulib/Makefile.am 14 Apr 2008 18:05:12 -0000 1.1
+++ gnulib/Makefile.am 15 Apr 2008 12:49:10 -0000
@@ -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
Index: gnulib/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/gnulib/Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.in
--- gnulib/Makefile.in 14 Apr 2008 19:47:29 -0000 1.2
+++ gnulib/Makefile.in 15 Apr 2008 12:49:10 -0000
@@ -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 \
Index: gnulib/aux/link-warning.h
===================================================================
RCS file: gnulib/aux/link-warning.h
diff -N gnulib/aux/link-warning.h
--- gnulib/aux/link-warning.h 14 Apr 2008 18:05:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-/* 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
Index: gnulib/extra/link-warning.h
===================================================================
RCS file: gnulib/extra/link-warning.h
diff -N gnulib/extra/link-warning.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/extra/link-warning.h 15 Apr 2008 12:49:10 -0000
@@ -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
Index: gnulib/m4/gnulib-cache.m4
===================================================================
RCS file: /cvs/src/src/gdb/gnulib/m4/gnulib-cache.m4,v
retrieving revision 1.1
diff -u -p -r1.1 gnulib-cache.m4
--- gnulib/m4/gnulib-cache.m4 14 Apr 2008 18:05:12 -0000 1.1
+++ gnulib/m4/gnulib-cache.m4 15 Apr 2008 12:49:10 -0000
@@ -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([])