Update.

2004-08-26  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/mips/pread.c: Include sgidefs.h only if
	NO_SGIDEFS_H isn't defined.
	* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.

	* sysdeps/unix/sysv/linux/sh/pread.c: Define NO_SGIDEFS_H and
	_MIPS_SIM.
	* sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/sh/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.

	* nscd/connections.c (nscd_run): atomic_increment was not missing.

diff --git a/ChangeLog b/ChangeLog
index e851efeea9efecf1089b8d0e42138d165860a151..d1b41045badc2993eccfe5018444f6f7c5020898 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
+2004-08-26  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+       * sysdeps/unix/sysv/linux/mips/pread.c: Include sgidefs.h only if
+       NO_SGIDEFS_H isn't defined.
+       * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
+       * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
+
+       * sysdeps/unix/sysv/linux/sh/pread.c: Define NO_SGIDEFS_H and
+       _MIPS_SIM.
+       * sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise.
+       * sysdeps/unix/sysv/linux/sh/pread64.c: Likewise.
+       * sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.
+
 2004-08-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * nscd/connections.c (nscd_run): atomic_increment was not missing.
+
        * sysdeps/gnu/Makefile (libdl-sysdep_routines): Don't add eval.
        Patch by Greg Schafer.
 

diff --git a/nscd/connections.c b/nscd/connections.c
index 0018ed9ec71fe868fc054b25d96a94eeb846cbe4..313ca0dc45c3d0215590b886d633e36f1a4a280b 100644 (file)
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -484,7 +484,6 @@ nscd_run (void *p)
              prune_cache (&dbs[my_number], time(NULL));
              now = time (NULL);
              next_prune = now + CACHE_PRUNE_INTERVAL;
-             atomic_increment (&nready);
              goto try_get;
            }
        }

diff --git a/sysdeps/unix/sysv/linux/mips/pread.c b/sysdeps/unix/sysv/linux/mips/pread.c
index d2a6c69db5367131f94f49d720264fdd7c7596c9..8fba0340b84cb84c026ba9fa0190b838231acb33 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/pread.c
+++ b/sysdeps/unix/sysv/linux/mips/pread.c
@@ -28,7 +28,9 @@
 #include <bp-checks.h>
 
 #include <kernel-features.h>
+#ifndef NO_SGIDEFS_H
 #include <sgidefs.h>
+#endif
 
 #ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pread

diff --git a/sysdeps/unix/sysv/linux/mips/pread64.c b/sysdeps/unix/sysv/linux/mips/pread64.c
index b63bb9c2aa4c96257bdd4dc12f5dfcba3d2e8794..238c8e0d8b80018aabd440ed34d810631e17308d 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/pread64.c
+++ b/sysdeps/unix/sysv/linux/mips/pread64.c
@@ -27,7 +27,9 @@
 #include <bp-checks.h>
 
 #include <kernel-features.h>
+#ifndef NO_SGIDEFS_H
 #include <sgidefs.h>
+#endif
 
 #ifdef __NR_pread64             /* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pread

diff --git a/sysdeps/unix/sysv/linux/mips/pwrite.c b/sysdeps/unix/sysv/linux/mips/pwrite.c
index 50c82652367d9bbecad387ab1507d5b829543e06..d0e3fe538e8effa9325555be6808b736e4c1037b 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/pwrite.c
+++ b/sysdeps/unix/sysv/linux/mips/pwrite.c
@@ -28,7 +28,9 @@
 #include <bp-checks.h>
 
 #include <kernel-features.h>
+#ifndef NO_SGIDEFS_H
 #include <sgidefs.h>
+#endif
 
 #ifdef __NR_pwrite64            /* Newer kernels renamed but it's the same.  */
 # ifdef __NR_pwrite

diff --git a/sysdeps/unix/sysv/linux/sh/pread.c b/sysdeps/unix/sysv/linux/sh/pread.c
index 20f715c1bcfb942acf151b6e4c3081ff486d2c52..9ded53ebaa03cf3dd6014e08b4dd91bfe904f577 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pread.c
+++ b/sysdeps/unix/sysv/linux/sh/pread.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pread.c>

diff --git a/sysdeps/unix/sysv/linux/sh/pread64.c b/sysdeps/unix/sysv/linux/sh/pread64.c
index 7f89f39b010ddf1c0cd3875b0081f23529957cf6..5b22a395ecf5b02620494a163772c998cf5bc9dc 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pread64.c
+++ b/sysdeps/unix/sysv/linux/sh/pread64.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pread64.c>

diff --git a/sysdeps/unix/sysv/linux/sh/pwrite.c b/sysdeps/unix/sysv/linux/sh/pwrite.c
index 0338b874557cde9fff79c981d414115f9fa2d97f..b75a6a968e77e5d2b6a6a78e47d03cf86a86453a 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pwrite.c
+++ b/sysdeps/unix/sysv/linux/sh/pwrite.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pwrite.c>

diff --git a/sysdeps/unix/sysv/linux/sh/pwrite64.c b/sysdeps/unix/sysv/linux/sh/pwrite64.c
index 0a8c1ead324cefab82f67c1dfcd350f556fefe63..ae29280f8517dd98b82c0801183a3920dc1b4c99 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/sh/pwrite64.c
@@ -1 +1,3 @@
+#define NO_SGIDEFS_H
+#define _MIPS_SIM -1
 #include <sysdeps/unix/sysv/linux/mips/pwrite64.c>