diff options
| -rw-r--r-- | fedora/glibc.spec.in | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c | 49 |
2 files changed, 53 insertions, 1 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 3030919ef7..045f8ec1f0 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -25,7 +25,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 4 +Release: 5 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -1034,6 +1034,9 @@ rm -f *.filelist* %endif %changelog +* Wed Mar 31 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.11.1-5 +- Fix for sparc64 msgrcv from upstream trunk + * Wed Mar 17 2010 Andreas Schwab <schwab@redhat.com> - 2.11.1-4 - Update from 2.11 branch - regcomp.c: do not ignore memory allocation failure (BZ#11127) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c b/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c new file mode 100644 index 0000000000..117762c779 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c @@ -0,0 +1,49 @@ +/* Copyright (C) 2010 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <errno.h> +#include <sys/msg.h> +#include <ipc_priv.h> + +#include <sysdep-cancel.h> +#include <sys/syscall.h> + +#include <bp-checks.h> + +ssize_t +__libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg) + int msqid; + void *msgp; + size_t msgsz; + long int msgtyp; + int msgflg; +{ + if (SINGLE_THREAD_P) + return INLINE_SYSCALL (ipc, 6, IPCOP_msgrcv, msqid, msgsz, msgflg, + CHECK_N (msgp, msgsz), msgtyp); + + int oldtype = LIBC_CANCEL_ASYNC (); + + ssize_t result = INLINE_SYSCALL (ipc, 6, IPCOP_msgrcv, msqid, msgsz, msgflg, + CHECK_N (msgp, msgsz), msgtyp); + + LIBC_CANCEL_RESET (oldtype); + + return result; +} +weak_alias (__libc_msgrcv, msgrcv) |