diff -Nru rr-5.7.0/debian/changelog rr-5.7.0/debian/changelog --- rr-5.7.0/debian/changelog 2023-10-27 12:31:29.000000000 +0200 +++ rr-5.7.0/debian/changelog 2024-05-08 09:02:10.000000000 +0200 @@ -1,3 +1,9 @@ +rr (5.7.0-2ubuntu1) oracular; urgency=medium + + * debian/patches: Add support for AMD Phoenix Zen 4 CPU (LP: #2065141) + + -- Marco Trevisan (TreviƱo) Wed, 08 May 2024 09:02:10 +0200 + rr (5.7.0-2build1) noble; urgency=medium * Rebuild against new libcapnp-1.0.1. diff -Nru rr-5.7.0/debian/control rr-5.7.0/debian/control --- rr-5.7.0/debian/control 2023-10-07 21:36:25.000000000 +0200 +++ rr-5.7.0/debian/control 2024-05-08 09:02:10.000000000 +0200 @@ -1,5 +1,6 @@ Source: rr -Maintainer: Stephen Kitt +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Stephen Kitt Section: devel Priority: optional Build-Depends: capnproto, diff -Nru rr-5.7.0/debian/patches/amd-Add-Phoenix-Zen-4-CPU-ID.patch rr-5.7.0/debian/patches/amd-Add-Phoenix-Zen-4-CPU-ID.patch --- rr-5.7.0/debian/patches/amd-Add-Phoenix-Zen-4-CPU-ID.patch 1970-01-01 01:00:00.000000000 +0100 +++ rr-5.7.0/debian/patches/amd-Add-Phoenix-Zen-4-CPU-ID.patch 2024-05-08 09:02:10.000000000 +0200 @@ -0,0 +1,36 @@ +From: Ben Gamari +Date: Sat, 11 Nov 2023 09:43:06 -0500 +Subject: amd: Add Phoenix (Zen 4) CPU ID + +Applied-Upstream: yes +Origin: https://github.com/rr-debugger/rr/commit/d9e4547a8 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rr/+bug/2065141 +--- + src/PerfCounters_x86.h | 1 + + src/counters-test/counters.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/PerfCounters_x86.h b/src/PerfCounters_x86.h +index 26db2cb..09ae11c 100644 +--- a/src/PerfCounters_x86.h ++++ b/src/PerfCounters_x86.h +@@ -110,6 +110,7 @@ static CpuMicroarch compute_cpu_microarch() { + case 0x50f00: // Cezanne (Zen 3) + case 0x40f40: // Rembrandt (Zen 3+) + case 0x60f10: // Raphael (Zen 4) ++ case 0x70f40: // Phoenix (Zen 4) + if (ext_family == 0xa) { + return AMDZen; + } +diff --git a/src/counters-test/counters.cc b/src/counters-test/counters.cc +index ab53d63..84beee3 100644 +--- a/src/counters-test/counters.cc ++++ b/src/counters-test/counters.cc +@@ -355,6 +355,7 @@ static CpuMicroarch compute_cpu_microarch(void) { + case 0x50f00: // Cezanne (Zen 3) + case 0x40f40: // Rembrandt (Zen 3+) + case 0x60f10: // Raphael (Zen 4) ++ case 0x70f40: // Phoenix (Zen 4) + if (ext_family == 0xa) { + return AMDZen; + } diff -Nru rr-5.7.0/debian/patches/series rr-5.7.0/debian/patches/series --- rr-5.7.0/debian/patches/series 2023-10-15 21:38:21.000000000 +0200 +++ rr-5.7.0/debian/patches/series 2024-05-08 09:02:10.000000000 +0200 @@ -3,3 +3,4 @@ reproducible.patch system-brotli.patch test-locale.patch +amd-Add-Phoenix-Zen-4-CPU-ID.patch