Lines 1-6
Link Here
|
1 |
--- src/3rdparty/chromium/third_party/zlib/arm_features.c.orig 2020-03-22 20:03:48 UTC |
1 |
--- src/3rdparty/chromium/third_party/zlib/arm_features.c.orig 2020-03-22 20:03:48 UTC |
2 |
+++ src/3rdparty/chromium/third_party/zlib/arm_features.c |
2 |
+++ src/3rdparty/chromium/third_party/zlib/arm_features.c |
3 |
@@ -27,6 +27,15 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; |
3 |
@@ -12,7 +12,7 @@ |
|
|
4 |
int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0; |
5 |
int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; |
6 |
|
7 |
-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) |
8 |
+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_FREEBSD) |
9 |
#include <pthread.h> |
10 |
#endif |
11 |
|
12 |
@@ -27,13 +27,22 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; |
4 |
#include <zircon/types.h> |
13 |
#include <zircon/types.h> |
5 |
#elif defined(ARMV8_OS_WINDOWS) |
14 |
#elif defined(ARMV8_OS_WINDOWS) |
6 |
#include <windows.h> |
15 |
#include <windows.h> |
Lines 16-21
Link Here
|
16 |
#else |
25 |
#else |
17 |
#error arm_features.c ARM feature detection in not defined for your platform |
26 |
#error arm_features.c ARM feature detection in not defined for your platform |
18 |
#endif |
27 |
#endif |
|
|
28 |
|
29 |
static void _arm_check_features(void); |
30 |
|
31 |
-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) |
32 |
+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_FREEBSD) |
33 |
static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; |
34 |
void ZLIB_INTERNAL arm_check_features(void) |
35 |
{ |
19 |
@@ -86,5 +95,12 @@ static void _arm_check_features(void) |
36 |
@@ -86,5 +95,12 @@ static void _arm_check_features(void) |
20 |
#elif defined(ARMV8_OS_WINDOWS) |
37 |
#elif defined(ARMV8_OS_WINDOWS) |
21 |
arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE); |
38 |
arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE); |