From d0ac9ef8228ce646a46e0df7e9b70228489454de Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sat, 18 Dec 2004 14:27:57 +0000
Subject: [PATCH] * solib-pa64.c: Only include <dlfcn.h>, <elf.h> and
 <elf_hp.h> if PA_SOM_ONLY isn't defined.

---
 gdb/ChangeLog    | 3 +++
 gdb/solib-pa64.c | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 87edaaae875..08f288bceeb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-18  Mark Kettenis  <kettenis@gnu.org>
 
+	* solib-pa64.c: Only include <dlfcn.h>, <elf.h> and <elf_hp.h> if
+	PA_SOM_ONLY isn't defined.
+
 	* somread.c: Include "solib-som.h".
 	(som_symfile_init, som_new_init, som_symfile_read,
 	som_symfile_finish, som_symtab_read, som_symfile_offsets): Remove
diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c
index 0f20a544f25..f18c992301b 100644
--- a/gdb/solib-pa64.c
+++ b/gdb/solib-pa64.c
@@ -31,9 +31,6 @@
    same functionality in all their libraries!  */
 
 #include "defs.h"
-#include <dlfcn.h>
-#include <elf.h>
-#include <elf_hp.h>
 #include "symtab.h"
 #include "bfd.h"
 #include "symfile.h"
@@ -51,6 +48,11 @@
 /* If we are building for a SOM-only target, then we don't need this.  */
 #ifndef PA_SOM_ONLY
 
+/* FIXME: kettenis/20041213: These includes should be eliminated.  */
+#include <dlfcn.h>
+#include <elf.h>
+#include <elf_hp.h>
+
 struct lm_info {
   struct load_module_desc desc;
   CORE_ADDR desc_addr;
-- 
2.30.2