diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa5be9d918a..87eac7e8f41 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 321441d0179..d5b718a2358 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>