https://github.com/llvmbot created
https://github.com/llvm/llvm-project/pull/155899
Backport 7b3745ed0c9b34ea78e9e9098736fe91930d103b
2eaba46f463e79212d549e2ebf74e5d53b88b76b
Requested by: @brad0
>From a7880e787a617752bc67d1782f13a0b0719f74c4 Mon Sep 17 00:00:00 2001
From: Brad Smith <b...@comstyle.com>
Date: Thu, 28 Aug 2025 02:49:59 -0400
Subject: [PATCH 1/2] [builtins] Rename freebsd to elf_aux_info to reflect the
function called. NFCI (#155749)
(cherry picked from commit 7b3745ed0c9b34ea78e9e9098736fe91930d103b)
---
compiler-rt/lib/builtins/cpu_model/aarch64.c | 4 ++--
.../cpu_model/aarch64/fmv/{freebsd.inc => elf_aux_info.inc} | 0
.../aarch64/lse_atomics/{freebsd.inc => elf_aux_info.inc} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename compiler-rt/lib/builtins/cpu_model/aarch64/fmv/{freebsd.inc =>
elf_aux_info.inc} (100%)
rename compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/{freebsd.inc =>
elf_aux_info.inc} (100%)
diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64.c
b/compiler-rt/lib/builtins/cpu_model/aarch64.c
index be002dd71992a..f41c9301dc6a4 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64.c
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64.c
@@ -39,7 +39,7 @@ _Bool __aarch64_have_lse_atomics
#include <sys/auxv.h>
// clang-format on
#include "aarch64/hwcap.inc"
-#include "aarch64/lse_atomics/freebsd.inc"
+#include "aarch64/lse_atomics/elf_aux_info.inc"
#elif defined(__Fuchsia__)
#include "aarch64/hwcap.inc"
#include "aarch64/lse_atomics/fuchsia.inc"
@@ -70,7 +70,7 @@ struct {
#include "aarch64/fmv/apple.inc"
#elif defined(__FreeBSD__)
#include "aarch64/fmv/mrs.inc"
-#include "aarch64/fmv/freebsd.inc"
+#include "aarch64/fmv/elf_aux_info.inc"
#elif defined(__Fuchsia__)
#include "aarch64/fmv/fuchsia.inc"
#elif defined(__ANDROID__)
diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/freebsd.inc
b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/elf_aux_info.inc
similarity index 100%
rename from compiler-rt/lib/builtins/cpu_model/aarch64/fmv/freebsd.inc
rename to compiler-rt/lib/builtins/cpu_model/aarch64/fmv/elf_aux_info.inc
diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/freebsd.inc
b/compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/elf_aux_info.inc
similarity index 100%
rename from compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/freebsd.inc
rename to
compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/elf_aux_info.inc
>From 795e56f2f0c60e0c1f89100ee64916ecd269d1c0 Mon Sep 17 00:00:00 2001
From: Brad Smith <b...@comstyle.com>
Date: Thu, 28 Aug 2025 13:58:47 -0400
Subject: [PATCH 2/2] compiler-rt: Use OpenBSD's elf_aux_info to detect AArch64
HW features (#155768)
(cherry picked from commit 2eaba46f463e79212d549e2ebf74e5d53b88b76b)
---
compiler-rt/lib/builtins/cpu_model/aarch64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64.c
b/compiler-rt/lib/builtins/cpu_model/aarch64.c
index f41c9301dc6a4..d7880529ebe70 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64.c
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64.c
@@ -34,7 +34,7 @@ typedef struct __ifunc_arg_t {
_Bool __aarch64_have_lse_atomics
__attribute__((visibility("hidden"), nocommon)) = false;
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
// clang-format off: should not reorder sys/auxv.h alphabetically
#include <sys/auxv.h>
// clang-format on
@@ -68,7 +68,7 @@ struct {
// clang-format off
#if defined(__APPLE__)
#include "aarch64/fmv/apple.inc"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
#include "aarch64/fmv/mrs.inc"
#include "aarch64/fmv/elf_aux_info.inc"
#elif defined(__Fuchsia__)
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
