Skip to content

Commit

Permalink
db: fix build with clang 16 on Darwin
Browse files Browse the repository at this point in the history
Both `_spin_lock_try` and `_spin_unlock` are private and deprecated
APIs, which are not exported by any headers in the SDK. The build fails
because the configure script does not define the functions before
calling them, which is treated as error by clang 16.

This patch replaces use of those APIs with `os_unfair_lock`, which is
the recommended replacement per the deprecation messages.
  • Loading branch information
reckenrode committed Jul 2, 2023
1 parent 6302ba0 commit 3801851
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 4 deletions.
55 changes: 55 additions & 0 deletions pkgs/development/libraries/db/darwin-mutexes-4.8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4
--- a/dist/aclocal/mutex.m4 1969-12-31 19:00:01.000000000 -0500
+++ b/dist/aclocal/mutex.m4 2023-06-05 19:14:47.214158196 -0400
@@ -372,10 +376,11 @@

# _spin_lock_try/_spin_unlock: Apple/Darwin
if test "$db_cv_mutex" = no; then
-AC_TRY_LINK(,[
- int x;
- _spin_lock_try(&x);
- _spin_unlock(&x);
+AC_TRY_LINK([
+#include <os/lock.h>],[
+ os_unfair_lock x = OS_UNFAIR_LOCK_INIT;
+ bool _ = os_unfair_lock_trylock(&x);
+ os_unfair_lock_unlock(&x);
], [db_cv_mutex=Darwin/_spin_lock_try])
fi

diff -ur a/dbinc/mutex_int.h b/dbinc/mutex_int.h
--- a/dbinc/mutex_int.h 1969-12-31 19:00:01.000000000 -0500
+++ b/dbinc/mutex_int.h 2023-06-05 19:15:37.510514745 -0400
@@ -154,14 +154,13 @@
* Apple/Darwin library functions.
*********************************************************************/
#ifdef HAVE_MUTEX_DARWIN_SPIN_LOCK_TRY
-typedef u_int32_t tsl_t;
+#include <os/lock.h>
+typedef os_unfair_lock tsl_t;

#ifdef LOAD_ACTUAL_MUTEX_CODE
-extern int _spin_lock_try(tsl_t *);
-extern void _spin_unlock(tsl_t *);
-#define MUTEX_SET(tsl) _spin_lock_try(tsl)
-#define MUTEX_UNSET(tsl) _spin_unlock(tsl)
-#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
+#define MUTEX_SET(tsl) os_unfair_lock_trylock(tsl)
+#define MUTEX_UNSET(tsl) os_unfair_lock_unlock(tsl)
+#define MUTEX_INIT(tsl) ({ *(tsl) = OS_UNFAIR_LOCK_INIT; tsl; })
#endif
#endif

diff -ur a/dbinc/mutex_int.h b/dbinc/mutex_int.h
--- a/dbinc_auto/mutex_ext.h 1969-12-31 19:00:01.000000000 -0500
+++ b/dbinc_auto/mutex_ext.h 2023-07-01 22:38:20.749201366 -0400
@@ -34,6 +34,9 @@
#if !defined(HAVE_ATOMIC_SUPPORT) && defined(HAVE_MUTEX_SUPPORT)
atomic_value_t __atomic_dec __P((ENV *, db_atomic_t *));
#endif
+#if !defined(HAVE_ATOMIC_SUPPORT) && defined(HAVE_MUTEX_SUPPORT)
+int atomic_compare_exchange __P((ENV *, db_atomic_t *, atomic_value_t, atomic_value_t));
+#endif
int __db_pthread_mutex_init __P((ENV *, db_mutex_t, u_int32_t));
int __db_pthread_mutex_lock __P((ENV *, db_mutex_t));
#if defined(HAVE_SHARED_LATCHES)
42 changes: 42 additions & 0 deletions pkgs/development/libraries/db/darwin-mutexes.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4
--- a/dist/aclocal/mutex.m4 1969-12-31 19:00:01.000000000 -0500
+++ b/dist/aclocal/mutex.m4 2023-06-05 19:14:47.214158196 -0400
@@ -441,10 +445,11 @@

# _spin_lock_try/_spin_unlock: Apple/Darwin
if test "$db_cv_mutex" = no; then
-AC_TRY_LINK(,[
- int x;
- _spin_lock_try(&x);
- _spin_unlock(&x);
+AC_TRY_LINK([
+#include <os/lock.h>],[
+ os_unfair_lock x = OS_UNFAIR_LOCK_INIT;
+ bool _ = os_unfair_lock_trylock(&x);
+ os_unfair_lock_unlock(&x);
], [db_cv_mutex=Darwin/_spin_lock_try])
fi

diff -ur a/src/dbinc/mutex_int.h b/src/dbinc/mutex_int.h
--- a/src/dbinc/mutex_int.h 1969-12-31 19:00:01.000000000 -0500
+++ b/src/dbinc/mutex_int.h 2023-06-05 19:15:37.510514745 -0400
@@ -154,14 +154,13 @@
* Apple/Darwin library functions.
*********************************************************************/
#ifdef HAVE_MUTEX_DARWIN_SPIN_LOCK_TRY
-typedef u_int32_t tsl_t;
+#include <os/lock.h>
+typedef os_unfair_lock tsl_t;

#ifdef LOAD_ACTUAL_MUTEX_CODE
-extern int _spin_lock_try(tsl_t *);
-extern void _spin_unlock(tsl_t *);
-#define MUTEX_SET(tsl) _spin_lock_try(tsl)
-#define MUTEX_UNSET(tsl) _spin_unlock(tsl)
-#define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
+#define MUTEX_SET(tsl) os_unfair_lock_trylock(tsl)
+#define MUTEX_UNSET(tsl) os_unfair_lock_unlock(tsl)
+#define MUTEX_INIT(tsl) ({ *(tsl) = OS_UNFAIR_LOCK_INIT; tsl; })
#endif
#endif

3 changes: 2 additions & 1 deletion pkgs/development/libraries/db/db-4.8.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import ./generic.nix (args // {
version = "4.8.30";
sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ];
extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]
++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes-4.8.patch ];

drvArgs.hardeningDisable = [ "format" ];
drvArgs.doCheck = false;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/libraries/db/db-5.3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import ./generic.nix (args // {
version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ];
extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]
++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes.patch ];
})
3 changes: 2 additions & 1 deletion pkgs/development/libraries/db/db-6.0.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import ./generic.nix (args // {
version = "6.0.20";
sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
license = lib.licenses.agpl3;
extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]
++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes.patch ];
})
3 changes: 2 additions & 1 deletion pkgs/development/libraries/db/db-6.2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import ./generic.nix (args // {
version = "6.2.23";
sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7";
license = lib.licenses.agpl3;
extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ];
extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]
++ lib.optionals stdenv.isDarwin [ ./darwin-mutexes.patch ];
})

0 comments on commit 3801851

Please sign in to comment.