diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 529f39524a3..368b6137ec5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-11  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* config/os/gnu-linux/bits/os_defines.h (__glibcpp_long_bits): Define
+	to 64 for hppa 64-bit port.
+	(__glibcpp_long_double_bits): Define to 64 for all hppa ports.
+
 2002-05-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* acinclude.m4 (enable_symvers): Quote $LD.
diff --git a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
index d5ed77cde44..4405660f0e4 100644
--- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
@@ -65,11 +65,11 @@ typedef __loff_t __off64_t;
 #define __NO_STRING_INLINES
 #endif
 
-#if defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__))
+#if (defined(__hppa__) && defined(__LP64__)) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__))
 #define __glibcpp_long_bits 64
 #endif
 
-#if defined(__sparc__) && !defined(__arch64__)
+#if defined(__hppa__) || (defined(__sparc__) && !defined(__arch64__))
 #define __glibcpp_long_double_bits 64
 #endif