[Commits] r16627 - in /fsf/trunk/libc: ChangeLog locale/programs/localedef.h sysdeps/ieee754/dbl-64/s_log1p.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jan 11 00:02:02 2012
New Revision: 16627

Log:
Import glibc-mainline for 2012-01-11

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/locale/programs/localedef.h
    fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_log1p.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jan 11 00:02:02 2012
@@ -1,3 +1,12 @@
+2012-01-10  Marek Polacek  <polacek@xxxxxxxxxx>
+
+	* locale/programs/localedef.h (show_archive_content): Add noreturn
+	attribute.
+
+2012-01-09  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* sysdeps/ieee754/dbl-64/s_log1p.c (__log1p): Add branch prediction.
+
 2012-01-08  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* io/bits/poll2.h: Add __BEGIN/__END_DECLS.

Modified: fsf/trunk/libc/locale/programs/localedef.h
==============================================================================
--- fsf/trunk/libc/locale/programs/localedef.h (original)
+++ fsf/trunk/libc/locale/programs/localedef.h Wed Jan 11 00:02:02 2012
@@ -178,6 +178,6 @@
 extern int delete_locales_from_archive (size_t nlist, char *list[]);
 
 /* List content of locale archive.  */
-extern void show_archive_content (int verbose);
+extern void show_archive_content (int verbose) __attribute__ ((noreturn));
 
 #endif /* localedef.h */

Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_log1p.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_log1p.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_log1p.c Wed Jan 11 00:02:02 2012
@@ -106,11 +106,11 @@
 
 	k = 1;
 	if (hx < 0x3FDA827A) {			/* x < 0.41422  */
-	    if(ax>=0x3ff00000) {		/* x <= -1.0 */
+	    if(__builtin_expect(ax>=0x3ff00000, 0)) { /* x <= -1.0 */
 		if(x==-1.0) return -two54/(x-x);/* log1p(-1)=+inf */
 		else return (x-x)/(x-x);	/* log1p(x<-1)=NaN */
 	    }
-	    if(ax<0x3e200000) {			/* |x| < 2**-29 */
+	    if(__builtin_expect(ax<0x3e200000, 0)) { /* |x| < 2**-29 */
 		math_force_eval(two54+x);	/* raise inexact */
 		if (ax<0x3c900000)		/* |x| < 2**-54 */
 		    return x;
@@ -120,7 +120,7 @@
 	    if(hx>0||hx<=((int32_t)0xbfd2bec3)) {
 		k=0;f=x;hu=1;}	/* -0.2929<x<0.41422 */
 	}
-	if (hx >= 0x7ff00000) return x+x;
+	else if (__builtin_expect(hx >= 0x7ff00000, 0)) return x+x;
 	if(k!=0) {
 	    if(hx<0x43400000) {
 		u  = 1.0+x;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits