From: DJ Delorie <dj@redhat.com>
Date: Mon, 24 Feb 2003 20:26:14 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: binutils-2_14-branchpoint~720
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=181fa2295185bcf5a113d6657fc23f723fa01a09;p=external%2Fbinutils.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index d15e15a..552355c 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* physmem.c (physmem_total) [HAVE_GETSYSINFO]: Test for
+	GSI_PHYSMEM.
+	(physmem_available) [HAVE_TABLE]: Test for TBL_VMSTATS.
+
 2003-02-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* configure.in: Check for sys/systemcfg.h and
diff --git a/libiberty/physmem.c b/libiberty/physmem.c
index 80fdd79..621e281 100644
--- a/libiberty/physmem.c
+++ b/libiberty/physmem.c
@@ -97,7 +97,7 @@ physmem_total ()
   }
 #endif
 
-#if HAVE_GETSYSINFO
+#if HAVE_GETSYSINFO && defined GSI_PHYSMEM
   { /* This works on Tru64 UNIX V4/5.  */
     int physmem;
 
@@ -174,7 +174,7 @@ physmem_available ()
   }
 #endif
 
-#if HAVE_TABLE && HAVE_SYS_TABLE_H
+#if HAVE_TABLE && defined TBL_VMSTATS
   { /* This works on Tru64 UNIX V4/5.  */
     struct tbl_vmstats vmstats;