aboutsummaryrefslogtreecommitdiffstats
path: root/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch')
-rw-r--r--main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch b/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch
deleted file mode 100644
index 55edc51c9a..0000000000
--- a/main/libc0.9.32/0001-nptl-fix-calling-convention-for-__pthread_mutex_cond.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ed8017b08bee868eb5ea11c0b57074875267a3f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 6 Aug 2010 13:26:25 +0300
-Subject: [PATCH] nptl: fix calling convention for __pthread_mutex_cond_lock
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The assembly versions of pthread_cond_wait calls
-__pthread_mutex_cond_lock and __pthread_mutex_cond_lock_adjust
-using internal calling convention (which differs from default
-calling convention at least on x86). Thus these two functions
-must be defined with internal_function or the call sequence goes
-wrong.
-
-__pthread_mutex_cond_lock resides in
-sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c, but it does
-evil macro definitions and includes pthread_mutex_lock.c, so
-we need to add some extra kludge to pthread_mutex_lock.c to get
-the prototypes correctly.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- libpthread/nptl/pthreadP.h | 6 ++++--
- libpthread/nptl/pthread_mutex_lock.c | 7 ++++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h
-index 85601d4..c45bd11 100644
---- a/libpthread/nptl/pthreadP.h
-+++ b/libpthread/nptl/pthreadP.h
-@@ -414,8 +414,10 @@ extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex);
- extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
- extern int __pthread_mutex_lock_internal (pthread_mutex_t *__mutex)
- attribute_hidden;
--extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex);
--extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex);
-+extern int __pthread_mutex_cond_lock (pthread_mutex_t *__mutex)
-+ attribute_hidden internal_function;
-+extern void __pthread_mutex_cond_lock_adjust (pthread_mutex_t *__mutex)
-+ attribute_hidden internal_function;
- extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
- extern int __pthread_mutex_unlock_internal (pthread_mutex_t *__mutex)
- attribute_hidden;
-diff --git a/libpthread/nptl/pthread_mutex_lock.c b/libpthread/nptl/pthread_mutex_lock.c
-index 78b6671..77147db 100644
---- a/libpthread/nptl/pthread_mutex_lock.c
-+++ b/libpthread/nptl/pthread_mutex_lock.c
-@@ -42,7 +42,11 @@ static int __pthread_mutex_lock_full (pthread_mutex_t *mutex)
-
-
- int
-+#ifdef NO_INCR
-+attribute_hidden internal_function
-+#else
- attribute_protected
-+#endif
- __pthread_mutex_lock (
- pthread_mutex_t *mutex)
- {
-@@ -477,7 +481,8 @@ strong_alias (__pthread_mutex_lock, __pthread_mutex_lock_internal)
-
-
- #ifdef NO_INCR
--void attribute_protected
-+void
-+attribute_hidden internal_function
- __pthread_mutex_cond_lock_adjust (
- pthread_mutex_t *mutex)
- {
---
-1.7.0.4
-