| commit | bfd7024b0d665de02abbfc7b16f593020d2c12c9 | [log] [tgz] |
|---|---|---|
| author | Aly ElAshram <71949028+AlyElashram@users.noreply.github.com> | Fri May 30 06:41:34 2025 +0300 |
| committer | GitHub <noreply@github.com> | Thu May 29 23:41:34 2025 -0400 |
| tree | eca31879fe2b4cfbb9c2d8648c91fc5f6f0b3490 | |
| parent | fbbae9ea2bd1c89e39deb62c8a2f549a33e51fae [diff] |
[LibC] Refactor arm64 to aarch64 for darwin. (#141509) Fixes [#141505](https://github.com/llvm/llvm-project/issues/141505) The main intention behind this PR is to update the LibCTargetArchitecture for arm64 to use the implementation of aarch64 architecture and not arm32. This is a historical issue , and is a blocker to issue #138407. The intended fix is to set the `LibCTargetArchitecture` to aarch64 when it matches arm64 , this in turn would help us run darwin/aarch64 specific code on our MacOs pipeline in the git actions. Methods used to search and find "darwin/arm" directories was 1. "find . -type d -path "*/libc/*/darwin/arm" in a linux terminal to check for arm specifically 2. "find . -type d -path "*/libc/*/darwin/*" to ensure there are no directories that are named "*arm*" where star is a wildcard for any character.
diff --git a/libc/cmake/modules/LLVMLibCArchitectures.cmake b/libc/cmake/modules/LLVMLibCArchitectures.cmake index 62f3a2e..c94a407 100644 --- a/libc/cmake/modules/LLVMLibCArchitectures.cmake +++ b/libc/cmake/modules/LLVMLibCArchitectures.cmake
@@ -33,12 +33,10 @@ # value. if(target_arch MATCHES "^mips") set(target_arch "mips") - elseif(target_arch MATCHES "^arm") - # TODO(lntue): Shall we separate `arm64`? It is currently recognized as - # `arm` here. - set(target_arch "arm") - elseif(target_arch MATCHES "^aarch64") + elseif(target_arch MATCHES "^aarch64|^arm64") set(target_arch "aarch64") + elseif(target_arch MATCHES "^arm") + set(target_arch "arm") elseif(target_arch MATCHES "(x86_64)|(AMD64|amd64)") set(target_arch "x86_64") elseif(target_arch MATCHES "(^i.86$)")
diff --git a/libc/config/darwin/arm/entrypoints.txt b/libc/config/darwin/aarch64/entrypoints.txt similarity index 100% rename from libc/config/darwin/arm/entrypoints.txt rename to libc/config/darwin/aarch64/entrypoints.txt
diff --git a/libc/config/darwin/arm/headers.txt b/libc/config/darwin/aarch64/headers.txt similarity index 100% rename from libc/config/darwin/arm/headers.txt rename to libc/config/darwin/aarch64/headers.txt
diff --git a/libc/src/__support/OSUtil/darwin/arm/CMakeLists.txt b/libc/src/__support/OSUtil/darwin/aarch64/CMakeLists.txt similarity index 100% rename from libc/src/__support/OSUtil/darwin/arm/CMakeLists.txt rename to libc/src/__support/OSUtil/darwin/aarch64/CMakeLists.txt
diff --git a/libc/src/__support/OSUtil/darwin/arm/syscall.h b/libc/src/__support/OSUtil/darwin/aarch64/syscall.h similarity index 100% rename from libc/src/__support/OSUtil/darwin/arm/syscall.h rename to libc/src/__support/OSUtil/darwin/aarch64/syscall.h
diff --git a/libc/src/__support/OSUtil/darwin/syscall.h b/libc/src/__support/OSUtil/darwin/syscall.h index eab9636..463407d 100644 --- a/libc/src/__support/OSUtil/darwin/syscall.h +++ b/libc/src/__support/OSUtil/darwin/syscall.h
@@ -15,7 +15,7 @@ #include "src/__support/macros/properties/architectures.h" #ifdef LIBC_TARGET_ARCH_IS_ANY_ARM -#include "arm/syscall.h" +#include "aarch64/syscall.h" #else #error "Unsupported architecture" #endif