summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--localedata/ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/ia64/getsysstats.c36
3 files changed, 11 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c75c3d08d..42bbb7e8a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/getsysstats.c: Removed.  We can use
+	the generic parser now.
+
 2000-06-28  Jes Sorensen  <jes@linuxcare.com>
 
 	* sysdeps/unix/sysv/linux/ia64/bits/elfclass.h: Deleted.  Hash
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8e04b16c73..4919eab510 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-28  Jakub Jelinek  <jakub@redhat.com>
+
+	* locales/fr_FR: Update for new format.
+	* locales/de_AT: Likewise.
+	* locales/en_GB: Likewise.
+
 2000-06-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/th_TH: Update copyright notice.
@@ -46,8 +52,6 @@
 
 	* tests-mbwc/tgn_locdef.h (TST_LOC_de_UTF8): Added.
 
-	* tests-mbwc/tgn_locdef.h (TST_LOC_de_UTF8): Added.
-
 2000-06-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* tests-mbwc/dat_iswcntrl.c: U0000 is not in class cntrl.
diff --git a/sysdeps/unix/sysv/linux/ia64/getsysstats.c b/sysdeps/unix/sysv/linux/ia64/getsysstats.c
deleted file mode 100644
index db5798f7a7..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/getsysstats.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Determine various system internal values.  Linux/ia64 version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Dan Pop <Dan.Pop@cern.ch>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* We need to define a special parser for /proc/cpuinfo.  */
-#define GET_NPROCS_PARSER(FP, BUFFER, RESULT)				\
-  do                                                                    \
-    {                                                                   \
-      (RESULT) = 0;                                                     \
-      /* Read all lines and count the lines starting with the string    \
-         "CPU#".  We don't have to fear extremely long lines since 	\
-         the kernel will not generate them.  8192 bytes are really      \
-         enough.  */                                                    \
-      while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL)      \
-        if (strncmp (BUFFER, "CPU#", 4) == 0)                      	\
-          ++(RESULT);                                                   \
-    }                                                                   \
-  while (0)
-
-#include <sysdeps/unix/sysv/linux/getsysstats.c>