From 5aec88f0e6920b27dbc6cf7b4625088291441210 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Sat, 19 Oct 2024 09:57:56 -0400
Subject: [PATCH] [hwasan], [gn]: Fix formatting of hwasan cmake; re-sync gn
 file for b515d9ea1e43

---
 compiler-rt/lib/hwasan/CMakeLists.txt                  |  9 ++++++---
 .../utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn | 10 ++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/compiler-rt/lib/hwasan/CMakeLists.txt b/compiler-rt/lib/hwasan/CMakeLists.txt
index 086079c7536e5d..afafa0c4a92761 100644
--- a/compiler-rt/lib/hwasan/CMakeLists.txt
+++ b/compiler-rt/lib/hwasan/CMakeLists.txt
@@ -24,16 +24,19 @@ foreach(arch ${HWASAN_SUPPORTED_ARCH})
   if(${arch} MATCHES "aarch64")
     list(APPEND HWASAN_RTL_SOURCES
       hwasan_setjmp_aarch64.S
-      hwasan_tag_mismatch_aarch64.S)
+      hwasan_tag_mismatch_aarch64.S
+      )
   endif()
   if(${arch} MATCHES "riscv64")
     list(APPEND HWASAN_RTL_SOURCES
       hwasan_setjmp_riscv64.S
-      hwasan_tag_mismatch_riscv64.S)
+      hwasan_tag_mismatch_riscv64.S
+      )
   endif()
   if(${arch} MATCHES "x86_64")
     list(APPEND HWASAN_RTL_SOURCES
-      hwasan_setjmp_x86_64.S)
+      hwasan_setjmp_x86_64.S
+      )
   endif()
 endforeach()
 
diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
index f453dde0ea93eb..e39d8114d1f473 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
@@ -64,10 +64,16 @@ source_set("sources") {
     "hwasan_type_test.cpp",
   ]
   if (current_cpu == "arm64") {
-    sources += [ "hwasan_setjmp_aarch64.S" ]
+    sources += [
+      "hwasan_setjmp_aarch64.S",
+      "hwasan_tag_mismatch_aarch64.S",
+    ]
   }
   if (current_cpu == "riscv64") {
-    sources += [ "hwasan_setjmp_riscv64.S" ]
+    sources += [
+      "hwasan_setjmp_riscv64.S",
+      "hwasan_tag_mismatch_riscv64.S",
+    ]
   }
   if (current_cpu == "x64") {
     sources += [ "hwasan_setjmp_x86_64.S" ]