summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2025-07-15 20:34:55 +0200
committerAndreas Enge <andreas@enge.fr>2025-07-17 22:21:16 +0200
commit602b8fd3160cbb4852717fed3fed1ee665abed9e (patch)
tree23143dbcc872d6adb7d5c5f77b9b24fa627160ef
parente216b2e769c95d54ae261e661136df16c88f5ca3 (diff)
gnu: gdb@12: Fix build on aarch64.
* gnu/packages/gdb.scm (gdb/pinned)[arguments]<#:phases>: Add 'patch-aarch64 only on aarch64. Change-Id: I9715dfe53140bfc2adf56e7a165ea0a2c74e96a3
-rw-r--r--gnu/packages/gdb.scm11
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 2966b8f87e..14468e6b73 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020, 2021, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
+;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -70,6 +71,16 @@
#~'("--enable-targets=i586-pc-gnu,x86_64-pc-gnu")
#~'())
#:phases #~(modify-phases %standard-phases
+ ;; The following phase only applies to gdb@12, which
+ ;; inherits from this package. Remove it when removing
+ ;; gdb@12.
+ #$@(if (target-aarch64?)
+ #~((add-after 'unpack 'patch-aarch64
+ (lambda _
+ (substitute* "sim/aarch64/cpustate.h"
+ (("aarch64_get_CPSR_bits \\(sim_cpu \\*, uint32_t\\)")
+ "aarch64_get_CPSR_bits (sim_cpu *, FlagMask)")))))
+ #~())
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((sh (string-append (assoc-ref inputs "bash")