From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 6 Mar 2020 12:03:17 +0000 (+0000)
Subject: libstdc++: Fix call to __glibcxx_rwlock_init (PR 93244)
X-Git-Tag: upstream/12.2.0~17968
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0815713a32c5cc062bd41fa75dac4d4408215fb;p=platform%2Fupstream%2Fgcc.git

libstdc++: Fix call to __glibcxx_rwlock_init (PR 93244)

When the target doesn't define PTHREAD_RWLOCK_INITIALIZER we use a
wrapper around pthread_wrlock_init, but the wrapper only takes one
argument and we try to call it with two.

This went unnnoticed on most targets because they do define the
PTHREAD_RWLOCK_INITIALIZER macro, but it causes a bootstrap failure on
darwin8.

	PR libstdc++/93244
	* include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]
	(__shared_mutex_pthread::__shared_mutex_pthread()): Remove incorrect
	second argument to __glibcxx_rwlock_init.
	* testsuite/30_threads/shared_timed_mutex/94069.cc: New test.
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b9ea649..b226bbb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,12 @@
 2020-03-06  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/93244
+	* include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]
+	(__shared_mutex_pthread::__shared_mutex_pthread()): Remove incorrect
+	second argument to __glibcxx_rwlock_init.
+	* testsuite/30_threads/shared_timed_mutex/94069.cc: New test.
+
+	PR libstdc++/93244
 	* testsuite/27_io/filesystem/path/generic/generic_string.cc: Adjust
 	test to not fail due to PR 94063.
 	* testsuite/27_io/filesystem/path/generic/utf.cc: Likewise.
diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex
index 1d0ce67..9b597e7 100644
--- a/libstdc++-v3/include/std/shared_mutex
+++ b/libstdc++-v3/include/std/shared_mutex
@@ -160,7 +160,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   public:
     __shared_mutex_pthread()
     {
-      int __ret = __glibcxx_rwlock_init(&_M_rwlock, NULL);
+      int __ret = __glibcxx_rwlock_init(&_M_rwlock);
       if (__ret == ENOMEM)
 	__throw_bad_alloc();
       else if (__ret == EAGAIN)
diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/94069.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/94069.cc
new file mode 100644
index 0000000..6e5cf5f
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/94069.cc
@@ -0,0 +1,28 @@
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do compile }
+// { dg-options "-pthread"  }
+// { dg-require-effective-target c++14 }
+// { dg-require-effective-target pthread }
+// { dg-require-gthreads "" }
+//
+#include <pthread.h>
+// This is probably undefined, but we do it to simulate a Pthreads target
+// that doesn't define the macro:
+#undef PTHREAD_RWLOCK_INITIALIZER
+#include <shared_mutex>