From 3a08413df57b29ed7a8b185887d01dc8d31e2dd1 Mon Sep 17 00:00:00 2001
From: Noah Pendleton <2538614+noahp@users.noreply.github.com>
Date: Fri, 3 Jan 2025 15:39:19 -0500
Subject: [PATCH] GDB 15.2

---
 .github/workflows/build.yml                   |  2 +-
 gdb-multi-arch/build.sh                       |  2 +-
 gdb-multi-arch/fix-disassemble-segfault.patch | 25 -------------------
 gdb-multi-arch/meta.yaml                      |  5 ++--
 4 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 gdb-multi-arch/fix-disassemble-segfault.patch

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4489e74..a126df8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        platform: [ubuntu-20.04, macos-12, macos-13-xlarge] #  windows-2022] windows is a bit sad :'(
+        platform: [ubuntu-20.04, macos-13, macos-13-xlarge] #  windows-2022] windows is a bit sad :'(
     runs-on: ${{ matrix.platform }}
 
     # set bash to be a login shell, so that /etc/profile is sourced and conda
diff --git a/gdb-multi-arch/build.sh b/gdb-multi-arch/build.sh
index 4fc780d..6b2e905 100644
--- a/gdb-multi-arch/build.sh
+++ b/gdb-multi-arch/build.sh
@@ -61,7 +61,7 @@ pushd "${REAL_TARGET_PREFIX}"/bin/
     mv arm-elf-linux-size size
     mv arm-elf-linux-strings strings
     strip addr2line
-    strip gdb
+    # strip gdb
     strip objdump
     strip objcopy
     strip size
diff --git a/gdb-multi-arch/fix-disassemble-segfault.patch b/gdb-multi-arch/fix-disassemble-segfault.patch
deleted file mode 100644
index 6be1475..0000000
--- a/gdb-multi-arch/fix-disassemble-segfault.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f4d2522f60022dca9922193d960ff72c0ed4a7d4 Mon Sep 17 00:00:00 2001
-From: Tyler Hoffman <tyler@memfault.com>
-Date: Fri, 22 Jul 2022 14:38:56 -0700
-Subject: [PATCH] Fix disassemble segfault - check symtab size
-
----
- opcodes/arm-dis.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
-index 92cd098d6c..c0789c4e1b 100644
---- a/opcodes/arm-dis.c
-+++ b/opcodes/arm-dis.c
-@@ -11846,7 +11846,7 @@ mapping_symbol_for_insn (bfd_vma pc, struct disassemble_info *info,
-     type = MAP_ARM;
-   struct arm_private_data *private_data;
- 
--  if (info->private_data == NULL
-+  if (info->private_data == NULL  || info->symtab_size == 0
-       || bfd_asymbol_flavour (*info->symtab) != bfd_target_elf_flavour)
-     return false;
- 
--- 
-2.36.0
-
diff --git a/gdb-multi-arch/meta.yaml b/gdb-multi-arch/meta.yaml
index 9fa5acb..7c267b6 100644
--- a/gdb-multi-arch/meta.yaml
+++ b/gdb-multi-arch/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "multi-arch-gdb" %}
-{% set version = "12.1" %}
-{% set sha256 = "417718b5348fe026f3e4d9c36bf4c6645083e58cb6ac2b8ffc467030be2d6b88" %}
+{% set version = "15.2" %}
+{% set sha256 = "31ae16449613b0fd70e67f11bf6851dcc258a9531a91f9503524442a2f64331f" %}
 
 package:
   name: {{ name }}
@@ -10,7 +10,6 @@ source:
   - url: https://github.com/bminor/binutils-gdb/archive/gdb-{{ version }}-release.tar.gz
     sha256: {{ sha256 }}
     patches:
-      - fix-disassemble-segfault.patch
       # mac doesn't build without this patch
       - mac-build-fix.patch  # [osx]