[commits] r6730 - in /fsf/trunk/libc: ChangeLog resolv/res_mkquery.c sysdeps/mach/i386/machine-lock.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Aug 12 00:05:15 2008
New Revision: 6730

Log:
Import glibc-mainline for 2008-08-12

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/resolv/res_mkquery.c
    fsf/trunk/libc/sysdeps/mach/i386/machine-lock.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug 12 00:05:15 2008
@@ -1,3 +1,13 @@
+2008-08-11  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* resolv/res_mkquery.c (res_nmkquery): Call ns_name_compress
+	directly instead of going through dn_comp.
+
+2008-08-11  Aurelien Jarno  <aurel32@xxxxxxxxxx>
+
+	* sysdeps/mach/i386/machine-lock.h (__spin_unlock, __spin_try_lock):
+	Fix asm constraints.
+
 2008-08-07  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #6790]

Modified: fsf/trunk/libc/resolv/res_mkquery.c
==============================================================================
--- fsf/trunk/libc/resolv/res_mkquery.c (original)
+++ fsf/trunk/libc/resolv/res_mkquery.c Tue Aug 12 00:05:15 2008
@@ -160,7 +160,10 @@
 		if ((buflen -= QFIXEDSZ) < 0)
 			return (-1);
 	compose:
-		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
+		n = ns_name_compress(dname, cp, buflen,
+				     (const u_char **) dnptrs,
+				     (const u_char **) lastdnptr);
+		if (n < 0)
 			return (-1);
 		cp += n;
 		buflen -= n;
@@ -172,7 +175,9 @@
 		/*
 		 * Make an additional record for completion domain.
 		 */
-		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
+		n = ns_name_compress((char *)data, cp, buflen,
+				     (const u_char **) dnptrs,
+				     (const u_char **) lastdnptr);
 		if (__builtin_expect (n < 0, 0))
 			return (-1);
 		cp += n;

Modified: fsf/trunk/libc/sysdeps/mach/i386/machine-lock.h
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/i386/machine-lock.h (original)
+++ fsf/trunk/libc/sysdeps/mach/i386/machine-lock.h Tue Aug 12 00:05:15 2008
@@ -41,7 +41,7 @@
    register int __unlocked;
    __asm__ __volatile ("xchgl %0, %1"
 		       : "=&r" (__unlocked), "=m" (*__lock) : "0" (0)
-		       : : "memory");
+		       : "memory");
 }
 
 /* Try to lock LOCK; return nonzero if we locked it, zero if another has.  */
@@ -52,7 +52,7 @@
   register int __locked;
   __asm__ __volatile ("xchgl %0, %1"
 		      : "=&r" (__locked), "=m" (*__lock) : "0" (1)
-		      : : "memory");
+		      : "memory");
   return !__locked;
 }