From 2e991591c97c2b2de34eab412ca5c6082d8d2b9b Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Tue, 5 Aug 2008 21:10:29 +0000
Subject: [PATCH] 2008-08-04  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>

	PR build/2490
	* solib-pa64.c: Only compile if both HAVE_ELF_HP_H and __LP64__ are
	defined.
---
 gdb/ChangeLog    | 6 ++++++
 gdb/solib-pa64.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa5be9d918..87eac7e8f4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-04  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR build/2490
+	* solib-pa64.c: Only compile if both HAVE_ELF_HP_H and __LP64__ are
+	defined.
+
 2008-08-05  Tom Tromey  <tromey@redhat.com>
 
 	* bcache.c (deprecated_bcache_added): Initialize obstack.
diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c
index 321441d017..d5b718a235 100644
--- a/gdb/solib-pa64.c
+++ b/gdb/solib-pa64.c
@@ -46,7 +46,7 @@
 
 /* We can build this file only when running natively on 64-bit HP/UX.
    We check for that by checking for the elf_hp.h header file.  */
-#ifdef HAVE_ELF_HP_H
+#if defined(HAVE_ELF_HP_H) && defined(__LP64__)
 
 /* FIXME: kettenis/20041213: These includes should be eliminated.  */
 #include <dlfcn.h>
-- 
2.11.0