From eff1410f2bf0e295ffd7cbd2848af76fedfa0c62 Mon Sep 17 00:00:00 2001 From: gdbadmin Date: Wed, 1 Sep 2010 01:56:04 +0000 Subject: [PATCH] Compile memmem.o without -Werror. This reproduces the same approach as in GDB to allow us to build specific files without -Werror. gdb/gdbserver/ChangeLog: * Makefile.in (INTERNAL_CFLAGS_BASE): New variable. Extracted from INTERNAL_CFLAGS. (INTERNAL_WARN_CFLAGS): New variable. (INTERNAL_CFLAGS): Adjust, using INTERNAL_WARN_CFLAGS. --- gdb/ChangeLog | 4 ++++ gdb/gdbserver/Makefile.in | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 870ee54a96d..25127af90fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2010-09-01 Joel Brobecker + + * Makefile.in (memmem.o): Build with -Wno-error. + 2010-09-01 Joel Brobecker * utils.c (xsnprintf): Make non-static. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index e397bd7682f..ffbb14a88e9 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -94,8 +94,10 @@ WERROR_CFLAGS = @WERROR_CFLAGS@ CFLAGS = @CFLAGS@ # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) ${CFLAGS} ${GLOBAL_CFLAGS} \ +INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} +INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) # LDFLAGS is specifically reserved for setting from the command line # when running make. @@ -347,8 +349,13 @@ gdbreplay.o: gdbreplay.c config.h signals.o: ../common/signals.c $(server_h) $(signals_def) $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER +# We build memmem.c without -Werror because this file is not under +# our control. On LynxOS, the compiler generates some warnings +# because str-two-way.h uses a constant (MAX_SIZE) whose definition +# makes it ambiguous whether it is signed or unsigned ("warning: this +# decimal constant is unsigned only in ISO C90"). memmem.o: ../gnulib/memmem.c - $(CC) -o memmem.o -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< + $(CC) -o memmem.o -c $(CPPFLAGS) $(INTERNAL_WARN_CFLAGS) $< i386_low_h = $(srcdir)/i386-low.h -- 2.30.2