diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/Makefile.in | 10 | ||||
| -rw-r--r-- | gdbserver/ChangeLog | 9 | ||||
| -rw-r--r-- | gdbserver/Makefile.in | 14 |
4 files changed, 33 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3e72d92..48ab2e0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-10-07 Simon Marchi <simon.marchi@efficios.com> + + * Makefile.in (COMPILE): Add CXXFLAGS. + (INTERNAL_CFLAGS_BASE): Remove CXXFLAGS. + (check-headers): Add CXXFLAGS. + 2020-10-07 Anton Kolesov <anton.kolesov@synopsys.com> * arc-linux-tdep.h: New file. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index afce262..e14d41c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -118,9 +118,13 @@ include $(srcdir)/silent-rules.mk # GNU make is used. The overrides implement dependency tracking. COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT) COMPILE.post = -c -o $@ -COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post) POSTCOMPILE = @true +# CXXFLAGS is at the very end on purpose, so that user-supplied flags can +# override internal flags. +COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) \ + $(COMPILE.post) + YACC = @YACC@ # This is used to rebuild ada-lex.c from ada-lex.l. If the program is @@ -598,7 +602,7 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \ # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. INTERNAL_CFLAGS_BASE = \ - $(CXXFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ + $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \ $(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(ENABLE_CFLAGS) \ @@ -1712,7 +1716,7 @@ check-headers: @echo Checking headers. for i in $(CHECK_HEADERS) ; do \ $(CXX) $(CXX_DIALECT) -x c++-header -c -fsyntax-only \ - $(INTERNAL_CFLAGS) -include defs.h $(srcdir)/$$i ; \ + $(INTERNAL_CFLAGS) $(CXXFLAGS) -include defs.h $(srcdir)/$$i ; \ done .PHONY: check-headers diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 5ff195c..94f1a75 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,12 @@ +2020-10-07 Simon Marchi <simon.marchi@efficios.com> + + * Makefile.in (COMPILE): Add CXXFLAGS. + (INTERNAL_CFLAGS_BASE): Remove CXXFLAGS. + (gdbserver$(EXEEXT)): Add CXXFLAGS. + (gdbreplay$(EXEEXT)): Add CXXFLAGS. + ($(IPA_LIB)): Add CXXFLAGS. + (IPAGENT_COMPILE): Add CXXFLAGS. + 2020-10-07 Anton Kolesov <anton.kolesov@synopsys.com> * configure.srv: Support ARC architecture. diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index fc68f06..c8cfed4 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -83,9 +83,12 @@ include $(srcdir)/../gdb/silent-rules.mk # GNU make is used. The overrides implement dependency tracking. COMPILE.pre = $(CXX) $(CXX_DIALECT) COMPILE.post = -c -o $@ -COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post) POSTCOMPILE = @true +# CXXFLAGS is at the very end on purpose, so that user-supplied flags can +# override internal flags. +COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) $(COMPILE.post) + # It is also possible that you will need to add -I/usr/include/sys to the # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which # is where it should be according to Posix). @@ -158,7 +161,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ WIN32APILIBS = @WIN32APILIBS@ # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ +INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER @@ -355,6 +358,7 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ $(INTL_DEPS) $(GDBSUPPORT) $(SILENCE) rm -f gdbserver$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ -o gdbserver$(EXEEXT) $(OBS) $(GDBSUPPORT) $(LIBGNU) \ $(LIBIBERTY) $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) \ $(WIN32APILIBS) @@ -363,6 +367,7 @@ gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ $(INTL_DEPS) $(GDBSUPPORT) $(SILENCE) rm -f gdbreplay$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) \ $(GDBSUPPORT) $(LIBGNU) $(LIBIBERTY) $(INTL) \ $(WIN32APILIBS) @@ -390,6 +395,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} $(SILENCE) rm -f $(IPA_LIB) $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ + $(CXXFLAGS) \ -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread # Put the proper machine-specific files first, so M-. on a machine @@ -485,7 +491,9 @@ IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \ -fPIC -DIN_PROCESS_AGENT \ -fvisibility=hidden -IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post) +# CXXFLAGS is at the very end on purpose, so that user-supplied flags can +# override internal flags. +IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(CXXFLAGS) $(COMPILE.post) # Rules for special cases. |