aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-06-17 23:17:00 +0200
committerSimon Marchi <simon.marchi@ericsson.com>2017-06-17 23:17:00 +0200
commitcf0dd6f02cd45d6dbb6bd87dde25dd3ed74eb7d0 (patch)
tree8e9d7226b47d9a6c815fcd204b9c8ee3c9d68c49
parent291e62953900e0f4998224127bc56239e421cda9 (diff)
downloadgdb-cf0dd6f02cd45d6dbb6bd87dde25dd3ed74eb7d0.zip
gdb-cf0dd6f02cd45d6dbb6bd87dde25dd3ed74eb7d0.tar.gz
gdb-cf0dd6f02cd45d6dbb6bd87dde25dd3ed74eb7d0.tar.bz2
gdb: Pass -x c++ to the compiler
Because we are compiling .c files containing C++ code, clang++ complains with: clang: error: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated If renaming all the source files to .cpp is out of the question, an alternative is to pass "-x c++" to convince the compiler that we are really compiling C++. It works fine with GCC too. gdb/ChangeLog: * Makefile.in (COMPILE.pre): Add "-x c++". gdb/gdbserver/ChangeLog: * Makefile.in (COMPILE.pre): Add "-x c++".
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/Makefile.in2
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/gdbserver/Makefile.in2
4 files changed, 10 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9062067..2c4f96e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-17 Simon Marchi <simon.marchi@ericsson.com>
+
+ * Makefile.in (COMPILE.pre): Add "-x c++".
+
2017-06-16 Alan Hayward <alan.hayward@arm.com>
Pedro Alves <palves@redhat.com>
Yao Qi <yao.qi@linaro.org>
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5e5fcaa..153a5dd 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -114,7 +114,7 @@ depcomp = $(SHELL) $(srcdir)/../depcomp
# Note that these are overridden by GNU make-specific code below if
# GNU make is used. The overrides implement dependency tracking.
-COMPILE.pre = $(CXX) $(CXX_DIALECT)
+COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT)
COMPILE.post = -c -o $@
COMPILE = $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post)
POSTCOMPILE = @true
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 80240ff..eef680c 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-17 Simon Marchi <simon.marchi@ericsson.com>
+
+ * Makefile.in (COMPILE.pre): Add "-x c++".
+
2017-06-09 Sergio Durigan Junior <sergiodj@redhat.com>
* fork-child.c: Conditionally include <signal.h>.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 834425d..4a031e1 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -65,7 +65,7 @@ depcomp = $(SHELL) $(srcdir)/../depcomp
# Note that these are overridden by GNU make-specific code below if
# GNU make is used. The overrides implement dependency tracking.
-COMPILE.pre = $(CXX) $(CXX_DIALECT)
+COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT)
COMPILE.post = -c -o $@
COMPILE = $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post)
POSTCOMPILE = @true