Revert "switch builtin mechanisms -- make aarch64 specific"

This reverts commit 82d2a08.

Author: AdamGlass

clang/include/clang/Basic/Builtins.td

@@ -2570,12 +2570,84 @@ def InterlockedBittestAndReset : MSLangBuiltin, MSInt32_64Template {
   let Prototype = "unsigned char(T volatile*, T)";
 }
 
+def InterlockedBittestAndReset_acq : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandreset_acq"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(msint32_t volatile*, msint32_t)";
+}
+
+def InterlockedBittestAndReset_nf : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandreset_nf"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(msint32_t volatile*, msint32_t)";
+}
+
+def InterlockedBittestAndReset_rel : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandreset_rel"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(msint32_t volatile*, msint32_t)";
+}
+
+def InterlockedBittestAndReset64_acq : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandreset64_acq"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(int64_t volatile*, int64_t)";
+}
+
+def InterlockedBittestAndReset64_nf : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandreset64_nf"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(int64_t volatile*, int64_t)";
+}
+
+def InterlockedBittestAndReset64_rel : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandreset64_rel"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(int64_t volatile*, int64_t)";
+}
+
 def InterlockedBittestAndSet : MSLangBuiltin, MSInt32_64Template {
   let Spellings = ["_interlockedbittestandset"];
   let Attributes = [NoThrow];
   let Prototype = "unsigned char(T volatile*, T)";
 }
 
+def InterlockedBittestAndSet_acq : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandset_acq"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(msint32_t volatile*, msint32_t)";
+}
+
+def InterlockedBittestAndSet_nf : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandset_nf"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(msint32_t volatile*, msint32_t)";
+}
+
+def InterlockedBittestAndSet_rel : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandset_rel"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(msint32_t volatile*, msint32_t)";
+}
+
+def InterlockedBittestAndSet64_acq : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandset64_acq"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(int64_t volatile*, int64_t)";
+}
+
+def InterlockedBittestAndSet64_nf : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandset64_nf"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(int64_t volatile*, int64_t)";
+}
+
+def InterlockedBittestAndSet64_rel : MSLangBuiltin {
+  let Spellings = ["_interlockedbittestandset64_rel"];
+  let Attributes = [NoThrow];
+  let Prototype = "unsigned char(int64_t volatile*, int64_t)";
+}
+
 def IsoVolatileLoad : MSLangBuiltin, Int8_16_32_64Template {
   let Spellings = ["__iso_volatile_load"];
   let Attributes = [NoThrow];

clang/include/clang/Basic/BuiltinsAArch64.def

@@ -263,19 +263,6 @@ TARGET_HEADER_BUILTIN(_InterlockedDecrement64_acq, "LLiLLiD*", "nh", INTRIN_H, A
 TARGET_HEADER_BUILTIN(_InterlockedDecrement64_nf,  "LLiLLiD*", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
 TARGET_HEADER_BUILTIN(_InterlockedDecrement64_rel, "LLiLLiD*", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
 
-TARGET_HEADER_BUILTIN(_interlockedbittestandreset_acq,   "UcNiD*Ni", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandreset_nf,    "UcNiD*Ni", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandreset_rel,   "UcNiD*Ni", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandreset64_acq, "UcWiD*Wi", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandreset64_nf,  "UcWiD*Wi", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandreset64_rel, "UcWiD*Wi", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandset_acq,     "UcNiD*Ni", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandset_nf,      "UcNiD*Ni", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandset_rel,     "UcNiD*Ni", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandset64_acq,   "UcWiD*Wi", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandset64_nf,    "UcWiD*Wi", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-TARGET_HEADER_BUILTIN(_interlockedbittestandset64_rel,   "UcWiD*Wi", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
-
 TARGET_HEADER_BUILTIN(_ReadWriteBarrier, "v", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
 TARGET_HEADER_BUILTIN(__getReg, "ULLii", "nh", INTRIN_H, ALL_MS_LANGUAGES, "")
 TARGET_HEADER_BUILTIN(_ReadStatusReg,  "LLii",  "nh", INTRIN_H, ALL_MS_LANGUAGES, "")

clang/lib/Headers/intrin.h

@@ -370,18 +370,6 @@ static __inline__ void __DEFAULT_FN_ATTRS __nop(void) {
 \*----------------------------------------------------------------------------*/
 #if defined(__aarch64__) || defined(__arm64ec__)
 unsigned __int64 __getReg(int);
-unsigned char _interlockedbittestandreset_acq(long volatile *, long);
-unsigned char _interlockedbittestandreset_nf(long volatile *, long);
-unsigned char _interlockedbittestandreset_rel(long volatile *, long);
-unsigned char _interlockedbittestandreset64_acq(__int64 volatile *, __int64);
-unsigned char _interlockedbittestandreset64_nf(__int64 volatile *, __int64);
-unsigned char _interlockedbittestandreset64_rel(__int64 volatile *, __int64);
-unsigned char _interlockedbittestandset_acq(long volatile *, long);
-unsigned char _interlockedbittestandset_nf(long volatile *, long);
-unsigned char _interlockedbittestandset_rel(long volatile *, long);
-unsigned char _interlockedbittestandset64_acq(__int64 volatile *, __int64);
-unsigned char _interlockedbittestandset64_nf(__int64 volatile *, __int64);
-unsigned char _interlockedbittestandset64_rel(__int64 volatile *, __int64);
 long _InterlockedAdd(long volatile *Addend, long Value);
 __int64 _InterlockedAdd64(__int64 volatile *Addend, __int64 Value);
 __int64 _ReadStatusReg(int);