Use builtins instead of __ptrauth qualifier

Author: kovdan01

clang/lib/Headers/ptrauth.h

@@ -233,9 +233,8 @@ typedef __UINTPTR_TYPE__ ptrauth_generic_signature_t;
   [[clang::ptrauth_vtable_pointer(key, address_discrimination,                 \
                                   extra_discrimination)]]
 
+/* The value is ptrauth_string_discriminator("init_fini") */
 #define __ptrauth_init_fini_discriminator 0xd9d4
-#define __ptrauth_init_fini_pointer                                            \
-  __ptrauth(ptrauth_key_init_fini_pointer, 1, __ptrauth_init_fini_discriminator)
 
 #else
 

compiler-rt/lib/builtins/crtbegin.c

@@ -51,9 +51,16 @@ static void __attribute__((used)) __do_init(void) {
 
 #ifdef CRT_HAS_INITFINI_ARRAY
 #if __has_feature(ptrauth_init_fini)
-__attribute__((section(".init_array"),
-               used)) static void *__ptrauth_init_fini_pointer __init =
-    __do_init;
+#if __has_feature(ptrauth_init_fini_address_discrimination)
+__attribute__((section(".init_array"), used)) static void *__init =
+    ptrauth_sign_constant(&__do_init, ptrauth_key_init_fini_pointer,
+                          ptrauth_blend_discriminator(
+                              &__init, __ptrauth_init_fini_discriminator));
+#else
+__attribute__((section(".init_array"), used)) static void *__init =
+    ptrauth_sign_constant(&__do_init, ptrauth_key_init_fini_pointer,
+                          __ptrauth_init_fini_discriminator);
+#endif
 #else
 __attribute__((section(".init_array"),
                used)) static void (*__init)(void) = __do_init;
@@ -114,9 +121,16 @@ static void __attribute__((used)) __do_fini(void) {
 
 #ifdef CRT_HAS_INITFINI_ARRAY
 #if __has_feature(ptrauth_init_fini)
-__attribute__((section(".fini_array"),
-               used)) static void *__ptrauth_init_fini_pointer __fini =
-    __do_fini;
+#if __has_feature(ptrauth_init_fini_address_discrimination)
+__attribute__((section(".fini_array"), used)) static void *__fini =
+    ptrauth_sign_constant(&__do_fini, ptrauth_key_init_fini_pointer,
+                          ptrauth_blend_discriminator(
+                              &__fini, __ptrauth_init_fini_discriminator));
+#else
+__attribute__((section(".fini_array"), used)) static void *__fini =
+    ptrauth_sign_constant(&__do_fini, ptrauth_key_init_fini_pointer,
+                          __ptrauth_init_fini_discriminator);
+#endif
 #else
 __attribute__((section(".fini_array"),
                used)) static void (*__fini)(void) = __do_fini;