[compiler-rt] 7353507 - builtins: replicate `aarch64.c` change into `aarch64.h`

[Saleem Abdulrasool via llvm-commits]

Author: Saleem Abdulrasool
Date: 2024-09-12T08:42:51-07:00
New Revision: 73535076f2c517fd04c43cccab4c47bd38b39d49

URL: https://github.com/llvm/llvm-project/commit/73535076f2c517fd04c43cccab4c47bd38b39d49
DIFF: https://github.com/llvm/llvm-project/commit/73535076f2c517fd04c43cccab4c47bd38b39d49.diff

LOG: builtins: replicate `aarch64.c` change into `aarch64.h`

Perform the same macro expansion in the header to improve handling
the various ARM64 environments which use different CPU architecture
identification macro spellings.

Added: 
    

Modified: 
    compiler-rt/lib/builtins/cpu_model/aarch64.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/builtins/cpu_model/aarch64.h b/compiler-rt/lib/builtins/cpu_model/aarch64.h
index f6cbf75d582f3a..2a734b02b7c90f 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64.h
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64.h
@@ -8,7 +8,7 @@
 
 #include "cpu_model.h"
 
-#if !defined(__aarch64__)
+#if !defined(__aarch64__) && !defined(__arm64__) && !defined(_M_ARM64)
 #error This file is intended only for aarch64-based targets
 #endif