forked from pool/glibc
Andreas Schwab
30e48d0d7f
- Update to glibc 2.21 release.
* A new semaphore algorithm has been implemented in generic C code for all
machines
* Added support for TSX lock elision of pthread mutexes on powerpc32,
powerpc64 and powerpc64le
* Optimized strcpy, stpcpy, strchrnul and strrchr implementations for
AArch64
* i386 memcpy functions optimized with SSE2 unaligned load/store
* New locales: tu_IN, bh_IN, raj_IN, ce_RU
* The obsolete sigvec function has been removed
- Patches from upstream removed
* ifunc-x86-slow-sse4.patch
* pthread-mutex-trylock-elision.patch
- o-tmpfile.patch: Fix value of O_TMPFILE for architectures with
non-default O_DIRECTORY (BZ #17912)
OBS-URL: https://build.opensuse.org/request/show/285070
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=391
112 lines
3.6 KiB
Diff
112 lines
3.6 KiB
Diff
From 867dbf6ba31c0a0f5c0366f9ed71b0afc3727a23 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
Date: Mon, 11 Aug 2014 11:18:26 +0200
|
|
Subject: [PATCH] Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in
|
|
pthread_mutexattr_gettype (BZ #15790)
|
|
|
|
[BZ #15790]
|
|
* nptl/pthread_mutexattr_gettype.c (pthread_mutexattr_gettype):
|
|
Filter out PTHREAD_MUTEX_NO_ELISION_NP from value returned in
|
|
kind.
|
|
* nptl/Makefile (tests): Add tst-pthread-mutexattr.
|
|
* nptl/tst-pthread-mutexattr.c: New file.
|
|
---
|
|
nptl/Makefile | 2 +-
|
|
nptl/pthread_mutexattr_gettype.c | 3 +-
|
|
nptl/tst-pthread-mutexattr.c | 60 ++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 63 insertions(+), 2 deletions(-)
|
|
create mode 100644 nptl/tst-pthread-mutexattr.c
|
|
|
|
Index: glibc-2.19/nptl/Makefile
|
|
===================================================================
|
|
--- glibc-2.19.orig/nptl/Makefile
|
|
+++ glibc-2.19/nptl/Makefile
|
|
@@ -253,7 +253,7 @@ tests = tst-typesizes \
|
|
tst-exit1 tst-exit2 tst-exit3 \
|
|
tst-stdio1 tst-stdio2 \
|
|
tst-stack1 tst-stack2 tst-stack3 tst-stack4 tst-pthread-getattr \
|
|
- tst-pthread-attr-affinity \
|
|
+ tst-pthread-attr-affinity tst-pthread-mutexattr \
|
|
tst-unload \
|
|
tst-dlsym1 \
|
|
tst-sysconf \
|
|
Index: glibc-2.19/nptl/pthread_mutexattr_gettype.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/nptl/pthread_mutexattr_gettype.c
|
|
+++ glibc-2.19/nptl/pthread_mutexattr_gettype.c
|
|
@@ -28,7 +28,8 @@ pthread_mutexattr_gettype (attr, kind)
|
|
|
|
iattr = (const struct pthread_mutexattr *) attr;
|
|
|
|
- *kind = iattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS;
|
|
+ *kind = (iattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS
|
|
+ & ~PTHREAD_MUTEX_NO_ELISION_NP);
|
|
|
|
return 0;
|
|
}
|
|
Index: glibc-2.19/nptl/tst-pthread-mutexattr.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/nptl/tst-pthread-mutexattr.c
|
|
@@ -0,0 +1,60 @@
|
|
+/* Make sure that pthread_mutexattr_gettype returns a valid kind.
|
|
+
|
|
+ Copyright (C) 2014 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, see
|
|
+ <http://www.gnu.org/licenses/>. */
|
|
+
|
|
+#include <stdio.h>
|
|
+#include <string.h>
|
|
+#include <pthread.h>
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ pthread_mutexattr_t attr;
|
|
+ int kind;
|
|
+ int error;
|
|
+
|
|
+ error = pthread_mutexattr_init (&attr);
|
|
+ if (error)
|
|
+ {
|
|
+ printf ("pthread_mutexattr_init: %s\n", strerror (error));
|
|
+ return 1;
|
|
+ }
|
|
+ error = pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_DEFAULT);
|
|
+ if (error)
|
|
+ {
|
|
+ printf ("pthread_mutexattr_settype (1): %s\n", strerror (error));
|
|
+ return 1;
|
|
+ }
|
|
+ error = pthread_mutexattr_gettype (&attr, &kind);
|
|
+ if (error)
|
|
+ {
|
|
+ printf ("pthread_mutexattr_gettype: %s\n", strerror (error));
|
|
+ return 1;
|
|
+ }
|
|
+ error = pthread_mutexattr_settype (&attr, kind);
|
|
+ if (error)
|
|
+ {
|
|
+ printf ("pthread_mutexattr_settype (2): %s\n", strerror (error));
|
|
+ return 1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
+#define TEST_FUNCTION do_test ()
|
|
+#include "../test-skeleton.c"
|