From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AZ5mN4AElGmOej4AWB0awg (envelope-from ) for ; Tue, 17 Feb 2026 01:02:40 -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=a8+oHYvG; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id DCE2C1E0BA; Tue, 17 Feb 2026 01:02:40 -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 D07BE1E089 for ; Tue, 17 Feb 2026 01:02:39 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 9564D4BAE7C8 for ; Tue, 17 Feb 2026 06:02:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9564D4BAE7C8 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=a8+oHYvG Received: from mail-vs1-xe32.google.com (mail-vs1-xe32.google.com [IPv6:2607:f8b0:4864:20::e32]) by sourceware.org (Postfix) with ESMTPS id 63E8A4BAE7E1 for ; Tue, 17 Feb 2026 06:01:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 63E8A4BAE7E1 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 63E8A4BAE7E1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::e32 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771308087; cv=none; b=TBQZ402abH5VvnucEqL7FEnLj6ifypFRSHv6y4knViJAzF5BmzdI6Ugy0CkFyaSKX2SbKxjQdCZcCFxyeg1Y2FsRJMot+GMCtBisazHMXq22TRZv+bh3otfUfRqMc5slSJr4nxPVmIkcDeh4pw7ijsycjOxfmYAZSD2O+gKx2p8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771308087; c=relaxed/simple; bh=nk7ycuMlyVw6vbdlJ6+XYMlmeHVeYLcWrbmf6LezdQg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TFmLeajJGfslOW3+JBQT58aav6XqE2zgWTW1clMe/cLGOukpAmbxvHDiaUwC2GU5sLV1oZ0Yv9QoLSiyKbbA1KCxBUiKDDtsYJIOmWmP97jOU2/H/xE4Tj28uYHUnCoEB4fJI3+1Bq0SQSelEHsmG/vimyb1RjnPlgRWy+2r7Lo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 63E8A4BAE7E1 Received: by mail-vs1-xe32.google.com with SMTP id ada2fe7eead31-5fdf6ad2517so2137832137.2 for ; Mon, 16 Feb 2026 22:01:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771308087; x=1771912887; 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=SJEHudOL8xgvxOj9KSugkXVtpfZtJB6gQf3bQkQhsjg=; b=a8+oHYvGkiDHXc7xNxBXC62KuBnK21oAeP3vQ7D7XveyeYR/VIIXjKGrcqM1I108rl GrjyHNEq3yL1oDLuDWl9XV9re/5toQCIBa0F2p14nac225wS/NLHWjVAr3VowqUOkb5M 6If9tAatT/YamgpjnGx9zhD50vmZ9K59lwTdYvgTYjuNZol9rlDjeEWqfSRskJIXgbBE qgjv4aJkusCr9luWluH37deZBJUz4tuR5ut1Lkabm1s81HVGw3JNL3adSMpIlTbh+0DB EakQnh4oVzkabhh99IxUUpH2y1ZKaxKzRFYHPpxdJi68aLkfr6HAOyRTvKewI+GKo23x 1fKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771308087; x=1771912887; 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=SJEHudOL8xgvxOj9KSugkXVtpfZtJB6gQf3bQkQhsjg=; b=Su5SEceFEEwCg0hcwfR0H7rdPDlR5W8ftNUCtpoV1fINwXdN6NSUO4uC7vnsIwV3qP gypAcligR8Up+GOO/2qlR6EBBkG04bUNRu4ib6gQ/+yabWPBNfZrR4xJcWKJdR5U0KPj mCewv62ItZNhkgz4HycS63jpWVE2Hs9avdljqF0PVIlmpxkzT6BKghiiiFzk5OzZzD7m pnHLKUflkFypSeAgG8QjJZeUxlHYisFe6TefVm0ZIDJfOI5kpRpvCd+cOwiOWtHu1n3X tpIVkTjJ7gTwx3lKzM6kabKVGkMgRsYVnQ4g8wBAJe3ue4UegMZ2YaX2Lx38Z0qSl0L1 jswQ== X-Gm-Message-State: AOJu0YxP5dYK58sH6CwYJNezcDWHkXc+OsYhHYsCUOq8cioCs3n9aSRy PFe+tqE+vEYB2lJF7B/UVuj3k8Er5ePImvKYvK86+mgfRvc177n+Ol+t2dBYAksZ3u1SoW9gojO BnCbn X-Gm-Gg: AZuq6aKuu3unLyg9/HiH2QVIpd31dhuaGhcbkKk766ndGQLhc+I8iJabvC3VSNP+TZA UfNa4KZqZE5uRzZcpkZi7ho/NhxZswZxUB3s/BCraooUPTZhjzQG6wfiu8wg4dSPxmWMW8s/V+/ rhcQ8DyxLPsFaNqjPZglFF+maK7OXPMF5htdBF5mFpckWHv4bQZWwj4andUJ7P+xSr56COdrTWf aUupfTQWoqGXfWwICmgXB4pwk3Q363pagkdLzBUaIq2ryugFQPUeBh8zxQlzJY0md8PAuV9Li7e EfSriPgOBOECLVH/4+Iox3b2q0D++ktzxrporPT5hhMfq3qadE8tE7Tr3LARjXmY4N/5SUGNkVv BLTP9/bHZFRL4A9hYmdxXCA00hF3ox7MjMF5m+L0opcs8G5bwyFt79MXCGI2TCH3fl49Jfq6pEJ twMCpGKDYNSH1zESMWEZyDawsWqxWMm0bKFA== X-Received: by 2002:a05:6102:149d:b0:5fd:ea66:92e5 with SMTP id ada2fe7eead31-5fe2af575f8mr3687402137.22.1771308086721; Mon, 16 Feb 2026 22:01:26 -0800 (PST) Received: from localhost ([2804:14d:7e39:8083:f04c:42e3:5943:38f6]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-94afd14d749sm7794061241.1.2026.02.16.22.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Feb 2026 22:01:25 -0800 (PST) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Cc: Chris Packham , Luis , Tom Tromey , Simon Marchi Subject: [PATCH v3 4/4] GDB: aarch64-linux: Fix build failure on musl systems Date: Tue, 17 Feb 2026 03:01:02 -0300 Message-ID: <20260217060106.1906312-5-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260217060106.1906312-1-thiago.bauermann@linaro.org> References: <20260217060106.1906312-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:48: /home/bauermann/src/binutils-gdb/gdbserver/../gdb/nat/aarch64-gcs-linux-ptrace.h:31:8: error: redefinition of 'struct user_gcs' 31 | struct user_gcs | ^~~~~~~~ In file included from /home/bauermann/src/binutils-gdb/gdbserver/linux-aarch64-low.cc:35: /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 --- Changes since v2: - It's the same patch except that the header changed is gdb/nat/aarch64-gcs-linux-ptrace.h rather than gdb/nat/aarch64-linux.h, which doesn't exist in this version of the patch series. gdb/nat/aarch64-gcs-linux-ptrace.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-gcs-linux-ptrace.h b/gdb/nat/aarch64-gcs-linux-ptrace.h index f45a1059cd0a..f3dda08a1d27 100644 --- a/gdb/nat/aarch64-gcs-linux-ptrace.h +++ b/gdb/nat/aarch64-gcs-linux-ptrace.h @@ -23,8 +23,7 @@ #include #include -/* 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). */ @@ -35,6 +34,6 @@ struct user_gcs uint64_t gcspr_el0; }; -#endif /* GCS_MAGIC */ +#endif /* HAVE_STRUCT_USER_GCS */ #endif /* GDB_NAT_AARCH64_GCS_LINUX_PTRACE_H */ 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