commit 1b5cb74b23dccd8de65d0f96214b67a158f3dfc9
author Fangrui Song <maskray@google.com> Thu Apr 09 14:09:43 2020 -0700
committer Fangrui Song <maskray@google.com> Thu Apr 09 15:46:48 2020 -0700
tree 989156f4d139dee0b3c4d45d2d4ffddd25649497
parent 1b7fdeb03b94c8204198cb80a42273fef8ae77cd

[libunwind] Clean up __arm64__

`__aarch64__` is defined for the target (since the beginning of arm64 support: clang 3.5).
`__arm64__` is only defined for the Darwin OS on AArch64.

`defined(__aarch64__) || defined(__arm64__)` can be simplied as `defined(__aarch64__)`

Darwin AArch64 uses %% as the assembly separator (see AArch64MCAsmInfo.cpp).
Make the intention explicit in src/assembly.h

With this change, the libunwind code base has no reference of `__arm64__`/`__arm64`.

Reviewed By: #libunwind, ldionne, mstorsjo

Differential Revision: https://reviews.llvm.org/D77829

Cr-Mirrored-From: https://chromium.googlesource.com/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: f3d460ce5874e4dd12b8cf8b227de4cec43a685c

src/UnwindRegistersRestore.S

diff --git a/src/UnwindRegistersRestore.S b/src/UnwindRegistersRestore.S
index cbb2fd4..266da5e 100644
--- a/src/UnwindRegistersRestore.S
+++ b/src/UnwindRegistersRestore.S
@@ -557,7 +557,7 @@
   lwz     %r3,  20(%r3)   // do r3 last
   bctr
 
-#elif defined(__arm64__) || defined(__aarch64__)
+#elif defined(__aarch64__)
 
 //
 // void libunwind::Registers_arm64::jumpto()

src/UnwindRegistersSave.S

diff --git a/src/UnwindRegistersSave.S b/src/UnwindRegistersSave.S
index da91abc..5a89d19 100644
--- a/src/UnwindRegistersSave.S
+++ b/src/UnwindRegistersSave.S
@@ -697,7 +697,7 @@
   blr
 
 
-#elif defined(__arm64__) || defined(__aarch64__)
+#elif defined(__aarch64__)
 
 //
 // extern int __unw_getcontext(unw_context_t* thread_state)

src/Unwind_AppleExtras.cpp

diff --git a/src/Unwind_AppleExtras.cpp b/src/Unwind_AppleExtras.cpp
index 248d995..5363039 100644
--- a/src/Unwind_AppleExtras.cpp
+++ b/src/Unwind_AppleExtras.cpp
@@ -56,7 +56,7 @@
           __attribute__((visibility("default"))) const char sym##_tmp42 = 0; \
        extern const char sym##_tmp43 __asm("$ld$hide$os4.3$_" #sym ); \
           __attribute__((visibility("default"))) const char sym##_tmp43 = 0;
-#elif defined(__arm64__)
+#elif defined(__aarch64__)
   #define NOT_HERE_BEFORE_10_6(sym)
   #define NEVER_HERE(sym)
 #else

src/assembly.h

diff --git a/src/assembly.h b/src/assembly.h
index 7132b6c..2c1337b 100644
--- a/src/assembly.h
+++ b/src/assembly.h
@@ -28,7 +28,7 @@
 #ifdef _ARCH_PWR8
 #define PPC64_HAS_VMX
 #endif
-#elif defined(__arm64__)
+#elif defined(__APPLE__) && defined(__aarch64__)
 #define SEPARATOR %%
 #else
 #define SEPARATOR ;

src/config.h

diff --git a/src/config.h b/src/config.h
index 5658b32..bce53c2 100644
--- a/src/config.h
+++ b/src/config.h
@@ -102,7 +102,7 @@
 #if defined(__i386__) || defined(__x86_64__) ||                                \
     defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) ||        \
     (!defined(__APPLE__) && defined(__arm__)) ||                               \
-    (defined(__arm64__) || defined(__aarch64__)) ||                            \
+    defined(__aarch64__) ||                                                    \
     defined(__mips__) ||                                                       \
     defined(__riscv)
 #if !defined(_LIBUNWIND_BUILD_SJLJ_APIS)