From b1c896b365f2dbcd14145a88d103623244cf0fb0 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Wed, 14 Aug 2019 08:40:18 -0600
Subject: [PATCH] Fix gdb build on macOS

Internal testing showed that the macOS port did not build.  The
breakage was caused by the patch to remove the gdbarch.h include from
defs.h.  This patch fixes the problem.

gdb/ChangeLog
2019-08-14  Tom Tromey  <tromey@adacore.com>

	* darwin-nat.c: Include gdbarch.h.
	* darwin-nat-info.c: Include gdbarch.h.
---
 gdb/ChangeLog         | 5 +++++
 gdb/darwin-nat-info.c | 1 +
 gdb/darwin-nat.c      | 1 +
 3 files changed, 7 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b7dabb6aad..15904da82cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-14  Tom Tromey  <tromey@adacore.com>
+
+	* darwin-nat.c: Include gdbarch.h.
+	* darwin-nat-info.c: Include gdbarch.h.
+
 2019-08-13  Tom Tromey  <tom@tromey.com>
 
 	* tui/tui-data.h (struct tui_gen_win_info) <last_visible_line>:
diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 103ac2a9773..4469cd52136 100644
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -34,6 +34,7 @@
 #include "value.h"
 #include "gdbcmd.h"
 #include "inferior.h"
+#include "gdbarch.h"
 
 #include <sys/sysctl.h>
 
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index f890e13944c..8f71def069d 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -37,6 +37,7 @@
 #include "arch-utils.h"
 #include "bfd.h"
 #include "bfd/mach-o.h"
+#include "gdbarch.h"
 
 #include <copyfile.h>
 #include <sys/ptrace.h>
-- 
2.30.2