From 4af3879c26dd1c91d68d87189587bcc8ecd3dcfc Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 4 Jun 2012 11:41:24 +0530
Subject: Wrap __builtin_expect in pthread.h

[BZ #14188]
This fixes compilation of programs using pthread_cleanup_push built
with non-gcc compilers and older gcc compilers.
---
 nptl/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nptl/ChangeLog')

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f96646784e..2bc35857f1 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-04  Siddhesh Poyarekar  <siddhesh@redhat.com>
+	    Jakub Jelinek  <jakub@redhat.com>
+
+	[BZ #14188]
+	* sysdeps/pthread/pthread.h
+	[!(defined __GNUC__ && defined __EXCEPTIONS)]
+	(pthread_cleanup_push, pthread_cleanup_push_defer_np): Use
+	__libc_unlikely instead of __builtin_expect.
+
 2012-05-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14117]
-- 
cgit 1.4.1