webrtc: also remove -mfpu=vfpv3-d16 from cflags_c and cflags_cc

for NEON targets
This commit is contained in:
Kevin Kofler 2016-12-04 01:09:20 +01:00
parent 5e9406747d
commit 4621b92128
2 changed files with 35 additions and 9 deletions

View File

@ -82,6 +82,7 @@ Patch6: qtwebengine-opensource-src-5.7.0-no-sse2.patch
# * fix video_processing.gypi to only build NEON files when actually requested
# (i.e., not if arm_neon=0 arm_neon_optional=0).
# * inline arm_neon.gypi because gyp is not picking up flags from the include
# * also remove -mfpu=vfpv3-d16 from cflags_c and cflags_cc for NEON targets
# We still need to figure out why the flag tweaks from arm_neon.gypi don't work.
Patch7: qtwebengine-opensource-src-5.7.1-webrtc-neon.patch
# don't require the time zone detection API backported from ICU 55 (thanks spot)
@ -469,7 +470,8 @@ popd
- Rebase no-neon patch, add new arm-fpu-fix patch where no-neon not wanted
- Try enabling arm_neon unconditionally, #1282495 should be fixed even in F23
- Remove Android depenencies from openmax_dl ARM NEON detection (detect.c)
- webrtc: Inline arm_neon.gypi because gyp is not picking up flags from it
- webrtc: Inline arm_neon.gypi because gyp is not picking up flags from it,
also remove -mfpu=vfpv3-d16 from cflags_c and cflags_cc for NEON targets
* Thu Nov 10 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
- New upstream version

View File

@ -1,7 +1,7 @@
diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/common_audio/common_audio.gyp qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/common_audio/common_audio.gyp
--- qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/common_audio/common_audio.gyp 2016-11-07 15:46:18.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/common_audio/common_audio.gyp 2016-12-03 23:31:30.509013652 +0100
@@ -217,7 +217,25 @@
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/common_audio/common_audio.gyp 2016-12-04 01:07:09.731128900 +0100
@@ -217,7 +217,31 @@
{
'target_name': 'common_audio_neon',
'type': 'static_library',
@ -9,6 +9,12 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
+ 'cflags!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_c!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_cc!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'conditions': [
+ # "-mfpu=neon" is not required for arm64 in GCC.
+ ['target_arch!="arm64"', {
@ -30,8 +36,8 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
'resampler/sinc_resampler_neon.cc',
diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
--- qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi 2016-11-07 15:46:18.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi 2016-12-03 23:31:48.052742593 +0100
@@ -128,7 +128,25 @@
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi 2016-12-04 01:07:02.813235612 +0100
@@ -128,7 +128,31 @@
{
'target_name': 'isac_neon',
'type': 'static_library',
@ -39,6 +45,12 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
+ 'cflags!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_c!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_cc!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'conditions': [
+ # "-mfpu=neon" is not required for arm64 in GCC.
+ ['target_arch!="arm64"', {
@ -60,8 +72,8 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
],
diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/audio_processing.gypi qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/audio_processing.gypi
--- qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/audio_processing.gypi 2016-11-07 15:46:18.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/audio_processing.gypi 2016-12-03 23:31:58.455581865 +0100
@@ -260,7 +260,25 @@
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/audio_processing.gypi 2016-12-04 01:06:58.455302835 +0100
@@ -260,7 +260,31 @@
'targets': [{
'target_name': 'audio_processing_neon',
'type': 'static_library',
@ -69,6 +81,12 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
+ 'cflags!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_c!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_cc!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'conditions': [
+ # "-mfpu=neon" is not required for arm64 in GCC.
+ ['target_arch!="arm64"', {
@ -90,7 +108,7 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
],
diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi
--- qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi 2016-11-07 15:46:18.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi 2016-12-03 23:32:09.217415589 +0100
+++ qtwebengine-opensource-src-5.7.1-webrtc-neon/src/3rdparty/chromium/third_party/webrtc/modules/video_processing/video_processing.gypi 2016-12-04 01:06:53.268382845 +0100
@@ -47,7 +47,7 @@
['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': [ 'video_processing_sse2', ],
@ -100,7 +118,7 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
'dependencies': [ 'video_processing_neon', ],
}],
],
@@ -77,12 +77,30 @@
@@ -77,12 +77,36 @@
},
],
}],
@ -114,6 +132,12 @@ diff -ur qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/third_party/webr
+ 'cflags!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_c!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'cflags_cc!': [
+ '-mfpu=vfpv3-d16',
+ ],
+ 'conditions': [
+ # "-mfpu=neon" is not required for arm64 in GCC.
+ ['target_arch!="arm64"', {