From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id uRPxJHgAkGnpNToAWB0awg (envelope-from ) for ; Fri, 13 Feb 2026 23:56:24 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=R7dgVTn3; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 90A4B1E0BA; Fri, 13 Feb 2026 23:56:24 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A08241E089 for ; Fri, 13 Feb 2026 23:56:23 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id C3AC44BAD148 for ; Sat, 14 Feb 2026 04:56:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3AC44BAD148 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=R7dgVTn3 Received: from mail-dy1-x132a.google.com (mail-dy1-x132a.google.com [IPv6:2607:f8b0:4864:20::132a]) by sourceware.org (Postfix) with ESMTPS id D88A64BAD14E for ; Sat, 14 Feb 2026 04:55:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D88A64BAD14E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D88A64BAD14E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::132a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771044915; cv=none; b=RpVRBqnx1pn5vzPa0k9yVxxrFHGIBOPwRtIH9c9oi6Eeb4dDI7h18xu+pMF0UtCtEbXlY063ZMRzVclF/RVQirrfGjhS50cydGS9bZLR1ePGqrg4fL6zP1kEo+L3xAHYAv7bC4sP/Ye17dwW1PGIvfdr7PE/paO2gZKiJu8bB+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771044915; c=relaxed/simple; bh=KaC7IVNbQL09pqnW0eu7upeiG2+Y63xk77lYTBBlIP4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=PnAeJsjHG2Wof2j8zyAmr/80uFWZbE5FM0Un3S4imZrKFbsEIuq599q17PtFrd1RIG5SX9tEAIvKfXS1Tze+SGFt+id8awj13R9VSNfqVrjUT5vB89EbHmE9GBoqKHfhoMNFGZvbLbpiFL/sMtMPCKU1tYQFlwIMArbdKMRtrKo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D88A64BAD14E Received: by mail-dy1-x132a.google.com with SMTP id 5a478bee46e88-2baab3137bcso1482141eec.0 for ; Fri, 13 Feb 2026 20:55:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771044914; x=1771649714; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0LU2SgmXHbLmKiC8BY1Lh9rQwo4vhJfNNOaFHC9Hom8=; b=R7dgVTn3AY6cU0fLUGWFxOmAHWMVZ3XjyrOLtSGpzf7Jh8kLB5T5trlaMeSzSF4YBm H8D2a9JimPnhtJDMR2p9b1wP3y5TzyrczrepHl0QXvAwfbsev3QsdVcl4bmRPVlmSib4 OueRmH1HkGpNlq2k1wu2+RZk4P1fPR7e/McO2K2sKVUO3rjG4hMMbFFLLk0lFOZfok/+ PYvOPmm3LXVj0JzJGkm6AdIAO1euRMBv7M5JsRrvkHqkofpDFeaSWwxz7Y7iQIPSBABz EyZL2UthETPaFWgSxAgfIqvCuOwEGwhl8NveciwVR7rnFGssvqnAgnk+TtqWUcMPP2qf feZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771044914; x=1771649714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0LU2SgmXHbLmKiC8BY1Lh9rQwo4vhJfNNOaFHC9Hom8=; b=HdB1xEjhXXz3IuFu/Oc5pvgIAKytuKiNo4N+lf4vYtcA7sP0G4IyBYuIyx2X55Jua4 Mrg/lWu71tlIojA/3dWY8G3hkhlhyYIFAdTn7wLx0xhN5LWHsHhXdrcKEqrPpx60glcn qr6ceil4uMQcsxbF7DVupjsParJ5NYFLV7dZwHsF8fWSrOm1IrbMQ9TDVKk/4IPozqMG AP7v3qMJMkPjhFAAAODJL+LRXfrfoYd5Mk6eskbcmDS3tK4eEMzVJF1CLgeWc9SkC4j8 VeJ9UK8uWM6/p6FgUjMaSQSG6E1o/RiLkNqwnfHLRLqK8PqL/loKaUtrJ4htDLu4HsC5 I+BQ== X-Gm-Message-State: AOJu0YwuU4BNY4RsS74qvm97ZsP/eug7uLW/Cyux3GfHI4O6+04Fia4+ ZkKKliZS9CQTD8NXCRHqH0pfoysMcDiTfpjZ5wq2vI27SYKqh9UWvpVD/az9fHIj59eS8jU8Edt 00Pn3 X-Gm-Gg: AZuq6aIupwcCT7ML+10D+ll8hbShvDXgM7dbaiDyh/oj3x9x+ccmrULwKgb6I+S6B1a IefmggCLzRVY5E4+KjmjJ7PWGynsc1BiVx9M+YDhPsN+dPv1FG9a4J6YosrwzpU+mGbUOK9BHvD 81MNK75ytNg/a+L//2bHoHSZu7OnKMrGhKhENCLBoB8nntIzaOW4n9n7UfwuQZCrDMDTcBgkXhC Rt8g7wRicKoea1KTIufRQzyUWMFKa3nPrHClnKhI5aTmc4QP4aI6NxjVsCrdNIN5/BCzd3+G/sa zlKVflbLPOYK3SYH7dJGJd2AS+FTl9yfCv1QrFT+JQ2NN+8Getr5R1nHm9MTKUj0pKln2zOVTIH 386lu6leHkrz4gXXbmfHH8eOGk2S8djfcI5M0DRw6htxOAbkpWYaC2VPMMHh7JUuymDvGx11QMf xoPwzbnrKm1Y50F5TKjoZbqI6MzyakVT3zUA== X-Received: by 2002:a05:693c:300c:b0:2ba:68d6:47b6 with SMTP id 5a478bee46e88-2bac97d5e5amr529779eec.35.1771044913625; Fri, 13 Feb 2026 20:55:13 -0800 (PST) Received: from localhost ([2804:14d:7e39:8083:f04c:42e3:5943:38f6]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2bacb658521sm872333eec.16.2026.02.13.20.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:55:13 -0800 (PST) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Cc: Chris Packham , Luis , Tom Tromey , Simon Marchi Subject: [PATCH v2 2/2] GDB: aarch64-linux: Fix build failure on musl systems Date: Sat, 14 Feb 2026 01:54:49 -0300 Message-ID: <20260214045504.361392-3-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260214045504.361392-1-thiago.bauermann@linaro.org> References: <20260214045504.361392-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org When building against musl (e.g. on Alpine Linux), the following error happens: CXX linux-aarch64-low.o In file included from /home/bauermann/src/binutils-gdb/gdbserver/linux-aarch64-low.cc:23: /home/bauermann/src/binutils-gdb/gdbserver/../gdb/nat/aarch64-linux.h:123:8: error: redefinition of 'struct user_gcs' 123 | struct user_gcs | ^~~~~~~~ In file included from /home/bauermann/src/binutils-gdb/gdbserver/../gdb/nat/aarch64-linux.h:24: /usr/include/asm/ptrace.h:329:8: note: previous definition of 'struct user_gcs' 329 | struct user_gcs { | ^~~~~~~~ make[2]: *** [Makefile:565: linux-aarch64-low.o] Error 1 aarch64-linux-tdep.c fails to build in the same way. This happens because aarch64-linux.h uses GCS_MAGIC to see whether the system headers have GCS-related definitions. The problem is that GCS_MAGIC is defined in while struct gcs_user is defined in . It's fine on glibc systems because in the set of system headers that linux-aarch64-low.cc and aarch64-linux-tdep.c include, ends up being included implicitly as well. This doesn't happen when using musl's headers though. There isn't a macro in whose presence is correlated with the presence of the struct user_gcs definition, so a configure check is needed to detect it and conditionally define the struct. Note that there's another build issue with musl, described in PR gdb/33747 affecting compilation of gdb/ser-unix.c. In order to be able to test this patch, I applied the patch in comment 11 there. Tested with a native build on an Alpine Linux aarch64 system, and also verified that all gdb.arch/aarch64-gcs*.exp tests pass on it. Co-authored-by: Chris Packham --- gdb/nat/aarch64-linux.h | 5 ++--- gdbsupport/config.in | 3 +++ gdbsupport/configure | 36 ++++++++++++++++++++++++++++++++++++ gdbsupport/configure.ac | 19 +++++++++++++++++++ 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h index f7c09aa112bf..0f1fa093d003 100644 --- a/gdb/nat/aarch64-linux.h +++ b/gdb/nat/aarch64-linux.h @@ -115,8 +115,7 @@ typedef struct compat_siginfo #define cpt_si_band _sifields._sigpoll._band #define cpt_si_fd _sifields._sigpoll._fd -/* Make sure we only define these if the kernel header doesn't. */ -#ifndef GCS_MAGIC +#ifndef HAVE_STRUCT_USER_GCS /* GCS state (NT_ARM_GCS). */ @@ -127,7 +126,7 @@ struct user_gcs uint64_t gcspr_el0; }; -#endif /* GCS_MAGIC */ +#endif /* HAVE_STRUCT_USER_GCS */ void aarch64_siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from); diff --git a/gdbsupport/config.in b/gdbsupport/config.in index 0beacf22c057..2957ee0f0301 100644 --- a/gdbsupport/config.in +++ b/gdbsupport/config.in @@ -271,6 +271,9 @@ /* Define to 1 if `st_blocks' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS +/* Define to 1 if your system has struct user_gcs. */ +#undef HAVE_STRUCT_USER_GCS + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H diff --git a/gdbsupport/configure b/gdbsupport/configure index 05ad00f48c4f..584a80ef8255 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -14307,6 +14307,42 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Check for `struct user_gcs` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct user_gcs" >&5 +$as_echo_n "checking for struct user_gcs... " >&6; } +if ${gdb_cv_struct_user_gcs+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +struct user_gcs u; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gdb_cv_struct_user_gcs=yes +else + gdb_cv_struct_user_gcs=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_struct_user_gcs" >&5 +$as_echo "$gdb_cv_struct_user_gcs" >&6; } +if test "$gdb_cv_struct_user_gcs" = yes; then + +$as_echo "#define HAVE_STRUCT_USER_GCS 1" >>confdefs.h + +fi + # Set the 'development' global. . $srcdir/../bfd/development.sh diff --git a/gdbsupport/configure.ac b/gdbsupport/configure.ac index 5491b8f3f10a..6c06832f0913 100644 --- a/gdbsupport/configure.ac +++ b/gdbsupport/configure.ac @@ -68,6 +68,25 @@ GDB_AC_PTRACE AM_GDB_COMPILER_TYPE AM_GDB_WARNINGS +# Check for `struct user_gcs` +AC_CACHE_CHECK( + [for struct user_gcs], + [gdb_cv_struct_user_gcs], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include + #include ], + [struct user_gcs u;] + )], + [gdb_cv_struct_user_gcs=yes], + [gdb_cv_struct_user_gcs=no] + )] +) +if test "$gdb_cv_struct_user_gcs" = yes; then + AC_DEFINE(HAVE_STRUCT_USER_GCS, 1, + [Define to 1 if your system has struct user_gcs.]) +fi + # Set the 'development' global. . $srcdir/../bfd/development.sh