about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-12-29 20:56:13 +0000
committerUlrich Drepper <drepper@redhat.com>2008-12-29 20:56:13 +0000
commit50e481ceebce7936e773ced188d830659bdf9e40 (patch)
tree8c929020a8aa0abd1c1b0d8abbbe0c0a2f494ba8 /sysdeps
parent217d45cd35c2558997942eacfe49684e460c9ee4 (diff)
downloadglibc-50e481ceebce7936e773ced188d830659bdf9e40.tar.gz
glibc-50e481ceebce7936e773ced188d830659bdf9e40.tar.xz
glibc-50e481ceebce7936e773ced188d830659bdf9e40.zip
* nscd/nscd_gethst_r.c (nscd_gethst_r): Don't use nscd if
	LOCALDOMAIN is defined.
	* nscd/nscd_getai.c (__nscd_getai): Likewise.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/x86_64/bits/select.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/sysdeps/x86_64/bits/select.h b/sysdeps/x86_64/bits/select.h
index c217c2615a..7f23cb59b1 100644
--- a/sysdeps/x86_64/bits/select.h
+++ b/sysdeps/x86_64/bits/select.h
@@ -20,13 +20,21 @@
 # error "Never use <bits/select.h> directly; include <sys/select.h> instead."
 #endif
 
+#include <bits/wordsize.h>
+
 
 #if defined __GNUC__ && __GNUC__ >= 2
 
 # if __WORDSIZE == 64
 #  define __FD_ZERO_STOS "stosq"
+#  define __FD_SET_BTS "btsq"
+#  define __FD_CLR_BTR "btrq"
+#  define __FD_ISSET_BT "btq"
 # else
 #  define __FD_ZERO_STOS "stosl"
+#  define __FD_SET_BTS "btsl"
+#  define __FD_CLR_BTR "btrl"
+#  define __FD_ISSET_BT "btl"
 # endif
 
 # define __FD_ZERO(fdsp) \
@@ -41,19 +49,19 @@
   } while (0)
 
 # define __FD_SET(fd, fdsp) \
-  __asm__ __volatile__ ("btsl %1,%0"					      \
+  __asm__ __volatile__ (__FD_SET_BTS " %1,%0"				      \
 			: "=m" (__FDS_BITS (fdsp)[__FDELT (fd)])	      \
 			: "r" (((int) (fd)) % __NFDBITS)		      \
 			: "cc","memory")
 # define __FD_CLR(fd, fdsp) \
-  __asm__ __volatile__ ("btrl %1,%0"					      \
+  __asm__ __volatile__ (__FD_CLR_BTR " %1,%0"				      \
 			: "=m" (__FDS_BITS (fdsp)[__FDELT (fd)])	      \
 			: "r" (((int) (fd)) % __NFDBITS)		      \
 			: "cc","memory")
 # define __FD_ISSET(fd, fdsp) \
   (__extension__							      \
    ({register char __result;						      \
-     __asm__ __volatile__ ("btl %1,%2 ; setcb %b0"			      \
+     __asm__ __volatile__ (__FD_ISSET_BT " %1,%2 ; setcb %b0"		      \
 			   : "=q" (__result)				      \
 			   : "r" (((int) (fd)) % __NFDBITS),		      \
 			     "m" (__FDS_BITS (fdsp)[__FDELT (fd)])	      \