2017-03-03 13:35:44 +00:00
|
|
|
diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
|
|
|
|
|
--- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm 2017-03-03 13:53:52.480754536 +0100
|
|
|
|
|
+++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h 2017-03-03 13:56:01.476018102 +0100
|
|
|
|
|
@@ -203,6 +203,10 @@
|
|
|
|
|
#define SK_ARM_HAS_CRC32
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+#if defined(__aarch64__)
|
|
|
|
|
+ #undef SK_ARM_HAS_NEON
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
#if !defined(SKIA_IMPLEMENTATION)
|
|
|
|
|
diff -up firefox-52.0/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-52.0/media/webrtc/trunk/webrtc/build/common.gypi
|
|
|
|
|
--- firefox-52.0/media/webrtc/trunk/webrtc/build/common.gypi.arm 2016-09-05 22:12:57.000000000 +0200
|
|
|
|
|
+++ firefox-52.0/media/webrtc/trunk/webrtc/build/common.gypi 2017-03-03 13:53:52.480754536 +0100
|
2016-03-02 12:58:14 +00:00
|
|
|
@@ -312,20 +312,6 @@
|
2015-03-10 08:21:11 +00:00
|
|
|
'defines': [
|
|
|
|
|
'WEBRTC_ARCH_ARM',
|
|
|
|
|
],
|
|
|
|
|
- 'conditions': [
|
2016-03-02 12:58:14 +00:00
|
|
|
- ['arm_version>=7', {
|
2015-03-10 08:21:11 +00:00
|
|
|
- 'defines': ['WEBRTC_ARCH_ARM_V7',
|
|
|
|
|
- 'WEBRTC_BUILD_NEON_LIBS'],
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
- ['arm_neon==1', {
|
|
|
|
|
- 'defines': ['WEBRTC_ARCH_ARM_NEON',],
|
2016-03-02 12:58:14 +00:00
|
|
|
- }],
|
2016-04-25 12:58:04 +00:00
|
|
|
- ['arm_neon==0 and arm_neon_optional==1', {
|
2015-03-10 08:21:11 +00:00
|
|
|
- 'defines': ['WEBRTC_DETECT_ARM_NEON',],
|
|
|
|
|
- }],
|
|
|
|
|
- ],
|
|
|
|
|
- }],
|
|
|
|
|
- ],
|
|
|
|
|
}],
|
|
|
|
|
['os_bsd==1', {
|
|
|
|
|
'defines': [
|
