Commit 48556b7c authored by Andras Becsi's avatar Andras Becsi Committed by The Qt Project
Browse files

Update patches with fixes for the emulator and raspberry pi


Change-Id: I475941acdaa2581851f69199c0ecda7edddab389
Reviewed-by: default avatarZeno Albisser <zeno.albisser@digia.com>
Showing with 14 additions and 9 deletions
...@@ -48,11 +48,11 @@ index 407d49d..b5af9d7 100644 ...@@ -48,11 +48,11 @@ index 407d49d..b5af9d7 100644
'conditions': [ 'conditions': [
['chromeos==1', { ['chromeos==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ] 'sources/': [ ['include', '_chromeos\\.cc$'] ]
diff --git a/base/base.gypi b/base/base.gypi diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
index 11edab0..26aacaf 100644 index 11edab0..45d7180 100644
--- a/base/base.gypi --- a/chromium/base/base.gypi
+++ b/base/base.gypi +++ b/chromium/base/base.gypi
@@ -722,6 +722,13 @@ @@ -722,6 +722,18 @@
'atomicops_internals_x86_gcc.cc', 'atomicops_internals_x86_gcc.cc',
], ],
}], }],
...@@ -62,6 +62,11 @@ index 11edab0..26aacaf 100644 ...@@ -62,6 +62,11 @@ index 11edab0..26aacaf 100644
+ 'sources/': [ + 'sources/': [
+ ['include', '^nix/'], + ['include', '^nix/'],
+ ], + ],
+ }],
+ ['use_qt==1 and target_arch=="ia32"', {
+ 'sources/': [
+ ['include', 'atomicops_internals_x86_gcc.cc'],
+ ],
+ }], + }],
['<(use_glib)==0 or >(nacl_untrusted_build)==1', { ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
'sources!': [ 'sources!': [
......
...@@ -29,14 +29,14 @@ index 856b72e..d9cf5d8 100644 ...@@ -29,14 +29,14 @@ index 856b72e..d9cf5d8 100644
'openssl/crypto/sha/asm/sha512-armv4.S', 'openssl/crypto/sha/asm/sha512-armv4.S',
], ],
+ 'conditions': [ + 'conditions': [
+ ['arm_neon_optional==1 and arm_tune=="cortex-a8"', { + ['arm_float_abi=="hard"', {
+ 'openssl_arm_sources+': [ + 'openssl_arm_sources+': [
+ 'openssl/crypto/chacha/chacha_vec_arm.S', + 'openssl/crypto/chacha/chacha_vec.c',
+ ], + ],
+ }, + },
+ { + {
+ 'openssl_arm_sources+': [ + 'openssl_arm_sources+': [
+ 'openssl/crypto/chacha/chacha_vec.c', + 'openssl/crypto/chacha/chacha_vec_arm.S',
+ ], + ],
+ }], + }],
+ ], + ],
......
3rdparty @ a6a44c1d
Subproject commit 91063955f2760bc583d6a8e66b1d0aa626510c55 Subproject commit a6a44c1dcae097eeac597b688fb6b08d35188553
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment