* 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).
This commit is contained in:
Jan Kratochvil 2010-09-02 13:58:06 +00:00
parent ba9b2ec30d
commit 9a35ccf756
2 changed files with 13 additions and 4 deletions

View File

@ -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> 2010-09-02 Yao Qi <yao@codesourcery.com>
* linux-nat.c (status_to_str): Use WTERMSIG to extract the signal * linux-nat.c (status_to_str): Use WTERMSIG to extract the signal

View File

@ -155,7 +155,8 @@ WERROR_CFLAGS = @WERROR_CFLAGS@
GDB_WARN_CFLAGS = $(WARN_CFLAGS) GDB_WARN_CFLAGS = $(WARN_CFLAGS)
GDB_WERROR_CFLAGS = $(WERROR_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@ RDYNAMIC = @RDYNAMIC@
@ -1531,14 +1532,15 @@ main.o: $(srcdir)/main.c
# definitly will not work. "monitor.c" needs to be rewritten so that # definitly will not work. "monitor.c" needs to be rewritten so that
# it doesn't use format strings and instead uses callbacks. # it doesn't use format strings and instead uses callbacks.
monitor.o: $(srcdir)/monitor.c 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) $(POSTCOMPILE)
# Do not try to build "printcmd.c" with -Wformat-nonliteral. It manually # Do not try to build "printcmd.c" with -Wformat-nonliteral. It manually
# checks format strings. # checks format strings.
printcmd.o: $(srcdir)/printcmd.c printcmd.o: $(srcdir)/printcmd.c
$(COMPILE.pre) $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS_NO_FORMAT) \ $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \
$(GDB_WERROR_CFLAGS) $(COMPILE.post) $(srcdir)/printcmd.c $(COMPILE.post) $(srcdir)/printcmd.c
$(POSTCOMPILE) $(POSTCOMPILE)
# Message files. Based on code in gcc/Makefile.in. # Message files. Based on code in gcc/Makefile.in.