diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-08-30 10:33:15 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-09-20 10:56:54 -0300 |
| commit | aeb4d2e9815d459e2640a31f5abb8ef803830107 (patch) | |
| tree | 54c8b49128a1c5a81bc9f3a04b60582266627cfc /sysdeps/nptl/libc-lock.h | |
| parent | c75d20b5b27b0a60f0678236f51a4d3b0b058c00 (diff) | |
| download | glibc-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-lock.h')
| -rw-r--r-- | sysdeps/nptl/libc-lock.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sysdeps/nptl/libc-lock.h b/sysdeps/nptl/libc-lock.h index 5af476c48b..63b3f3d75c 100644 --- a/sysdeps/nptl/libc-lock.h +++ b/sysdeps/nptl/libc-lock.h @@ -22,6 +22,7 @@ #include <pthread.h> #define __need_NULL #include <stddef.h> +#include <libc-lock-arch.h> /* Mutex type. */ @@ -29,7 +30,12 @@ # if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; # else -typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t; +typedef struct +{ + int lock __LIBC_LOCK_ALIGNMENT; + int cnt; + void *owner; +} __libc_lock_recursive_t; # endif #else typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; |