From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2346158094 for ; Mon, 19 Sep 2022 21:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7A82E07D3; Mon, 19 Sep 2022 21:26:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDAF5E07D3 for ; Mon, 19 Sep 2022 21:26:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED24A3410F1 for ; Mon, 19 Sep 2022 21:26:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 511A65D4 for ; Mon, 19 Sep 2022 21:26:43 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1663622757.55f5bd36e540cdf5291da6f067c63e60a3995eb8.dilfridge@gentoo> Subject: [gentoo-commits] proj/toolchain/glibc-patches:master commit in: 9999/ X-VCS-Repository: proj/toolchain/glibc-patches X-VCS-Files: 9999/0012-m68k-Enforce-4-byte-alignment-on-internal-locks-BZ-2.patch X-VCS-Directories: 9999/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 55f5bd36e540cdf5291da6f067c63e60a3995eb8 X-VCS-Branch: master Date: Mon, 19 Sep 2022 21:26:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1d98df1-cf4f-4a6f-926a-5e76f81aeeef X-Archives-Hash: 73e1dba2bba989f1cd0f82f1af2b47c5 commit: 55f5bd36e540cdf5291da6f067c63e60a3995eb8 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Sep 19 21:25:57 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Sep 19 21:25:57 2022 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=55f5bd36 Add m68k alignment patch (will hopefully make it into master soon) Signed-off-by: Andreas K. Hüttel gentoo.org> ...e-4-byte-alignment-on-internal-locks-BZ-2.patch | 125 +++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/9999/0012-m68k-Enforce-4-byte-alignment-on-internal-locks-BZ-2.patch b/9999/0012-m68k-Enforce-4-byte-alignment-on-internal-locks-BZ-2.patch new file mode 100644 index 0000000..bb738e0 --- /dev/null +++ b/9999/0012-m68k-Enforce-4-byte-alignment-on-internal-locks-BZ-2.patch @@ -0,0 +1,125 @@ +From 2ae75f3f15a2297c2f8924ad7eb492fd17ecae8c Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Mon, 5 Sep 2022 14:10:43 -0300 +Subject: [PATCH] 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). +--- + sysdeps/generic/libc-lock-arch.h | 25 +++++++++++++++++++ + sysdeps/nptl/libc-lock.h | 8 +++++- + sysdeps/nptl/libc-lockP.h | 3 ++- + sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h | 25 +++++++++++++++++++ + 4 files changed, 59 insertions(+), 2 deletions(-) + create mode 100644 sysdeps/generic/libc-lock-arch.h + create mode 100644 sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h + +diff --git a/sysdeps/generic/libc-lock-arch.h b/sysdeps/generic/libc-lock-arch.h +new file mode 100644 +index 0000000000..4713b30a8a +--- /dev/null ++++ b/sysdeps/generic/libc-lock-arch.h +@@ -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 . */ ++ ++#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 +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 + #define __need_NULL + #include ++#include + + + /* 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; +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 + #include ++#include + + /* 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; + +diff --git a/sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h b/sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h +new file mode 100644 +index 0000000000..1844bbaf6f +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/m68k/libc-lock-arch.h +@@ -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 . */ ++ ++#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 +-- +2.35.1 +