diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-09-02 13:58:06 +0000 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2010-09-02 13:58:06 +0000 |
commit | 9a35ccf756dbb1f6286edb054fd868a9cb0be262 (patch) | |
tree | a495a6c0a4b14740651f9502c0227e1ab973b70d /gdb | |
parent | ba9b2ec30d6e7ab0ab09d10107b40e0f4071b70f (diff) | |
download | gdb-9a35ccf756dbb1f6286edb054fd868a9cb0be262.zip gdb-9a35ccf756dbb1f6286edb054fd868a9cb0be262.tar.gz gdb-9a35ccf756dbb1f6286edb054fd868a9cb0be262.tar.bz2 |
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).
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/Makefile.in | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 87b3977..85ba40e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2010-09-02 Jan Kratochvil <jan.kratochvil@redhat.com> + + * 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 <yao@codesourcery.com> * linux-nat.c (status_to_str): Use WTERMSIG to extract the signal diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f07bc8b..e5eee06 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. |