Enable libunwind hardening

Author: atrosinenko

compiler-rt/lib/builtins/gcc_personality_v0.c

@@ -10,6 +10,9 @@
 #include <stddef.h>
 
 #include <unwind.h>
+
+#define EXTRA_PTRAUTH_HARDENING 1
+
 #if defined(__arm__) && !defined(__ARM_DWARF_EH__) &&                          \
     !defined(__USING_SJLJ_EXCEPTIONS__)
 // When building with older compilers (e.g. clang <3.9), it is possible that we
@@ -34,7 +37,7 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
 #include <ptrauth.h>
 #endif
 
-#if defined(__APPLE__) && __has_feature(ptrauth_qualifier)
+#if defined(EXTRA_PTRAUTH_HARDENING) && __has_feature(ptrauth_qualifier)
 #if __has_feature(ptrauth_restricted_intptr_qualifier)
 #define PERSONALITY_PTRAUTH_RESTRICTED_INTPTR(key, addressDiscriminated,       \
                                               discriminatorString)             \
@@ -285,7 +288,7 @@ COMPILER_RT_ABI _Unwind_Reason_Code __gcc_personality_v0(
 #define LANDING_PAD_DISCRIMINATOR "__gcc_personality_v0'landingPad"
       size_t PERSONALITY_PTRAUTH_RI_RA(LANDING_PAD_DISCRIMINATOR) landingPad =
           funcStart + landingPadOffset;
-#if defined(__APPLE__) && __has_feature(ptrauth_qualifier)
+#if defined(EXTRA_PTRAUTH_HARDENING) && __has_feature(ptrauth_qualifier)
       uintptr_t stack_pointer = _Unwind_GetGR(context, -2);
       const uintptr_t existingDiscriminator = ptrauth_blend_discriminator(
           &landingPad, ptrauth_string_discriminator(LANDING_PAD_DISCRIMINATOR));

libcxxabi/include/__cxxabi_config.h

@@ -9,6 +9,8 @@
 #ifndef ____CXXABI_CONFIG_H
 #define ____CXXABI_CONFIG_H
 
+#define EXTRA_PTRAUTH_HARDENING 1
+
 #if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) &&                 \
     !defined(__ARM_DWARF_EH__) && !defined(__SEH__)
 #define _LIBCXXABI_ARM_EHABI
@@ -114,7 +116,7 @@
 #  include <ptrauth.h>
 #endif
 
-#if defined(__APPLE__) && __has_feature(ptrauth_qualifier)
+#if defined(EXTRA_PTRAUTH_HARDENING) && __has_feature(ptrauth_qualifier)
 #  define _LIBCXXABI_PTRAUTH(__key, __address_discriminated, __discriminator)                                          \
     __ptrauth(__key, __address_discriminated, ptrauth_string_discriminator(__discriminator))
 // This work around is required to support divergence in spelling

libcxxabi/src/cxa_personality.cpp

@@ -22,6 +22,8 @@
 #include "private_typeinfo.h"
 #include "unwind.h"
 
+#define EXTRA_PTRAUTH_HARDENING 1
+
 #if __has_include(<ptrauth.h>)
 #  include <ptrauth.h>
 #endif
@@ -596,7 +598,7 @@ set_registers(_Unwind_Exception* unwind_exception, _Unwind_Context* context,
                 reinterpret_cast<uintptr_t>(unwind_exception));
   _Unwind_SetGR(context, __builtin_eh_return_data_regno(1),
                 static_cast<uintptr_t>(results.ttypeIndex));
-#if defined(__APPLE__) && __has_feature(ptrauth_qualifier)
+#if defined(EXTRA_PTRAUTH_HARDENING) && __has_feature(ptrauth_qualifier)
   auto stack_pointer = _Unwind_GetGR(context, UNW_REG_SP);
   // We manually re-sign the IP as the __ptrauth qualifiers cannot
   // express the required relationship with the destination address

libunwind/include/libunwind.h

@@ -18,6 +18,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#define EXTRA_PTRAUTH_HARDENING 1
+
 #ifdef __APPLE__
   #if __clang__
     #if __has_include(<Availability.h>)
@@ -47,7 +49,7 @@
 #include <ptrauth.h>
 #endif
 
-#if defined(__APPLE__) && __has_feature(ptrauth_qualifier)
+#if defined(EXTRA_PTRAUTH_HARDENING) && __has_feature(ptrauth_qualifier)
 #define _LIBUNWIND_PTRAUTH(__key, __address_discriminated, __discriminator)    \
   __ptrauth(__key, __address_discriminated,                                    \
             ptrauth_string_discriminator(__discriminator))