Fix atomic.h warnings on i386 in nscd.

Fix last grouplist patch.

diff --git a/grp/initgroups.c b/grp/initgroups.c
index f86f5c63f45cb6286b12a31ebec329a16c3b6394..5a3edecf09e961fa8fc873d8bb74ee4c7956a83b 100644 (file)
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -108,7 +108,7 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
        {
          long int inner;
          for (inner = 0; inner < prev_start; ++inner)
-           if ((*groupsp)[inner] == (*groups)[cnt])
+           if ((*groupsp)[inner] == (*groupsp)[cnt])
              break;
 
          if (inner < prev_start)

diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index 9ba7b89bdf1db5ba188cce3929c0f67b7952d97f..762167ea198b23989bf39eb8e7d176cae3df4169 100644 (file)
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -140,13 +140,13 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
        {
          long int inner;
          for (inner = 0; inner < prev_start; ++inner)
-           if ((*groupsp)[inner] == (*groups)[cnt])
+           if (groups[inner] == groups[cnt])
              break;
 
          if (inner < prev_start)
            ++cnt;
          else
-           (*groupsp)[cnt] = (*groupsp)[--start];
+           groups[cnt] = groups[--start];
        }
 
       if (status != NSS_STATUS_TRYAGAIN)

diff --git a/sysdeps/i386/bits/atomic.h b/sysdeps/i386/bits/atomic.h
index 27840f9fe3233091fdb2132f3dc4a538d878a48c..aa3f9018771efe5daaaf3b81da871763d1ffa4b0 100644 (file)
--- a/sysdeps/i386/bits/atomic.h
+++ b/sysdeps/i386/bits/atomic.h
@@ -181,6 +181,11 @@ init_has_cmpxchg (void)                                                          \
                                                                              \
      *__gmemp == (oldval) ? (*__gmemp = __gnewval, 0) : 1; })
 
+/* XXX We do not really need 64-bit compare-and-exchange.  At least
+   not in the moment.  */
+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+  ({ __typeof (*mem) ret = *(mem); abort (); ret = (newval); ret = (oldval); })
+
 #endif
 
 /* Note that we need no lock prefix.  */