diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mq_notify.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S index 1d8200f21d..ad1a774fbd 100644 --- a/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S +++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S @@ -22,10 +22,10 @@ .text - .globl pthread_barrier_wait - .type pthread_barrier_wait,@function + .globl __pthread_barrier_wait + .type __pthread_barrier_wait,@function .align 16 -pthread_barrier_wait: +__pthread_barrier_wait: cfi_startproc pushl %ebx cfi_adjust_cfa_offset(4) @@ -183,4 +183,5 @@ pthread_barrier_wait: call __lll_unlock_wake jmp 10b cfi_endproc - .size pthread_barrier_wait,.-pthread_barrier_wait + .size __pthread_barrier_wait,.-__pthread_barrier_wait +weak_alias (__pthread_barrier_wait, pthread_barrier_wait) diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c index 36b327d5e6..5a27274a3d 100644 --- a/sysdeps/unix/sysv/linux/mq_notify.c +++ b/sysdeps/unix/sysv/linux/mq_notify.c @@ -92,7 +92,7 @@ notification_function (void *arg) union sigval param = data->param; /* Let the parent go. */ - (void) pthread_barrier_wait (¬ify_barrier); + (void) __pthread_barrier_wait (¬ify_barrier); /* Make the thread detached. */ (void) pthread_detach (pthread_self ()); @@ -132,7 +132,7 @@ helper_thread (void *arg) == 0, 0)) /* Since we passed a pointer to DATA to the new thread we have to wait until it is done with it. */ - (void) pthread_barrier_wait (¬ify_barrier); + (void) __pthread_barrier_wait (¬ify_barrier); } else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) /* The only state we keep is the copy of the thread attributes. */ @@ -166,7 +166,7 @@ init_mq_netlink (void) int err = 1; /* Initialize the barrier. */ - if (__builtin_expect (pthread_barrier_init (¬ify_barrier, NULL, 2) == 0, + if (__builtin_expect (__pthread_barrier_init (¬ify_barrier, NULL, 2) == 0, 0)) { /* Create the helper thread. */ diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S index 69ecc1816a..e0f7d6c6e6 100644 --- a/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S +++ b/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S @@ -23,10 +23,10 @@ .text - .globl pthread_barrier_wait - .type pthread_barrier_wait,@function + .globl __pthread_barrier_wait + .type __pthread_barrier_wait,@function .align 16 -pthread_barrier_wait: +__pthread_barrier_wait: /* Get the mutex. */ xorl %eax, %eax movl $1, %esi @@ -157,4 +157,5 @@ pthread_barrier_wait: xorl $LLL_SHARED, %esi callq __lll_unlock_wake jmp 10b - .size pthread_barrier_wait,.-pthread_barrier_wait + .size __pthread_barrier_wait,.-__pthread_barrier_wait +weak_alias (__pthread_barrier_wait, pthread_barrier_wait) |