diff options
| author | Tom Tromey <tom@tromey.com> | 2018-09-26 06:54:17 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-10-06 22:46:56 -0600 |
| commit | a8a5dbcab8df0b3a9e04745d4fe8d64740acb323 (patch) | |
| tree | b61a60b157158db8b066c30de7fe84b6855a962f /gdb/Makefile.in | |
| parent | 2a8be20359dba9cc684fd3ffa222d985399f3b18 (diff) | |
| download | gdb-a8a5dbcab8df0b3a9e04745d4fe8d64740acb323.zip gdb-a8a5dbcab8df0b3a9e04745d4fe8d64740acb323.tar.gz gdb-a8a5dbcab8df0b3a9e04745d4fe8d64740acb323.tar.bz2 | |
Do not accidentally include in-tree readline headers
PR build/17077 points out that when --with-system-readline is given,
gdb will still pick up the in-tree readline headers. Normally this is
not a big problem, because readline is very stable and so the ABI does
not change much; but it is clearly a bug to do this, and could bite at
some point.
The basic problem is that OPCODES_CFLAGS uses -I$(OPCODES_SRC)/.. so
that #include "opcodes/..." works. However, this also makes it so the
This patch fixes the problem in a mildly hacky way: remove the
offending -I option, and change gdb to use #include "../opcodes/..."
instead. This continues to make it clear where the header comes from,
without allowing incorrect behavior.
Tested by rebuilding and then looking at the *.Po files.
gdb/ChangeLog
2018-10-06 Tom Tromey <tom@tromey.com>
PR build/17077:
* Makefile.in (OPCODES_CFLAGS): Remove "-I$(OPCODES_SRC)/..".
* arc-tdep.c, frv-tdep.c, lm32-tdep.c, mep-tdep.c,
microblaze-tdep.c, or1k-tdep.h: Use ../opcodes, not opcodes, in
#include.
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 8d780ac..5b3a952 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -446,8 +446,7 @@ OPCODES = $(OPCODES_DIR)/libopcodes.a # Where are the other opcode tables which only have header file # versions? OP_INCLUDE = $(INCLUDE_DIR)/opcode -# Some source files like to use #include "opcodes/file.h" -OPCODES_CFLAGS = -I$(OP_INCLUDE) -I$(OPCODES_SRC)/.. +OPCODES_CFLAGS = -I$(OP_INCLUDE) # The simulator is usually nonexistent; targets that include one # should set this to list all the .o or .a files to be linked in. |