 +#ifndef _COND_LOCK_H
 +#define _COND_LOCK_H 1
 +
-+#ifdef __ASSUME_FUTEX_LOCK_PI
 +extern void __lll_pi_lock (int *futex, int private) attribute_hidden;
 +extern void __lll_pi_unlock (int *futex, int private) attribute_hidden;
 +
 +#define lll_pi_lock(futex, private) __lll_pi_lock (&(futex), private)
 +#define lll_pi_unlock(futex, private) __lll_pi_unlock (&(futex), private)
-+#else
-+#define lll_pi_lock(futex, private) lll_lock (futex, private)
-+#define lll_pi_unlock(futex, private) lll_unlock (futex, private)
-+#endif
-+
-+static inline void cond_lock(pthread_cond_t *cond, int pshared);
-+
-+static inline void cond_unlock(pthread_cond_t *cond, int pshared);
 +
 +static inline void
 +cond_lock(pthread_cond_t *cond, int pshared)

 
   return 0;
 }
diff --git a/nptl/sysdeps/pthread/cond-lock.h b/nptl/sysdeps/pthread/cond-lock.h
new file mode 100644
index 0000000000..3a273dc0d9
--- /dev/null
+++ b/nptl/sysdeps/pthread/cond-lock.h
@@ -0,0 +1,58 @@
+/* Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+

From 19fb5852337cb748c6445c2ee10ee92b186d0aee Mon Sep 17 00:00:00 2001
From: Gratian Crisan <gratian.crisan@ni.com>
Date: Tue, 26 Feb 2019 11:59:02 -0600
Subject: [PATCH 1/5] pi-condvars: add protocol support to pthread_condattr_t

When using a PTHREAD_PRIO_INHERIT mutex with a condvar, the pthread_cond*
