From a8a5dbcab8df0b3a9e04745d4fe8d64740acb323 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 26 Sep 2018 06:54:17 -0600 Subject: 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 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. --- gdb/or1k-tdep.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/or1k-tdep.h') diff --git a/gdb/or1k-tdep.h b/gdb/or1k-tdep.h index 4a93540..b630c77 100644 --- a/gdb/or1k-tdep.h +++ b/gdb/or1k-tdep.h @@ -24,8 +24,8 @@ #define TARGET_OR1K #endif -#include "opcodes/or1k-desc.h" -#include "opcodes/or1k-opc.h" +#include "../opcodes/or1k-desc.h" +#include "../opcodes/or1k-opc.h" /* General Purpose Registers */ #define OR1K_ZERO_REGNUM 0 -- cgit v1.1