picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Adhemerval Zanella 2022-08-30 10:33:15 -03:00
parent c75d20b5b2
commit aeb4d2e981
4 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sysdeps/generic/libc-lock-arch.h Normal file
View File

@ -0,0 +1,25 @@
/* Private libc-internal arch-specific definitions. Generic version.
Copyright (C) 2022 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, see <https://www.gnu.org/licenses/>. */
#ifndef _LIBC_LOCK_ARCH_H
#define _LIBC_LOCK_ARCH_H
/* The default definition uses the natural alignment from the lock type. */
#define __LIBC_LOCK_ALIGNMENT
#endif

8
sysdeps/nptl/libc-lock.h
View File

@ -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;

3
sysdeps/nptl/libc-lockP.h
View File

@ -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;

25
sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h Normal file
View File

@ -0,0 +1,25 @@
/* Private libc-internal arch-specific definitions. m68k version.
Copyright (C) 2022 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, see <https://www.gnu.org/licenses/>. */
#ifndef _LIBC_LOCK_ARCH_H
#define _LIBC_LOCK_ARCH_H
/* Linux enforces 4-bytes alignment on futex inputs. */
#define __LIBC_LOCK_ALIGNMENT __attribute__ ((__aligned__ (4)))
#endif