[commits] r9691 - in /fsf/trunk/libc: ChangeLog misc/bits/syslog.h sysdeps/i386/i686/multiarch/memmove.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jan 20 00:02:57 2010
New Revision: 9691

Log:
Import glibc-mainline for 2010-01-20

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/misc/bits/syslog.h
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jan 20 00:02:57 2010
@@ -1,3 +1,13 @@
+2010-01-19  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/i386/i686/multiarch/memmove.S: Also check
+	bit_Fast_Rep_String when SHARED isn't defined.
+
+2010-01-19  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #11194]
+	* misc/bits/syslog.h (syslog, vsyslog): Remove unnecessary return.
+
 2010-01-17  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
 
 	* sysdeps/mach/hurd/bits/libc-lock.h

Modified: fsf/trunk/libc/misc/bits/syslog.h
==============================================================================
--- fsf/trunk/libc/misc/bits/syslog.h (original)
+++ fsf/trunk/libc/misc/bits/syslog.h Wed Jan 20 00:02:57 2010
@@ -1,5 +1,5 @@
 /* Checking macros for syslog functions.
-   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 __extern_always_inline void
 syslog (int __pri, __const char *__fmt, ...)
 {
-  return __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
+  __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
 }
 #elif !defined __cplusplus
 # define syslog(pri, ...) \
@@ -45,6 +45,6 @@
 __extern_always_inline void
 vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap)
 {
-  return __vsyslog_chk (__pri,  __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
+  __vsyslog_chk (__pri,  __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
 }
 #endif

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memmove.S Wed Jan 20 00:02:57 2010
@@ -74,6 +74,9 @@
 	testl	$bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
 	jz	2f
 	leal	__memmove_ssse3, %eax
+	testl	$bit_Fast_Rep_String, FEATURE_OFFSET+index_Fast_Rep_String+__cpu_features
+	jz	2f
+	leal	__memmove_ssse3_rep, %eax
 2:	ret
 END(memmove)