diff --git a/chromium-122-arm64-memory_tagging.patch b/chromium-122-arm64-memory_tagging.patch deleted file mode 100644 index 6850e586..00000000 --- a/chromium-122-arm64-memory_tagging.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni.me chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni ---- chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni.me 2024-02-22 20:22:44.115269845 +0100 -+++ chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni 2024-02-22 20:23:07.067681890 +0100 -@@ -29,8 +29,7 @@ if (is_nacl) { - assert(false, "Unknown CPU: $current_cpu") - } - --has_memory_tagging = -- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) -+has_memory_tagging = false - - declare_args() { - # Causes all the allocations to be routed via allocator_shim.cc. Usually, diff --git a/chromium-124-arm64-memory_tagging.patch b/chromium-124-arm64-memory_tagging.patch new file mode 100644 index 00000000..3a3766aa --- /dev/null +++ b/chromium-124-arm64-memory_tagging.patch @@ -0,0 +1,13 @@ +diff -up chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni +--- chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me 2024-04-18 15:12:34.007397489 +0200 ++++ chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni 2024-04-18 15:13:06.166051954 +0200 +@@ -32,8 +32,7 @@ if (is_nacl) { + # Increases the size of the empty slot span ring. + use_large_empty_slot_span_ring = is_mac + +-has_memory_tagging = +- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) ++has_memory_tagging = false + + declare_args() { + # Causes all the allocations to be routed via allocator_shim.cc. Usually, diff --git a/chromium.spec b/chromium.spec index c1c19228..44df22ea 100644 --- a/chromium.spec +++ b/chromium.spec @@ -433,7 +433,7 @@ Patch304: chromium-117-string-convert.patch # disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver # not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found -Patch305: chromium-122-arm64-memory_tagging.patch +Patch305: chromium-124-arm64-memory_tagging.patch Patch306: chromium-119-assert.patch