aboutsummaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
authorManoj Gupta <manojgupta@google.com>2023-04-17 13:33:15 -0700
committerRoland McGrath <mcgrathr@google.com>2023-04-29 00:35:11 -0700
commite0f4b3ec5f36ff90dbea21aab2190fb4565ca67b (patch)
tree4bc6cccc146f7213100c5f1fc9642a3eb63fbdb4 /gdb/tui
parentbc752bfbd98b6c2b02d59ed0a6c7ca88fbf4e3e0 (diff)
downloadbinutils-e0f4b3ec5f36ff90dbea21aab2190fb4565ca67b.zip
binutils-e0f4b3ec5f36ff90dbea21aab2190fb4565ca67b.tar.gz
binutils-e0f4b3ec5f36ff90dbea21aab2190fb4565ca67b.tar.bz2
gdb: Fix building with latest libc++
Latest libc++[1] causes transitive include to <locale> when <mutex> or <thread> header is included. This causes gdb to not build[2] since <locale> defines isupper/islower etc. functions that are explicitly macroed-out in safe-ctype.h to prevent their use. Use the suggestion from libc++ to include <locale> internally when building in C++ mode to avoid build errors. Use safe-gdb-ctype.h as the include instead of "safe-ctype.h" to keep this isolated to gdb since rest of binutils does not seem to use much C++. [1]: https://reviews.llvm.org/D144331 [2]: https://issuetracker.google.com/issues/277967395
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-layout.c2
-rw-r--r--gdb/tui/tui-winsource.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 01d243b..50c568f 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -43,7 +43,7 @@
#include "tui/tui-layout.h"
#include "tui/tui-source.h"
#include "gdb_curses.h"
-#include "safe-ctype.h"
+#include "gdbsupport/gdb-safe-ctype.h"
static void extract_display_start_addr (struct gdbarch **, CORE_ADDR *);
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 84f9d97..3c4ce50 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -28,7 +28,7 @@
#include "source.h"
#include "objfiles.h"
#include "filenames.h"
-#include "safe-ctype.h"
+#include "gdbsupport/gdb-safe-ctype.h"
#include "tui/tui.h"
#include "tui/tui-data.h"