···

       
85
       
85
       
 
       
    # See: https://github.com/NixOS/nixpkgs/pull/186575

     

       
86
       
86
       
 
       
    ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       
87
       
87
       
 
       
    # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893

     

       
88
       
88
       
-
       
    ./armv7l.patch

     

       
88
       
88
       
+
       
    ../../common/compiler-rt/armv7l-15.patch

     

       
89
       
89
       
 
       
  ]

     

       
90
       
90
       
 
       
    # The `compiler-rt` build inspects `ld` to figure out whether it needs to

     

       
91
       
91
       
 
       
    # explicitly call `codesign`:

     

···

       
1
       
1
       
-
       
diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake

     

       
2
       
2
       
-
       
--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake	2020-03-24 00:01:02.000000000 +0900

     

       
3
       
3
       
-
       
+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake	2020-05-10 03:42:00.883450706 +0900

     

       
4
       
4
       
-
       
@@ -24,7 +24,7 @@

     

       
5
       
5
       
-
       
 

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
 set(ARM64 aarch64)

     

       
8
       
8
       
-
       
-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)

     

       
9
       
9
       
-
       
+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)

     

       
10
       
10
       
-
       
 set(HEXAGON hexagon)

     

       
11
       
11
       
-
       
 set(X86 i386)

     

       
12
       
12
       
-
       
 set(X86_64 x86_64)

     

       
13
       
13
       
-
       
diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt

     

       
14
       
14
       
-
       
--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt	2020-03-24 00:01:02.000000000 +0900

     

       
15
       
15
       
-
       
+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt	2020-05-10 03:44:49.468579650 +0900

     

       
16
       
16
       
-
       
@@ -474,6 +474,7 @@

     

       
17
       
17
       
-
       
 set(armv7_SOURCES ${arm_SOURCES})

     

       
18
       
18
       
-
       
 set(armv7s_SOURCES ${arm_SOURCES})

     

       
19
       
19
       
-
       
 set(armv7k_SOURCES ${arm_SOURCES})

     

       
20
       
20
       
-
       
+set(armv7l_SOURCES ${arm_SOURCES})

     

       
21
       
21
       
-
       
 set(arm64_SOURCES ${aarch64_SOURCES})

     

       
22
       
22
       
-
       
 

     

       
23
       
23
       
-
       
 # macho_embedded archs

     

       
24
       
24
       
-
       
@@ -595,7 +596,7 @@

     

       
25
       
25
       
-
       
   foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       
26
       
26
       
-
       
     if (CAN_TARGET_${arch})

     

       
27
       
27
       
-
       
       # For ARM archs, exclude any VFP builtins if VFP is not supported

     

       
28
       
28
       
-
       
-      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")

     

       
29
       
29
       
-
       
+      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")

     

       
30
       
30
       
-
       
         string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")

     

       
31
       
31
       
-
       
         check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)

     

       
32
       
32
       
-
       
         if(NOT COMPILER_RT_HAS_${arch}_VFP)

     

···

       
75
       
75
       
 
       
    ./normalize-var.patch

     

       
76
       
76
       
 
       
    # Prevent a compilation error on darwin

     

       
77
       
77
       
 
       
    ./darwin-targetconditionals.patch

     

       
78
       
78
       
+
       
    # See: https://github.com/NixOS/nixpkgs/pull/186575

     

       
78
       
79
       
 
       
    ../../common/compiler-rt/darwin-plistbuddy-workaround.patch

     

       
79
       
79
       
-
       
    ./armv7l.patch

     

       
80
       
80
       
+
       
    # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893

     

       
81
       
81
       
+
       
    ../../common/compiler-rt/armv7l-15.patch

     

       
80
       
82
       
 
       
  ];

     

       
81
       
83
       
 
       


     

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