aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nptl/ChangeLog13
-rw-r--r--nptl/forward.c14
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S2
4 files changed, 23 insertions, 8 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2b83bc076a..73363856e9 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-11 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/s390/s390-64/vfork.S (__vfork): Use jgnl
+ instead of jnl instruction to jump to SYSCALL_ERROR_LABEL.
+ * sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S (__vfork): Likewise.
+
+2004-03-11 Jakub Jelinek <jakub@redhat.com>
+
+ * forward.c (__pthread_cond_broadcast_2_0,
+ __pthread_cond_destroy_2_0, __pthread_cond_init_2_0,
+ __pthread_cond_signal_2_0, __pthread_cond_wait_2_0,
+ __pthread_cond_timedwait_2_0): Use return 0 as defaction instead of 0.
+
2004-03-11 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/tcb-offsets.sym: Add PID.
diff --git a/nptl/forward.c b/nptl/forward.c
index 06740d9266..e5f93d475e 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -89,7 +89,7 @@ FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section,
- (pthread_cond_2_0_t *cond), (cond), 0)
+ (pthread_cond_2_0_t *cond), (cond), return 0)
compat_symbol (libc, __pthread_cond_broadcast_2_0, pthread_cond_broadcast,
GLIBC_2_0);
#endif
@@ -99,7 +99,7 @@ versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
FORWARD2 (__pthread_cond_destroy_2_0, int attribute_compat_text_section,
- (pthread_cond_2_0_t *cond), (cond), 0)
+ (pthread_cond_2_0_t *cond), (cond), return 0)
compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
GLIBC_2_0);
#endif
@@ -110,7 +110,7 @@ versioned_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy,
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section,
(pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr),
- (cond, cond_attr), 0)
+ (cond, cond_attr), return 0)
compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init, GLIBC_2_0);
#endif
FORWARD (__pthread_cond_init,
@@ -120,7 +120,7 @@ versioned_symbol (libc, __pthread_cond_init, pthread_cond_init, GLIBC_2_3_2);
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
FORWARD2 (__pthread_cond_signal_2_0, int attribute_compat_text_section,
- (pthread_cond_2_0_t *cond), (cond), 0)
+ (pthread_cond_2_0_t *cond), (cond), return 0)
compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
GLIBC_2_0);
#endif
@@ -130,7 +130,8 @@ versioned_symbol (libc, __pthread_cond_signal, pthread_cond_signal,
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
FORWARD2 (__pthread_cond_wait_2_0, int attribute_compat_text_section,
- (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex), 0)
+ (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex),
+ return 0)
compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
GLIBC_2_0);
#endif
@@ -142,7 +143,8 @@ versioned_symbol (libc, __pthread_cond_wait, pthread_cond_wait,
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
FORWARD2 (__pthread_cond_timedwait_2_0, int attribute_compat_text_section,
(pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
- const struct timespec *abstime), (cond, mutex, abstime), 0)
+ const struct timespec *abstime), (cond, mutex, abstime),
+ return 0)
compat_symbol (libc, __pthread_cond_timedwait_2_0, pthread_cond_timedwait,
GLIBC_2_0);
#endif
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
index fcc7ee0804..04ae5bf59d 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
+++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
@@ -48,7 +48,7 @@ ENTRY (__vfork)
/* Check for error. */
lghi %r4,-4095
clgr %r2,%r4
- jnl SYSCALL_ERROR_LABEL
+ jgnl SYSCALL_ERROR_LABEL
/* Normal return. */
br %r14
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
index ed5bf5e9ca..f43e9c34b0 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
+++ b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
@@ -50,7 +50,7 @@ ENTRY (__vfork)
/* Check for error. */
lghi %r4,-4095
clgr %r2,%r4
- jnl SYSCALL_ERROR_LABEL
+ jgnl SYSCALL_ERROR_LABEL
/* Normal return. */
br %r14