diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-12-25 10:39:27 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-12-25 10:39:27 +0000 |
| commit | 105320fa7b3665877cb3c50c821d10cf7ce154d0 (patch) | |
| tree | 1b9b6f46b453cf110c6df3493e977b4468af25f6 /libc/nptl | |
| parent | 94c459cc7a611211d10773eef526826a8da80456 (diff) | |
Merge changes between r21911 and r22029 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22061 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl')
| -rw-r--r-- | libc/nptl/ChangeLog | 15 | ||||
| -rw-r--r-- | libc/nptl/Makefile | 3 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c | 4 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 4 |
4 files changed, 19 insertions, 7 deletions
diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog index a9b00e7c7..b95068716 100644 --- a/libc/nptl/ChangeLog +++ b/libc/nptl/ChangeLog @@ -1,3 +1,18 @@ +2012-12-08 Siddhesh Poyarekar <siddhesh@redhat.com> + + * sysdeps/unix/sysv/linux/s390/jmp-unwind.c (_longjmp_unwind): + Declare LOCAL_VAR as char. + +2012-12-04 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/powerpc/sem_post.c (__old_sem_post): + Cast result of atomic_increment_val to (void) instead of storing + in otherwise-unused variable. + +2012-12-03 Allan McRae <allan@archlinux.org> + + * Makefile (LDFLAGS-tst-cond24, LDFLAGS-tst-cond25): Remove. + 2012-11-26 H.J. Lu <hongjiu.lu@intel.com> * unwind.c (__pthread_unwind): Pass address of unwind_cleanup diff --git a/libc/nptl/Makefile b/libc/nptl/Makefile index 6cd72dbee..1cdb76a6e 100644 --- a/libc/nptl/Makefile +++ b/libc/nptl/Makefile @@ -290,9 +290,6 @@ gen-as-const-headers = pthread-errnos.sym LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst -LDFLAGS-tst-cond24 = -lrt -LDFLAGS-tst-cond25 = -lrt - include ../Makeconfig ifeq ($(have-forced-unwind),yes) diff --git a/libc/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/libc/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c index 3bf3371ad..21a65bea0 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c +++ b/libc/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c @@ -1,5 +1,5 @@ /* sem_post -- post to a POSIX semaphore. Powerpc version. - Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003. @@ -56,7 +56,7 @@ __old_sem_post (sem_t *sem) int *futex = (int *) sem; __asm __volatile (__lll_rel_instr ::: "memory"); - int nr = atomic_increment_val (futex); + (void) atomic_increment_val (futex); /* We always have to assume it is a shared semaphore. */ int err = lll_futex_wake (futex, 1, LLL_SHARED); if (__builtin_expect (err, 0) < 0) diff --git a/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c index 3f8853917..bb2dfc065 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c +++ b/libc/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c @@ -1,5 +1,5 @@ /* Clean up stack frames unwound by longjmp. Linux/s390 version. - Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2003-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe); void _longjmp_unwind (jmp_buf env, int val) { - unsigned char local_var; + char local_var; #ifdef SHARED if (__libc_pthread_functions_init) |