From 9a35ccf756dbb1f6286edb054fd868a9cb0be262 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 2 Sep 2010 13:58:06 +0000 Subject: [PATCH] gdb/ * Makefile.in (GDB_WARN_CFLAGS_NO_FORMAT): Convert it to the no- form. (monitor.o): Replace $(INTERNAL_WARN_CFLAGS) by $(INTERNAL_CFLAGS) and add $(GDB_WARN_CFLAGS_NO_FORMAT). (printcmd.o): Replace $(INTERNAL_CFLAGS_BASE) by $(INTERNAL_CFLAGS). --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 87b3977925..85ba40e5b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2010-09-02 Jan Kratochvil + + * Makefile.in (GDB_WARN_CFLAGS_NO_FORMAT): Convert it to the no- form. + (monitor.o): Replace $(INTERNAL_WARN_CFLAGS) by $(INTERNAL_CFLAGS) and + add $(GDB_WARN_CFLAGS_NO_FORMAT). + (printcmd.o): Replace $(INTERNAL_CFLAGS_BASE) by $(INTERNAL_CFLAGS). + 2010-09-02 Yao Qi * linux-nat.c (status_to_str): Use WTERMSIG to extract the signal diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f07bc8b82f..e5eee0626f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -155,7 +155,8 @@ WERROR_CFLAGS = @WERROR_CFLAGS@ GDB_WARN_CFLAGS = $(WARN_CFLAGS) GDB_WERROR_CFLAGS = $(WERROR_CFLAGS) -GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " | sed "s/ -Wformat-nonliteral / /g"` +GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " \ + | sed "s/ -Wformat-nonliteral / -Wno-format-nonliteral /g"` RDYNAMIC = @RDYNAMIC@ @@ -1531,14 +1532,15 @@ main.o: $(srcdir)/main.c # definitly will not work. "monitor.c" needs to be rewritten so that # it doesn't use format strings and instead uses callbacks. monitor.o: $(srcdir)/monitor.c - $(COMPILE.pre) $(INTERNAL_WARN_CFLAGS) $(COMPILE.post) $(srcdir)/monitor.c + $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \ + $(COMPILE.post) $(srcdir)/monitor.c $(POSTCOMPILE) # Do not try to build "printcmd.c" with -Wformat-nonliteral. It manually # checks format strings. printcmd.o: $(srcdir)/printcmd.c - $(COMPILE.pre) $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS_NO_FORMAT) \ - $(GDB_WERROR_CFLAGS) $(COMPILE.post) $(srcdir)/printcmd.c + $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \ + $(COMPILE.post) $(srcdir)/printcmd.c $(POSTCOMPILE) # Message files. Based on code in gcc/Makefile.in.