about summary refs log tree commit diff
path: root/sysdeps/nptl/libc-lockP.h
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-08-30 10:33:15 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-09-20 10:56:54 -0300
commitaeb4d2e9815d459e2640a31f5abb8ef803830107 (patch)
tree54c8b49128a1c5a81bc9f3a04b60582266627cfc /sysdeps/nptl/libc-lockP.h
parentc75d20b5b27b0a60f0678236f51a4d3b0b058c00 (diff)
downloadglibc-aeb4d2e9815d459e2640a31f5abb8ef803830107.tar.gz
glibc-aeb4d2e9815d459e2640a31f5abb8ef803830107.tar.xz
glibc-aeb4d2e9815d459e2640a31f5abb8ef803830107.zip
m68k: Enforce 4-byte alignment on internal locks (BZ #29537)
A new internal definition, __LIBC_LOCK_ALIGNMENT, is used to force
the 4-byte alignment only for m68k, other architecture keep the
natural alignment of the type used internally (and hppa does not
require 16-byte alignment for kernel-assisted CAS).

Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'sysdeps/nptl/libc-lockP.h')
-rw-r--r--sysdeps/nptl/libc-lockP.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h
index d3a6837fd2..425f514c5c 100644
--- a/sysdeps/nptl/libc-lockP.h
+++ b/sysdeps/nptl/libc-lockP.h
@@ -32,9 +32,10 @@
    ld.so might be used on old kernels with a different libc.so.  */
 #include <lowlevellock.h>
 #include <tls.h>
+#include <libc-lock-arch.h>
 
 /* Mutex type.  */
-typedef int __libc_lock_t;
+typedef int __libc_lock_t __LIBC_LOCK_ALIGNMENT;
 typedef struct { pthread_mutex_t mutex; } __rtld_lock_recursive_t;
 typedef pthread_rwlock_t __libc_rwlock_t;