commit 20b3d65d34eea0070c991ce169f06d600ec6e1fd · pyrox.dev/nixpkgs

+71

pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch

···

       1
       1
       +
       diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp

     

       2
       2
       +
       --- a/lib/sanitizer_common/sanitizer_mac.cpp

     

       3
       3
       +
       +++ b/lib/sanitizer_common/sanitizer_mac.cpp

     

       4
       4
       +
       @@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {

     

       5
       5
       +
        // Offset example:

     

       6
       6
       +
        // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4

     

       7
       7
       +
        constexpr u16 GetOSMajorKernelOffset() {

     

       8
       8
       +
       -  if (TARGET_OS_OSX) return 4;

     

       9
       9
       +
       -  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;

     

       10
       10
       +
       -  if (TARGET_OS_WATCH) return 13;

     

       11
       11
       +
       +#if TARGET_OS_OSX

     

       12
       12
       +
       +  return 4;

     

       13
       13
       +
       +#endif

     

       14
       14
       +
       +#if TARGET_OS_IOS || TARGET_OS_TV

     

       15
       15
       +
       +  return 6;

     

       16
       16
       +
       +#endif

     

       17
       17
       +
       +#if TARGET_OS_WATCH

     

       18
       18
       +
       +  return 13;

     

       19
       19
       +
       +#endif

     

       20
       20
       +
        }

     

       21
       21
       +
        

     

       22
       22
       +
        using VersStr = char[64];

     

       23
       23
       +
       @@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {

     

       24
       24
       +
          u16 os_major = kernel_major - offset;

     

       25
       25
       +
        

     

       26
       26
       +
          const char *format = "%d.0";

     

       27
       27
       +
       -  if (TARGET_OS_OSX) {

     

       28
       28
       +
       -    if (os_major >= 16) {  // macOS 11+

     

       29
       29
       +
       -      os_major -= 5;

     

       30
       30
       +
       -    } else {  // macOS 10.15 and below

     

       31
       31
       +
       -      format = "10.%d";

     

       32
       32
       +
       -    }

     

       33
       33
       +
       +#if TARGET_OS_OSX

     

       34
       34
       +
       +  if (os_major >= 16) {  // macOS 11+

     

       35
       35
       +
       +    os_major -= 5;

     

       36
       36
       +
       +  } else {  // macOS 10.15 and below

     

       37
       37
       +
       +    format = "10.%d";

     

       38
       38
       +
          }

     

       39
       39
       +
       +#endif

     

       40
       40
       +
          return internal_snprintf(vers, sizeof(VersStr), format, os_major);

     

       41
       41
       +
        }

     

       42
       42
       +
        

     

       43
       43
       +
       @@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {

     

       44
       44
       +
        // Aligned versions example:

     

       45
       45
       +
        // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6

     

       46
       46
       +
        static void MapToMacos(u16 *major, u16 *minor) {

     

       47
       47
       +
       -  if (TARGET_OS_OSX)

     

       48
       48
       +
       -    return;

     

       49
       49
       +
       -

     

       50
       50
       +
       -  if (TARGET_OS_IOS || TARGET_OS_TV)

     

       51
       51
       +
       +#if !TARGET_OS_OSX

     

       52
       52
       +
       +#if TARGET_OS_IOS || TARGET_OS_TV

     

       53
       53
       +
            *major += 2;

     

       54
       54
       +
       -  else if (TARGET_OS_WATCH)

     

       55
       55
       +
       +#elif TARGET_OS_WATCH

     

       56
       56
       +
            *major += 9;

     

       57
       57
       +
       -  else

     

       58
       58
       +
       +#else

     

       59
       59
       +
            UNREACHABLE("unsupported platform");

     

       60
       60
       +
       +#endif

     

       61
       61
       +
        

     

       62
       62
       +
          if (*major >= 16) {  // macOS 11+

     

       63
       63
       +
            *major -= 5;

     

       64
       64
       +
       @@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {

     

       65
       65
       +
            *minor = *major;

     

       66
       66
       +
            *major = 10;

     

       67
       67
       +
          }

     

       68
       68
       +
       +#endif

     

       69
       69
       +
        }

     

       70
       70
       +
        

     

       71
       71
       +
        static MacosVersion GetMacosAlignedVersionInternal() {

pkgs/development/compilers/llvm/12/compiler-rt/default.nix

···

       59
       59
        
           # extra `/`.

     

       60
       60
        
           ./normalize-var.patch

     

       61
       61
        
         ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch

     

       62
       62
       +
           # Prevent a compilation error on darwin

     

       63
       63
       +
           ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch

     

       62
       64
        
           ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;

     

       63
       65
        
       

     

       64
       66
        
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks