Compare commits
86 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6aa36693fb | ||
|
|
a11ab82a27 | ||
|
|
f2628e628f | ||
|
|
dc864fbd24 | ||
|
|
ec15898b93 | ||
|
|
b5c12db9ae | ||
|
|
0dc88bef35 | ||
|
|
c1650b8f76 | ||
|
|
40a6a653b2 | ||
|
|
39b57892bc | ||
|
|
aab12379ff | ||
|
|
09b9955251 | ||
|
|
3ad486320b | ||
|
|
f515e9cafc | ||
|
|
098a42cb82 | ||
|
|
3d61790a35 | ||
|
|
033ea6d26c | ||
|
|
f2c10336d2 | ||
|
|
15ae68e07b | ||
|
|
91b7d44a1a | ||
|
|
ab17cf69f0 | ||
|
|
0ae447bc54 | ||
|
|
5b8043f382 | ||
|
|
755f242615 | ||
|
|
7068216857 | ||
|
|
2e7c858f46 | ||
|
|
791a19036a | ||
|
|
8ace8f696e | ||
|
|
301aacdd70 | ||
|
|
878da3d41a | ||
|
|
69d1a34859 | ||
|
|
b87e48ea7f | ||
|
|
593b16863f | ||
|
|
9fb31e86a5 | ||
|
|
52eeb9b8e8 | ||
|
|
9a1e66d7cc | ||
|
|
4eeadd579b | ||
|
|
3d2a3c4b42 | ||
|
|
5ff53ec175 | ||
|
|
3747d6767c | ||
|
|
a5f64f64fa | ||
|
|
40eab7b227 | ||
|
|
542c5b5866 | ||
|
|
f68ab6a059 | ||
|
|
227d4c7689 | ||
|
|
795738d67c | ||
|
|
993e683beb | ||
|
|
ae2d0f9ee6 | ||
|
|
1329ab36e8 | ||
|
|
79cd561eed | ||
|
|
f32876e29a | ||
|
|
9a52ac084c | ||
|
|
c44645ea22 | ||
|
|
0b9732c462 | ||
|
|
3321af0a44 | ||
|
|
1d327757c8 | ||
|
|
73ebdb3412 | ||
|
|
d9f5859fce | ||
|
|
888bad771c | ||
|
|
fd9458247b | ||
|
|
46d52c8c79 | ||
|
|
c5a4271bd3 | ||
|
|
b66c67b3af | ||
|
|
487665b701 | ||
|
|
03fd7c1314 | ||
|
|
add5af5328 | ||
|
|
92d1b740e5 | ||
|
|
0d08ecf609 | ||
|
|
654dbae362 | ||
|
|
89a95367e3 | ||
|
|
ca005a8e23 | ||
|
|
2a2ab63ea6 | ||
|
|
ee8b582515 | ||
|
|
3fd2fbbd7b | ||
|
|
fc7fa89716 | ||
|
|
94973fa0f8 | ||
|
|
831581483a | ||
|
|
7eaa613a00 | ||
|
|
318e53755e | ||
|
|
dad022fe69 | ||
|
|
1018a7fbb4 | ||
|
|
55a6a43990 | ||
|
|
a7237cfbc4 | ||
|
|
c63900e0ad | ||
|
|
fa183d3b68 | ||
|
|
2098cd3cf8 |
102 changed files with 5143 additions and 124707 deletions
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/abi_self_test.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/abi_self_test.cc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/abi_self_test.cc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/abi_self_test.cc
|
||||
@@ -521,3 +521,289 @@ TEST(ABITest, AArch64) {
|
||||
CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper);
|
||||
}
|
||||
|
|
@ -292,10 +292,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/abi_self_test.cc
|
|||
+ CHECK_ABI_NO_UNWIND(abi_test_clobber_lr);
|
||||
+}
|
||||
+#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/cpu_ppc64le.cc
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/cpu_ppc64le.cc
|
||||
@@ -0,0 +1,38 @@
|
||||
+/* Copyright (c) 2016, Google Inc.
|
||||
+ *
|
||||
|
|
@ -335,10 +335,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/cpu_ppc64le.cc
|
|||
+}
|
||||
+
|
||||
+#endif // OPENSSL_PPC64LE
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/crypto.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/crypto.cc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/crypto.cc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/crypto.cc
|
||||
@@ -67,6 +67,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
|
||||
return OPENSSL_ia32cap_P[idx];
|
||||
}
|
||||
|
|
@ -347,13 +347,13 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/crypto.cc
|
|||
+
|
||||
+HIDDEN unsigned long OPENSSL_ppc64le_hwcap2 = 0;
|
||||
+
|
||||
#elif (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \
|
||||
!defined(OPENSSL_STATIC_ARMCAP)
|
||||
HIDDEN uint32_t OPENSSL_armcap_P = 0;
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
||||
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
|
||||
|
||||
#if defined(OPENSSL_STATIC_ARMCAP)
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
||||
@@ -0,0 +1,3809 @@
|
||||
+#! /usr/bin/env perl
|
||||
+# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
|
|
@ -4164,10 +4164,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/as
|
|||
+}
|
||||
+
|
||||
+close STDOUT or die "error closing STDOUT: $!";
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
||||
@@ -81,6 +81,12 @@ inline int vpaes_capable(void) { return
|
||||
inline int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); }
|
||||
#endif
|
||||
|
|
@ -4195,11 +4195,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/in
|
|||
#endif
|
||||
#endif // OPENSSL_NO_ASM
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
||||
@@ -105,6 +105,7 @@
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
||||
@@ -104,6 +104,7 @@
|
||||
#include "self_check/fips.cc.inc"
|
||||
#include "self_check/self_check.cc.inc"
|
||||
#include "service_indicator/service_indicator.cc.inc"
|
||||
|
|
@ -4207,10 +4207,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bcm.cc
|
|||
#include "sha/sha1.cc.inc"
|
||||
#include "sha/sha256.cc.inc"
|
||||
#include "sha/sha512.cc.inc"
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/bn/bn.cc.inc
|
||||
@@ -330,6 +330,23 @@ int bn_expand(BIGNUM *bn, size_t bits) {
|
||||
}
|
||||
|
||||
|
|
@ -4235,11 +4235,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/bn/bn.
|
|||
if ((size_t)bn->width <= words) {
|
||||
if (!bn_wexpand(bn, words)) {
|
||||
return 0;
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
|
||||
@@ -1234,6 +1234,8 @@ int EVP_has_aes_hardware(void) {
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.cc.inc
|
||||
@@ -1231,6 +1231,8 @@ int EVP_has_aes_hardware(void) {
|
||||
return hwaes_capable() && crypto_gcm_clmul_enabled();
|
||||
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
|
||||
return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable();
|
||||
|
|
@ -4248,10 +4248,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/cipher
|
|||
#else
|
||||
return 0;
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/asm/ghashp8-ppc.pl
|
||||
@@ -0,0 +1,671 @@
|
||||
+#! /usr/bin/env perl
|
||||
+# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
|
|
@ -4924,10 +4924,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/as
|
|||
+}
|
||||
+
|
||||
+close STDOUT or die "error closing STDOUT: $!"; # enforce flush
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/gcm.cc.inc
|
||||
@@ -233,6 +233,13 @@ void CRYPTO_ghash_init(gmult_func *out_m
|
||||
*out_hash = gcm_ghash_neon;
|
||||
return;
|
||||
|
|
@ -4942,10 +4942,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gc
|
|||
#endif
|
||||
|
||||
gcm_init_nohw(out_table, H);
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/aes/gcm_test.cc
|
||||
@@ -169,5 +169,15 @@ TEST(GCMTest, ABI) {
|
||||
}
|
||||
}
|
||||
|
|
@ -4962,10 +4962,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/aes/gc
|
|||
+#endif // GHASH_ASM_PPC64LE
|
||||
}
|
||||
#endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/rand/getrandom_fillin.h
|
||||
@@ -30,6 +30,8 @@
|
||||
#define EXPECTED_NR_getrandom 278
|
||||
#elif defined(OPENSSL_ARM)
|
||||
|
|
@ -4975,11 +4975,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/rand/getrandom_fi
|
|||
#elif defined(OPENSSL_RISCV64)
|
||||
#define EXPECTED_NR_getrandom 278
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
|
||||
@@ -425,6 +425,11 @@ bcm_infallible BCM_rand_bytes_with_addit
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/rand/rand.cc.inc
|
||||
@@ -431,6 +431,11 @@ bcm_infallible BCM_rand_bytes_with_addit
|
||||
// Take a read lock around accesses to |state->drbg|. This is needed to
|
||||
// avoid returning bad entropy if we race with
|
||||
// |rand_thread_state_clear_all|.
|
||||
|
|
@ -4990,11 +4990,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/rand/r
|
|||
+ // kernel, syscalls made with |syscall| did not abort the transaction.
|
||||
CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock);
|
||||
#endif
|
||||
if (!CTR_DRBG_reseed_ex(&state->drbg, seed, sizeof(seed),
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
||||
if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data,
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
||||
@@ -23,6 +23,16 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
|
@ -5012,10 +5012,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/in
|
|||
// Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is
|
||||
// defined in assembly.
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.cc.inc
|
||||
@@ -0,0 +1,369 @@
|
||||
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.ccom)
|
||||
+ * All rights reserved.
|
||||
|
|
@ -5386,11 +5386,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sh
|
|||
+#undef BODY_20_39
|
||||
+#undef BODY_40_59
|
||||
+#undef BODY_60_79
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/internal.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/internal.h
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h
|
||||
@@ -66,8 +66,9 @@ extern "C" {
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/internal.h
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/internal.h
|
||||
@@ -59,8 +59,9 @@ extern "C" {
|
||||
#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \
|
||||
(defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \
|
||||
defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64))
|
||||
|
|
@ -5402,7 +5402,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h
|
|||
#define NEED_CPUID
|
||||
|
||||
// OPENSSL_cpuid_setup initializes the platform-specific feature cache. This
|
||||
@@ -1420,6 +1421,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl
|
||||
@@ -1401,6 +1402,16 @@ inline int CRYPTO_is_ARMv8_SHA512_capabl
|
||||
#endif // OPENSSL_ARM || OPENSSL_AARCH64
|
||||
|
||||
|
||||
|
|
@ -5419,10 +5419,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/internal.h
|
|||
#if defined(BORINGSSL_DISPATCH_TEST)
|
||||
// Runtime CPU dispatch testing support
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
||||
@@ -0,0 +1,320 @@
|
||||
+#! /usr/bin/env perl
|
||||
+# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
|
|
@ -5744,10 +5744,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/perlasm/ppc-xlate
|
|||
+___
|
||||
+
|
||||
+close STDOUT or die "error closing STDOUT: $!";
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/test/abi_test.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/test/abi_test.h
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/test/abi_test.h
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/test/abi_test.h
|
||||
@@ -179,7 +179,78 @@ struct alignas(16) Reg128 {
|
||||
CALLER_STATE_REGISTER(uint64_t, x28) \
|
||||
CALLER_STATE_REGISTER(uint64_t, x29)
|
||||
|
|
@ -5854,10 +5854,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/abi_test.h
|
|||
static_assert(sizeof...(args) <= 8,
|
||||
"too many arguments for abi_test_trampoline");
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
||||
@@ -0,0 +1,262 @@
|
||||
+#!/usr/bin/env perl
|
||||
+# Copyright (c) 2019, Google Inc.
|
||||
|
|
@ -6121,10 +6121,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/test/asm/trampoli
|
|||
+
|
||||
+print $code;
|
||||
+close STDOUT or die "error closing STDOUT: $!";
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/include/openssl/target.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/include/openssl/target.h
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/include/openssl/target.h
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/include/openssl/target.h
|
||||
@@ -34,6 +34,9 @@
|
||||
#elif defined(__ARMEL__) || defined(_M_ARM)
|
||||
#define OPENSSL_32_BIT
|
||||
|
|
@ -6135,11 +6135,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/include/openssl/target.h
|
|||
#elif defined(__MIPSEL__) && !defined(__LP64__)
|
||||
#define OPENSSL_32_BIT
|
||||
#define OPENSSL_MIPS
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
||||
@@ -31,6 +31,8 @@ int main(int argc, char **argv) {
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
||||
@@ -35,6 +35,8 @@ int main(int argc, char **argv) {
|
||||
puts("ARM (32-bit)");
|
||||
#elif defined(OPENSSL_AARCH64)
|
||||
puts("aarch64 (64-bit)");
|
||||
|
|
@ -6148,10 +6148,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/acvp/modu
|
|||
#else
|
||||
#error "FIPS build not supported on this architecture"
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
||||
@@ -56,7 +56,8 @@ type stringWriter interface {
|
||||
type processorType int
|
||||
|
||||
|
|
@ -6210,7 +6210,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
return statement, nil
|
||||
}
|
||||
|
||||
@@ -703,6 +715,191 @@ func (d *delocation) processAarch64Instr
|
||||
@@ -701,6 +713,191 @@ func (d *delocation) processAarch64Instr
|
||||
return statement, nil
|
||||
}
|
||||
|
||||
|
|
@ -6402,7 +6402,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
func (d *delocation) gatherOffsets(symRef *node32, offsets string) (*node32, string) {
|
||||
for symRef != nil && symRef.pegRule == ruleOffset {
|
||||
offset := d.contents(symRef)
|
||||
@@ -757,6 +954,215 @@ func (d *delocation) parseMemRef(memRef
|
||||
@@ -755,6 +952,215 @@ func (d *delocation) parseMemRef(memRef
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -6618,7 +6618,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
/* Intel */
|
||||
|
||||
type instructionType int
|
||||
@@ -1370,6 +1776,8 @@ func writeAarch64Function(w stringWriter
|
||||
@@ -1368,6 +1774,8 @@ func writeAarch64Function(w stringWriter
|
||||
func transform(w stringWriter, inputs []inputFile) error {
|
||||
// symbols contains all defined symbols.
|
||||
symbols := make(map[string]struct{})
|
||||
|
|
@ -6627,7 +6627,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
// fileNumbers is the set of IDs seen in .file directives.
|
||||
fileNumbers := make(map[int]struct{})
|
||||
// maxObservedFileNumber contains the largest seen file number in a
|
||||
@@ -1402,6 +1810,25 @@ func transform(w stringWriter, inputs []
|
||||
@@ -1400,6 +1808,25 @@ func transform(w stringWriter, inputs []
|
||||
}, ruleStatement, ruleSymbolDefiningDirective, ruleSymbolDefiningDirectiveName)
|
||||
|
||||
forEachPath(input.ast.up, func(node *node32) {
|
||||
|
|
@ -6653,7 +6653,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
assertNodeType(node, ruleLocationDirective)
|
||||
directive := input.contents[node.begin:node.end]
|
||||
if !strings.HasPrefix(directive, ".file") {
|
||||
@@ -1449,11 +1876,13 @@ func transform(w stringWriter, inputs []
|
||||
@@ -1447,11 +1874,13 @@ func transform(w stringWriter, inputs []
|
||||
|
||||
d := &delocation{
|
||||
symbols: symbols,
|
||||
|
|
@ -6667,7 +6667,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
gotExternalsNeeded: make(map[string]struct{}),
|
||||
gotOffsetsNeeded: make(map[string]struct{}),
|
||||
gotOffOffsetsNeeded: make(map[string]struct{}),
|
||||
@@ -1488,6 +1917,22 @@ func transform(w stringWriter, inputs []
|
||||
@@ -1486,6 +1915,22 @@ func transform(w stringWriter, inputs []
|
||||
for _, name := range redirectorNames {
|
||||
redirector := d.redirectors[name]
|
||||
switch d.processor {
|
||||
|
|
@ -6690,7 +6690,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
case aarch64:
|
||||
writeAarch64Function(w, redirector, func(w stringWriter) {
|
||||
w.WriteString("\tb " + name + "\n")
|
||||
@@ -1512,6 +1957,13 @@ func transform(w stringWriter, inputs []
|
||||
@@ -1510,6 +1955,13 @@ func transform(w stringWriter, inputs []
|
||||
target := d.bssAccessorsNeeded[name]
|
||||
|
||||
switch d.processor {
|
||||
|
|
@ -6704,7 +6704,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
case x86_64:
|
||||
w.WriteString(".type " + funcName + ", @function\n")
|
||||
w.WriteString(funcName + ":\n")
|
||||
@@ -1527,6 +1979,26 @@ func transform(w stringWriter, inputs []
|
||||
@@ -1525,6 +1977,26 @@ func transform(w stringWriter, inputs []
|
||||
}
|
||||
|
||||
switch d.processor {
|
||||
|
|
@ -6731,7 +6731,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
case aarch64:
|
||||
externalNames := sortedSet(d.gotExternalsNeeded)
|
||||
for _, symbol := range externalNames {
|
||||
@@ -1818,6 +2290,10 @@ func localTargetName(name string) string
|
||||
@@ -1816,6 +2288,10 @@ func localTargetName(name string) string
|
||||
return ".L" + name + "_local_target"
|
||||
}
|
||||
|
||||
|
|
@ -6742,7 +6742,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
func isSynthesized(symbol string) bool {
|
||||
return strings.HasSuffix(symbol, "_bss_get") ||
|
||||
strings.HasPrefix(symbol, "BORINGSSL_bcm_text_")
|
||||
@@ -1872,6 +2348,8 @@ func detectProcessor(input inputFile) pr
|
||||
@@ -1870,6 +2346,8 @@ func detectProcessor(input inputFile) pr
|
||||
switch instructionName {
|
||||
case "movq", "call", "leaq":
|
||||
return x86_64
|
||||
|
|
@ -6751,10 +6751,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
case "str", "bl", "ldr", "st1":
|
||||
return aarch64
|
||||
}
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
||||
@@ -12,9 +12,9 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
|
@ -6768,10 +6768,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
|
||||
# To regenerate delocate.peg.go:
|
||||
#
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
||||
@@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri
|
||||
|
||||
var delocateTests = []delocateTest{
|
||||
|
|
@ -6784,10 +6784,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
{"x86_64-Basic", []string{"in.s"}, "out.s"},
|
||||
{"x86_64-BSS", []string{"in.s"}, "out.s"},
|
||||
{"x86_64-GOTRewrite", []string{"in.s"}, "out.s"},
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
||||
@@ -0,0 +1,9 @@
|
||||
+ .text
|
||||
+foo:
|
||||
|
|
@ -6798,10 +6798,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+ .localentry foo,.-foo
|
||||
+.LVL0:
|
||||
+ bl
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
||||
@@ -0,0 +1,62 @@
|
||||
+.text
|
||||
+.file 1 "inserted_by_delocate.cc"
|
||||
|
|
@ -6865,19 +6865,19 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+.byte 0xff
|
||||
+.byte 0x31
|
||||
+.byte 0x80
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
||||
@@ -0,0 +1,4 @@
|
||||
+ .text
|
||||
+foo:
|
||||
+ addis 22,2,bar@toc@ha
|
||||
+ ld 0,bar@toc@l(22)
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
||||
@@ -0,0 +1,72 @@
|
||||
+.text
|
||||
+.file 1 "inserted_by_delocate.cc"
|
||||
|
|
@ -6951,10 +6951,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+.byte 0xff
|
||||
+.byte 0x31
|
||||
+.byte 0x80
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
||||
@@ -0,0 +1,161 @@
|
||||
+ .file "foo.cc"
|
||||
+ .abiversion 2
|
||||
|
|
@ -7117,10 +7117,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+ .size exported_function,.-exported_function
|
||||
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
|
||||
+ .section .note.GNU-stack,"",@progbits
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
||||
@@ -0,0 +1,552 @@
|
||||
+.text
|
||||
+.file 1 "inserted_by_delocate.cc"
|
||||
|
|
@ -7674,10 +7674,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+.byte 0xff
|
||||
+.byte 0x31
|
||||
+.byte 0x80
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
||||
@@ -0,0 +1,226 @@
|
||||
+ .file "foo.cc"
|
||||
+ .abiversion 2
|
||||
|
|
@ -7905,10 +7905,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+ .zero 20
|
||||
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
|
||||
+ .section .note.GNU-stack,"",@progbits
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
||||
@@ -0,0 +1,677 @@
|
||||
+.text
|
||||
+.file 1 "inserted_by_delocate.cc"
|
||||
|
|
@ -8587,10 +8587,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+.byte 0xff
|
||||
+.byte 0x31
|
||||
+.byte 0x80
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
||||
@@ -0,0 +1,23 @@
|
||||
+ .text
|
||||
+foo:
|
||||
|
|
@ -8615,10 +8615,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+
|
||||
+ addis 4, 2, 1+foo-2@toc@ha+3
|
||||
+ addi 4, 4, 1+foo-2@toc@l+3
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
||||
@@ -0,0 +1,178 @@
|
||||
+.text
|
||||
+.file 1 "inserted_by_delocate.cc"
|
||||
|
|
@ -8798,11 +8798,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/fipstools/delocate/
|
|||
+.byte 0xff
|
||||
+.byte 0x31
|
||||
+.byte 0x80
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
|
||||
@@ -377,6 +377,10 @@ static void sha1_block_data_order(uint32
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.cc.inc
|
||||
@@ -367,6 +367,10 @@ static void sha1_block_data_order(uint32
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -8813,11 +8813,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/crypto/fipsmodule/sha/sh
|
|||
sha1_block_data_order_nohw(state, data, num);
|
||||
}
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/build.json
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/build.json
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/build.json
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/build.json
|
||||
@@ -130,6 +130,10 @@
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/build.json
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/build.json
|
||||
@@ -128,6 +128,10 @@
|
||||
{"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"},
|
||||
{"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"}
|
||||
],
|
||||
|
|
@ -8828,7 +8828,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/build.json
|
|||
"perlasm_x86": [
|
||||
{"src": "crypto/fipsmodule/aes/asm/aesni-x86.pl"},
|
||||
{"src": "crypto/fipsmodule/bn/asm/bn-586.pl"},
|
||||
@@ -239,6 +243,7 @@
|
||||
@@ -234,6 +238,7 @@
|
||||
"crypto/cpu_arm_freebsd.cc",
|
||||
"crypto/cpu_arm_linux.cc",
|
||||
"crypto/cpu_intel.cc",
|
||||
|
|
@ -8836,7 +8836,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/build.json
|
|||
"crypto/crypto.cc",
|
||||
"crypto/curve25519/curve25519.cc",
|
||||
"crypto/curve25519/curve25519_64_adx.cc",
|
||||
@@ -805,6 +810,9 @@
|
||||
@@ -791,6 +796,9 @@
|
||||
"perlasm_arm": [
|
||||
{"src": "crypto/test/asm/trampoline-armv4.pl"}
|
||||
],
|
||||
|
|
@ -8846,10 +8846,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/build.json
|
|||
"perlasm_x86": [
|
||||
{"src": "crypto/test/asm/trampoline-x86.pl"}
|
||||
],
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.go
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/util/pregenerate/build.go
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/util/pregenerate/build.go
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.go
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/util/pregenerate/build.go
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/util/pregenerate/build.go
|
||||
@@ -38,6 +38,7 @@ type InputTarget struct {
|
||||
// architecture.
|
||||
PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"`
|
||||
|
|
@ -8868,10 +8868,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/util/pregenerate/build.g
|
|||
for _, p := range in.PerlasmX86 {
|
||||
addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"})
|
||||
addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"})
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/README.ppc64le
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/README.ppc64le
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/README.ppc64le
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/README.ppc64le
|
||||
@@ -0,0 +1,8 @@
|
||||
+==============================================================
|
||||
+To recreate boringssl pregenerated files patch for ppc64le:
|
||||
|
|
@ -8881,11 +8881,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/README.ppc64le
|
|||
+go run ./util/pregenerate
|
||||
+cd ../../../../
|
||||
+diff -urN chromium-*/third_party/boringssl/src/gen.orig chromium-*/third_party/boringssl/src/gen
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/gen/sources.gni
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.gni
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni
|
||||
@@ -123,6 +123,7 @@ bcm_sources_asm = [
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/gen/sources.gni
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/gen/sources.gni
|
||||
@@ -121,6 +121,7 @@ bcm_sources_asm = [
|
||||
"gen/bcm/aesv8-gcm-armv8-apple.S",
|
||||
"gen/bcm/aesv8-gcm-armv8-linux.S",
|
||||
"gen/bcm/aesv8-gcm-armv8-win.S",
|
||||
|
|
@ -8893,7 +8893,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni
|
|||
"gen/bcm/armv4-mont-linux.S",
|
||||
"gen/bcm/armv8-mont-apple.S",
|
||||
"gen/bcm/armv8-mont-linux.S",
|
||||
@@ -139,6 +140,7 @@ bcm_sources_asm = [
|
||||
@@ -137,6 +138,7 @@ bcm_sources_asm = [
|
||||
"gen/bcm/ghash-neon-armv8-apple.S",
|
||||
"gen/bcm/ghash-neon-armv8-linux.S",
|
||||
"gen/bcm/ghash-neon-armv8-win.S",
|
||||
|
|
@ -8901,7 +8901,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.gni
|
|||
"gen/bcm/ghash-ssse3-x86-apple.S",
|
||||
"gen/bcm/ghash-ssse3-x86-linux.S",
|
||||
"gen/bcm/ghash-ssse3-x86_64-apple.S",
|
||||
@@ -338,6 +340,7 @@ crypto_sources = [
|
||||
@@ -333,6 +335,7 @@ crypto_sources = [
|
||||
"crypto/cpu_arm_freebsd.cc",
|
||||
"crypto/cpu_arm_linux.cc",
|
||||
"crypto/cpu_intel.cc",
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ Subject: [PATCH] Add ppc64 target to libaom
|
|||
third_party/libaom/cmake_update.sh | 3 +++
|
||||
2 files changed, 15 insertions(+)
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/BUILD.gn
|
||||
Index: chromium-128.0.6613.113/third_party/libaom/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libaom/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/BUILD.gn
|
||||
@@ -299,6 +299,18 @@ if (current_cpu == "arm64" || current_cp
|
||||
--- chromium-128.0.6613.113.orig/third_party/libaom/BUILD.gn
|
||||
+++ chromium-128.0.6613.113/third_party/libaom/BUILD.gn
|
||||
@@ -275,6 +275,18 @@ if (current_cpu == "arm64") {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ Index: chromium-144.0.7559.59/third_party/libaom/BUILD.gn
|
|||
static_library("libaom") {
|
||||
check_includes = false
|
||||
if (!is_debug && is_win) {
|
||||
@@ -368,6 +380,9 @@ static_library("libaom") {
|
||||
@@ -338,6 +350,9 @@ static_library("libaom") {
|
||||
# This is needed by all arm boards due to aom_arm_cpu_caps()
|
||||
sources += [ "source/libaom/aom_ports/aarch32_cpudetect.c" ]
|
||||
}
|
||||
|
|
@ -41,17 +41,17 @@ Index: chromium-144.0.7559.59/third_party/libaom/BUILD.gn
|
|||
if (is_android) {
|
||||
deps += [ "//third_party/cpu_features:ndk_compat" ]
|
||||
}
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/cmake_update.sh
|
||||
Index: chromium-128.0.6613.113/third_party/libaom/cmake_update.sh
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libaom/cmake_update.sh
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/cmake_update.sh
|
||||
@@ -167,6 +167,9 @@ egrep \
|
||||
"#define [A-Z0-9_]+[[:space:]]+[01]" "${CFG}/win/ia32/config/aom_config.h" \
|
||||
| awk '{print "%define " $2 " " $3}' > "${CFG}/win/ia32/config/aom_config.asm"
|
||||
--- chromium-128.0.6613.113.orig/third_party/libaom/cmake_update.sh
|
||||
+++ chromium-128.0.6613.113/third_party/libaom/cmake_update.sh
|
||||
@@ -190,6 +190,9 @@ reset_dirs linux/arm64-cpu-detect
|
||||
gen_config_files linux/arm64-cpu-detect \
|
||||
"${toolchain}/arm64-linux-gcc.cmake ${all_platforms}"
|
||||
|
||||
+reset_dirs linux/ppc64
|
||||
+gen_config_files linux/ppc64 "${toolchain}/ppc-linux-gcc.cmake ${all_platforms}"
|
||||
+
|
||||
# Copy linux configurations and modify for Windows.
|
||||
reset_dirs win/x64
|
||||
cp "${CFG}/linux/x64/config"/* "${CFG}/win/x64/config/"
|
||||
reset_dirs win/arm64-cpu-detect
|
||||
cp "${CFG}/linux/arm64-cpu-detect/config"/* \
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
|
||||
Index: chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
|
||||
@@ -0,0 +1,100 @@
|
||||
+++ chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_config.asm
|
||||
@@ -0,0 +1,95 @@
|
||||
+;
|
||||
+; Copyright (c) 2025, Alliance for Open Media. All rights reserved.
|
||||
+; Copyright (c) 2024, Alliance for Open Media. All rights reserved.
|
||||
+;
|
||||
+; This source code is subject to the terms of the BSD 2 Clause License and
|
||||
+; the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
|
||||
|
|
@ -16,7 +16,6 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+AOM_ARCH_AARCH64 equ 0
|
||||
+AOM_ARCH_ARM equ 0
|
||||
+AOM_ARCH_PPC equ 1
|
||||
+AOM_ARCH_RISCV equ 0
|
||||
+AOM_ARCH_X86 equ 0
|
||||
+AOM_ARCH_X86_64 equ 0
|
||||
+CONFIG_ACCOUNTING equ 0
|
||||
|
|
@ -34,7 +33,6 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+CONFIG_COLLECT_PARTITION_STATS equ 0
|
||||
+CONFIG_COLLECT_RD_STATS equ 0
|
||||
+CONFIG_CWG_C013 equ 0
|
||||
+CONFIG_CWG_E050 equ 0
|
||||
+CONFIG_DEBUG equ 0
|
||||
+CONFIG_DENOISE equ 1
|
||||
+CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1
|
||||
|
|
@ -44,12 +42,11 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+CONFIG_GCC equ 1
|
||||
+CONFIG_GCOV equ 0
|
||||
+CONFIG_GPROF equ 0
|
||||
+CONFIG_HIGHWAY equ 0
|
||||
+CONFIG_INSPECTION equ 0
|
||||
+CONFIG_INTERNAL_STATS equ 0
|
||||
+CONFIG_INTER_STATS_ONLY equ 0
|
||||
+CONFIG_LIBVMAF_PSNR_PEAK equ 1
|
||||
+CONFIG_LIBYUV equ 1
|
||||
+CONFIG_LIBYUV equ 0
|
||||
+CONFIG_MAX_DECODE_PROFILE equ 2
|
||||
+CONFIG_MISMATCH_DEBUG equ 0
|
||||
+CONFIG_MULTITHREAD equ 1
|
||||
|
|
@ -83,14 +80,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+HAVE_ARM_CRC32 equ 0
|
||||
+HAVE_AVX equ 0
|
||||
+HAVE_AVX2 equ 0
|
||||
+HAVE_AVX512 equ 0
|
||||
+HAVE_FEXCEPT equ 1
|
||||
+HAVE_MMX equ 0
|
||||
+HAVE_NEON equ 0
|
||||
+HAVE_NEON_DOTPROD equ 0
|
||||
+HAVE_NEON_I8MM equ 0
|
||||
+HAVE_PTHREAD_H equ 1
|
||||
+HAVE_RVV equ 0
|
||||
+HAVE_SSE equ 0
|
||||
+HAVE_SSE2 equ 0
|
||||
+HAVE_SSE3 equ 0
|
||||
|
|
@ -103,13 +98,13 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+HAVE_VSX equ 1
|
||||
+HAVE_WXWIDGETS equ 0
|
||||
+STATIC_LINK_JXL equ 0
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
|
||||
Index: chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
|
||||
+++ chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_config.c
|
||||
@@ -0,0 +1,13 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
|
||||
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
|
||||
+ *
|
||||
+ * This source code is subject to the terms of the BSD 2 Clause License and
|
||||
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
|
||||
|
|
@ -119,15 +114,15 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
|
||||
+ */
|
||||
+#include "aom/aom_codec.h"
|
||||
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
|
||||
+static const char* const cfg = "cmake ../source/libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../source/libaom/build/cmake/toolchains/ppc-linux-gcc.cmake\" -DCONFIG_AV1_DECODER=0 -DCONFIG_AV1_ENCODER=1 -DCONFIG_LIBYUV=0 -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_AV1_TEMPORAL_DENOISING=1 -DCONFIG_QUANT_MATRIX=0 -DCONFIG_REALTIME_ONLY=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384";
|
||||
+const char *aom_codec_build_config(void) {return cfg;}
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
|
||||
Index: chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
|
||||
@@ -0,0 +1,103 @@
|
||||
+++ chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_config.h
|
||||
@@ -0,0 +1,98 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
|
||||
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
|
||||
+ *
|
||||
+ * This source code is subject to the terms of the BSD 2 Clause License and
|
||||
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
|
||||
|
|
@ -141,7 +136,6 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+#define AOM_ARCH_AARCH64 0
|
||||
+#define AOM_ARCH_ARM 0
|
||||
+#define AOM_ARCH_PPC 1
|
||||
+#define AOM_ARCH_RISCV 0
|
||||
+#define AOM_ARCH_X86 0
|
||||
+#define AOM_ARCH_X86_64 0
|
||||
+#define CONFIG_ACCOUNTING 0
|
||||
|
|
@ -159,7 +153,6 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+#define CONFIG_COLLECT_PARTITION_STATS 0
|
||||
+#define CONFIG_COLLECT_RD_STATS 0
|
||||
+#define CONFIG_CWG_C013 0
|
||||
+#define CONFIG_CWG_E050 0
|
||||
+#define CONFIG_DEBUG 0
|
||||
+#define CONFIG_DENOISE 1
|
||||
+#define CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 1
|
||||
|
|
@ -169,12 +162,11 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+#define CONFIG_GCC 1
|
||||
+#define CONFIG_GCOV 0
|
||||
+#define CONFIG_GPROF 0
|
||||
+#define CONFIG_HIGHWAY 0
|
||||
+#define CONFIG_INSPECTION 0
|
||||
+#define CONFIG_INTERNAL_STATS 0
|
||||
+#define CONFIG_INTER_STATS_ONLY 0
|
||||
+#define CONFIG_LIBVMAF_PSNR_PEAK 1
|
||||
+#define CONFIG_LIBYUV 1
|
||||
+#define CONFIG_LIBYUV 0
|
||||
+#define CONFIG_MAX_DECODE_PROFILE 2
|
||||
+#define CONFIG_MISMATCH_DEBUG 0
|
||||
+#define CONFIG_MULTITHREAD 1
|
||||
|
|
@ -208,14 +200,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+#define HAVE_ARM_CRC32 0
|
||||
+#define HAVE_AVX 0
|
||||
+#define HAVE_AVX2 0
|
||||
+#define HAVE_AVX512 0
|
||||
+#define HAVE_FEXCEPT 1
|
||||
+#define HAVE_MMX 0
|
||||
+#define HAVE_NEON 0
|
||||
+#define HAVE_NEON_DOTPROD 0
|
||||
+#define HAVE_NEON_I8MM 0
|
||||
+#define HAVE_PTHREAD_H 1
|
||||
+#define HAVE_RVV 0
|
||||
+#define HAVE_SSE 0
|
||||
+#define HAVE_SSE2 0
|
||||
+#define HAVE_SSE3 0
|
||||
|
|
@ -229,13 +219,13 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+#define HAVE_WXWIDGETS 0
|
||||
+#define STATIC_LINK_JXL 0
|
||||
+#endif // AOM_CONFIG_H_
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
|
||||
Index: chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
|
||||
@@ -0,0 +1,1177 @@
|
||||
+++ chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_dsp_rtcd.h
|
||||
@@ -0,0 +1,1501 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
|
||||
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
|
||||
+ *
|
||||
+ * This source code is subject to the terms of the BSD 2 Clause License and
|
||||
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
|
||||
|
|
@ -308,6 +298,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_128_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_16x32 aom_dc_128_predictor_16x32_c
|
||||
+
|
||||
+void aom_dc_128_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_16x4 aom_dc_128_predictor_16x4_c
|
||||
+
|
||||
+void aom_dc_128_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_16x64 aom_dc_128_predictor_16x64_c
|
||||
+
|
||||
+void aom_dc_128_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_16x8 aom_dc_128_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -320,12 +316,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_128_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_32x64 aom_dc_128_predictor_32x64_c
|
||||
+
|
||||
+void aom_dc_128_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_32x8 aom_dc_128_predictor_32x8_c
|
||||
+
|
||||
+void aom_dc_128_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_4x16 aom_dc_128_predictor_4x16_c
|
||||
+
|
||||
+void aom_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_4x4 aom_dc_128_predictor_4x4_c
|
||||
+
|
||||
+void aom_dc_128_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_4x8 aom_dc_128_predictor_4x8_c
|
||||
+
|
||||
+void aom_dc_128_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_64x16 aom_dc_128_predictor_64x16_c
|
||||
+
|
||||
+void aom_dc_128_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_64x32 aom_dc_128_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -335,6 +340,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_128_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_8x16 aom_dc_128_predictor_8x16_c
|
||||
+
|
||||
+void aom_dc_128_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_8x32 aom_dc_128_predictor_8x32_c
|
||||
+
|
||||
+void aom_dc_128_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_128_predictor_8x4 aom_dc_128_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -347,6 +355,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_left_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_16x32 aom_dc_left_predictor_16x32_c
|
||||
+
|
||||
+void aom_dc_left_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_16x4 aom_dc_left_predictor_16x4_c
|
||||
+
|
||||
+void aom_dc_left_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_16x64 aom_dc_left_predictor_16x64_c
|
||||
+
|
||||
+void aom_dc_left_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_16x8 aom_dc_left_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -359,12 +373,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_left_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_32x64 aom_dc_left_predictor_32x64_c
|
||||
+
|
||||
+void aom_dc_left_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_32x8 aom_dc_left_predictor_32x8_c
|
||||
+
|
||||
+void aom_dc_left_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_4x16 aom_dc_left_predictor_4x16_c
|
||||
+
|
||||
+void aom_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_4x4 aom_dc_left_predictor_4x4_c
|
||||
+
|
||||
+void aom_dc_left_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_4x8 aom_dc_left_predictor_4x8_c
|
||||
+
|
||||
+void aom_dc_left_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_64x16 aom_dc_left_predictor_64x16_c
|
||||
+
|
||||
+void aom_dc_left_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_64x32 aom_dc_left_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -374,6 +397,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_left_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_8x16 aom_dc_left_predictor_8x16_c
|
||||
+
|
||||
+void aom_dc_left_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_8x32 aom_dc_left_predictor_8x32_c
|
||||
+
|
||||
+void aom_dc_left_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_left_predictor_8x4 aom_dc_left_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -386,6 +412,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_16x32 aom_dc_predictor_16x32_c
|
||||
+
|
||||
+void aom_dc_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_16x4 aom_dc_predictor_16x4_c
|
||||
+
|
||||
+void aom_dc_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_16x64 aom_dc_predictor_16x64_c
|
||||
+
|
||||
+void aom_dc_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_16x8 aom_dc_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -398,12 +430,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_32x64 aom_dc_predictor_32x64_c
|
||||
+
|
||||
+void aom_dc_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_32x8 aom_dc_predictor_32x8_c
|
||||
+
|
||||
+void aom_dc_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_4x16 aom_dc_predictor_4x16_c
|
||||
+
|
||||
+void aom_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_4x4 aom_dc_predictor_4x4_c
|
||||
+
|
||||
+void aom_dc_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_4x8 aom_dc_predictor_4x8_c
|
||||
+
|
||||
+void aom_dc_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_64x16 aom_dc_predictor_64x16_c
|
||||
+
|
||||
+void aom_dc_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_64x32 aom_dc_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -413,6 +454,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_8x16 aom_dc_predictor_8x16_c
|
||||
+
|
||||
+void aom_dc_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_8x32 aom_dc_predictor_8x32_c
|
||||
+
|
||||
+void aom_dc_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_predictor_8x4 aom_dc_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -425,6 +469,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_top_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_16x32 aom_dc_top_predictor_16x32_c
|
||||
+
|
||||
+void aom_dc_top_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_16x4 aom_dc_top_predictor_16x4_c
|
||||
+
|
||||
+void aom_dc_top_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_16x64 aom_dc_top_predictor_16x64_c
|
||||
+
|
||||
+void aom_dc_top_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_16x8 aom_dc_top_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -437,12 +487,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_top_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_32x64 aom_dc_top_predictor_32x64_c
|
||||
+
|
||||
+void aom_dc_top_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_32x8 aom_dc_top_predictor_32x8_c
|
||||
+
|
||||
+void aom_dc_top_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_4x16 aom_dc_top_predictor_4x16_c
|
||||
+
|
||||
+void aom_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_4x4 aom_dc_top_predictor_4x4_c
|
||||
+
|
||||
+void aom_dc_top_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_4x8 aom_dc_top_predictor_4x8_c
|
||||
+
|
||||
+void aom_dc_top_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_64x16 aom_dc_top_predictor_64x16_c
|
||||
+
|
||||
+void aom_dc_top_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_64x32 aom_dc_top_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -452,12 +511,114 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_dc_top_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_8x16 aom_dc_top_predictor_8x16_c
|
||||
+
|
||||
+void aom_dc_top_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_8x32 aom_dc_top_predictor_8x32_c
|
||||
+
|
||||
+void aom_dc_top_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_8x4 aom_dc_top_predictor_8x4_c
|
||||
+
|
||||
+void aom_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_dc_top_predictor_8x8 aom_dc_top_predictor_8x8_c
|
||||
+
|
||||
+void aom_dist_wtd_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_comp_avg_pred aom_dist_wtd_comp_avg_pred_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad128x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad128x128_avg aom_dist_wtd_sad128x128_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad128x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad128x64_avg aom_dist_wtd_sad128x64_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad16x16_avg aom_dist_wtd_sad16x16_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad16x32_avg aom_dist_wtd_sad16x32_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad16x8_avg aom_dist_wtd_sad16x8_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad32x16_avg aom_dist_wtd_sad32x16_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad32x32_avg aom_dist_wtd_sad32x32_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad32x64_avg aom_dist_wtd_sad32x64_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad4x4_avg aom_dist_wtd_sad4x4_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad4x8_avg aom_dist_wtd_sad4x8_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad64x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad64x128_avg aom_dist_wtd_sad64x128_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad64x32_avg aom_dist_wtd_sad64x32_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad64x64_avg aom_dist_wtd_sad64x64_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad8x16_avg aom_dist_wtd_sad8x16_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad8x4_avg aom_dist_wtd_sad8x4_avg_c
|
||||
+
|
||||
+unsigned int aom_dist_wtd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sad8x8_avg aom_dist_wtd_sad8x8_avg_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance128x128 aom_dist_wtd_sub_pixel_avg_variance128x128_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance128x64 aom_dist_wtd_sub_pixel_avg_variance128x64_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance16x16 aom_dist_wtd_sub_pixel_avg_variance16x16_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance16x32 aom_dist_wtd_sub_pixel_avg_variance16x32_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance16x8 aom_dist_wtd_sub_pixel_avg_variance16x8_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance32x16 aom_dist_wtd_sub_pixel_avg_variance32x16_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance32x32 aom_dist_wtd_sub_pixel_avg_variance32x32_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance32x64 aom_dist_wtd_sub_pixel_avg_variance32x64_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance4x4 aom_dist_wtd_sub_pixel_avg_variance4x4_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance4x8 aom_dist_wtd_sub_pixel_avg_variance4x8_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance64x128 aom_dist_wtd_sub_pixel_avg_variance64x128_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance64x32 aom_dist_wtd_sub_pixel_avg_variance64x32_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance64x64 aom_dist_wtd_sub_pixel_avg_variance64x64_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance8x16 aom_dist_wtd_sub_pixel_avg_variance8x16_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance8x4 aom_dist_wtd_sub_pixel_avg_variance8x4_c
|
||||
+
|
||||
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
+#define aom_dist_wtd_sub_pixel_avg_variance8x8 aom_dist_wtd_sub_pixel_avg_variance8x8_c
|
||||
+
|
||||
+void aom_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
|
||||
+#define aom_fdct4x4 aom_fdct4x4_c
|
||||
+
|
||||
|
|
@ -482,6 +643,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_get_blk_sse_sum_c(const int16_t *data, int stride, int bw, int bh, int *x_sum, int64_t *x2_sum);
|
||||
+#define aom_get_blk_sse_sum aom_get_blk_sse_sum_c
|
||||
+
|
||||
+unsigned int aom_get_mb_ss_c(const int16_t *);
|
||||
+#define aom_get_mb_ss aom_get_mb_ss_c
|
||||
+
|
||||
+void aom_get_var_sse_sum_16x16_dual_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse16x16, unsigned int *tot_sse, int *tot_sum, uint32_t *var16x16);
|
||||
+#define aom_get_var_sse_sum_16x16_dual aom_get_var_sse_sum_16x16_dual_c
|
||||
+
|
||||
|
|
@ -494,6 +658,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_16x32 aom_h_predictor_16x32_c
|
||||
+
|
||||
+void aom_h_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_16x4 aom_h_predictor_16x4_c
|
||||
+
|
||||
+void aom_h_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_16x64 aom_h_predictor_16x64_c
|
||||
+
|
||||
+void aom_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_16x8 aom_h_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -506,12 +676,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_h_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_32x64 aom_h_predictor_32x64_c
|
||||
+
|
||||
+void aom_h_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_32x8 aom_h_predictor_32x8_c
|
||||
+
|
||||
+void aom_h_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_4x16 aom_h_predictor_4x16_c
|
||||
+
|
||||
+void aom_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_4x4 aom_h_predictor_4x4_c
|
||||
+
|
||||
+void aom_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_4x8 aom_h_predictor_4x8_c
|
||||
+
|
||||
+void aom_h_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_64x16 aom_h_predictor_64x16_c
|
||||
+
|
||||
+void aom_h_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_64x32 aom_h_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -521,6 +700,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_8x16 aom_h_predictor_8x16_c
|
||||
+
|
||||
+void aom_h_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_8x32 aom_h_predictor_8x32_c
|
||||
+
|
||||
+void aom_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_h_predictor_8x4 aom_h_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -767,6 +949,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_paeth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_16x32 aom_paeth_predictor_16x32_c
|
||||
+
|
||||
+void aom_paeth_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_16x4 aom_paeth_predictor_16x4_c
|
||||
+
|
||||
+void aom_paeth_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_16x64 aom_paeth_predictor_16x64_c
|
||||
+
|
||||
+void aom_paeth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_16x8 aom_paeth_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -779,12 +967,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_paeth_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_32x64 aom_paeth_predictor_32x64_c
|
||||
+
|
||||
+void aom_paeth_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_32x8 aom_paeth_predictor_32x8_c
|
||||
+
|
||||
+void aom_paeth_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_4x16 aom_paeth_predictor_4x16_c
|
||||
+
|
||||
+void aom_paeth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_4x4 aom_paeth_predictor_4x4_c
|
||||
+
|
||||
+void aom_paeth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_4x8 aom_paeth_predictor_4x8_c
|
||||
+
|
||||
+void aom_paeth_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_64x16 aom_paeth_predictor_64x16_c
|
||||
+
|
||||
+void aom_paeth_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_64x32 aom_paeth_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -794,6 +991,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_paeth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_8x16 aom_paeth_predictor_8x16_c
|
||||
+
|
||||
+void aom_paeth_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_8x32 aom_paeth_predictor_8x32_c
|
||||
+
|
||||
+void aom_paeth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_paeth_predictor_8x4 aom_paeth_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -908,6 +1108,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+unsigned int aom_sad4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad4x4 aom_sad4x4_c
|
||||
+
|
||||
+unsigned int aom_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
|
||||
+#define aom_sad4x4_avg aom_sad4x4_avg_c
|
||||
+
|
||||
+void aom_sad4x4x3d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad4x4x3d aom_sad4x4x3d_c
|
||||
+
|
||||
|
|
@ -917,6 +1120,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+unsigned int aom_sad4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad4x8 aom_sad4x8_c
|
||||
+
|
||||
+unsigned int aom_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
|
||||
+#define aom_sad4x8_avg aom_sad4x8_avg_c
|
||||
+
|
||||
+void aom_sad4x8x3d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad4x8x3d aom_sad4x8x3d_c
|
||||
+
|
||||
|
|
@ -974,6 +1180,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+unsigned int aom_sad8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad8x4 aom_sad8x4_c
|
||||
+
|
||||
+unsigned int aom_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
|
||||
+#define aom_sad8x4_avg aom_sad8x4_avg_c
|
||||
+
|
||||
+void aom_sad8x4x3d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad8x4x3d aom_sad8x4x3d_c
|
||||
+
|
||||
|
|
@ -1016,6 +1225,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_sad_skip_16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_16x32x4d aom_sad_skip_16x32x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_16x8 aom_sad_skip_16x8_c
|
||||
+
|
||||
+void aom_sad_skip_16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_16x8x4d aom_sad_skip_16x8x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_32x16 aom_sad_skip_32x16_c
|
||||
+
|
||||
|
|
@ -1034,6 +1249,18 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_sad_skip_32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_32x64x4d aom_sad_skip_32x64x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_4x4 aom_sad_skip_4x4_c
|
||||
+
|
||||
+void aom_sad_skip_4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_4x4x4d aom_sad_skip_4x4x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_4x8 aom_sad_skip_4x8_c
|
||||
+
|
||||
+void aom_sad_skip_4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_4x8x4d aom_sad_skip_4x8x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_64x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_64x128 aom_sad_skip_64x128_c
|
||||
+
|
||||
|
|
@ -1058,6 +1285,18 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_sad_skip_8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_8x16x4d aom_sad_skip_8x16x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_8x4 aom_sad_skip_8x4_c
|
||||
+
|
||||
+void aom_sad_skip_8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_8x4x4d aom_sad_skip_8x4x4d_c
|
||||
+
|
||||
+unsigned int aom_sad_skip_8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
|
||||
+#define aom_sad_skip_8x8 aom_sad_skip_8x8_c
|
||||
+
|
||||
+void aom_sad_skip_8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]);
|
||||
+#define aom_sad_skip_8x8x4d aom_sad_skip_8x8x4d_c
|
||||
+
|
||||
+int aom_satd_c(const tran_low_t *coeff, int length);
|
||||
+#define aom_satd aom_satd_c
|
||||
+
|
||||
|
|
@ -1073,6 +1312,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_16x32 aom_smooth_h_predictor_16x32_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_16x4 aom_smooth_h_predictor_16x4_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_16x64 aom_smooth_h_predictor_16x64_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_16x8 aom_smooth_h_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -1085,12 +1330,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_h_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_32x64 aom_smooth_h_predictor_32x64_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_32x8 aom_smooth_h_predictor_32x8_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_4x16 aom_smooth_h_predictor_4x16_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_4x4 aom_smooth_h_predictor_4x4_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_4x8 aom_smooth_h_predictor_4x8_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_64x16 aom_smooth_h_predictor_64x16_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_64x32 aom_smooth_h_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -1100,6 +1354,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_8x16 aom_smooth_h_predictor_8x16_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_8x32 aom_smooth_h_predictor_8x32_c
|
||||
+
|
||||
+void aom_smooth_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_h_predictor_8x4 aom_smooth_h_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -1112,6 +1369,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_16x32 aom_smooth_predictor_16x32_c
|
||||
+
|
||||
+void aom_smooth_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_16x4 aom_smooth_predictor_16x4_c
|
||||
+
|
||||
+void aom_smooth_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_16x64 aom_smooth_predictor_16x64_c
|
||||
+
|
||||
+void aom_smooth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_16x8 aom_smooth_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -1124,12 +1387,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_32x64 aom_smooth_predictor_32x64_c
|
||||
+
|
||||
+void aom_smooth_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_32x8 aom_smooth_predictor_32x8_c
|
||||
+
|
||||
+void aom_smooth_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_4x16 aom_smooth_predictor_4x16_c
|
||||
+
|
||||
+void aom_smooth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_4x4 aom_smooth_predictor_4x4_c
|
||||
+
|
||||
+void aom_smooth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_4x8 aom_smooth_predictor_4x8_c
|
||||
+
|
||||
+void aom_smooth_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_64x16 aom_smooth_predictor_64x16_c
|
||||
+
|
||||
+void aom_smooth_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_64x32 aom_smooth_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -1139,6 +1411,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_8x16 aom_smooth_predictor_8x16_c
|
||||
+
|
||||
+void aom_smooth_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_8x32 aom_smooth_predictor_8x32_c
|
||||
+
|
||||
+void aom_smooth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_predictor_8x4 aom_smooth_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -1151,6 +1426,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_16x32 aom_smooth_v_predictor_16x32_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_16x4 aom_smooth_v_predictor_16x4_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_16x64 aom_smooth_v_predictor_16x64_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_16x8 aom_smooth_v_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -1163,12 +1444,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_v_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_32x64 aom_smooth_v_predictor_32x64_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_32x8 aom_smooth_v_predictor_32x8_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_4x16 aom_smooth_v_predictor_4x16_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_4x4 aom_smooth_v_predictor_4x4_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_4x8 aom_smooth_v_predictor_4x8_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_64x16 aom_smooth_v_predictor_64x16_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_64x32 aom_smooth_v_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -1178,6 +1468,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_smooth_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_8x16 aom_smooth_v_predictor_8x16_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_8x32 aom_smooth_v_predictor_8x32_c
|
||||
+
|
||||
+void aom_smooth_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_smooth_v_predictor_8x4 aom_smooth_v_predictor_8x4_c
|
||||
+
|
||||
|
|
@ -1304,6 +1597,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_16x32 aom_v_predictor_16x32_c
|
||||
+
|
||||
+void aom_v_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_16x4 aom_v_predictor_16x4_c
|
||||
+
|
||||
+void aom_v_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_16x64 aom_v_predictor_16x64_c
|
||||
+
|
||||
+void aom_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_16x8 aom_v_predictor_16x8_c
|
||||
+
|
||||
|
|
@ -1316,12 +1615,21 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_v_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_32x64 aom_v_predictor_32x64_c
|
||||
+
|
||||
+void aom_v_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_32x8 aom_v_predictor_32x8_c
|
||||
+
|
||||
+void aom_v_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_4x16 aom_v_predictor_4x16_c
|
||||
+
|
||||
+void aom_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_4x4 aom_v_predictor_4x4_c
|
||||
+
|
||||
+void aom_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_4x8 aom_v_predictor_4x8_c
|
||||
+
|
||||
+void aom_v_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_64x16 aom_v_predictor_64x16_c
|
||||
+
|
||||
+void aom_v_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_64x32 aom_v_predictor_64x32_c
|
||||
+
|
||||
|
|
@ -1331,12 +1639,18 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void aom_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_8x16 aom_v_predictor_8x16_c
|
||||
+
|
||||
+void aom_v_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_8x32 aom_v_predictor_8x32_c
|
||||
+
|
||||
+void aom_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_8x4 aom_v_predictor_8x4_c
|
||||
+
|
||||
+void aom_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
|
||||
+#define aom_v_predictor_8x8 aom_v_predictor_8x8_c
|
||||
+
|
||||
+uint64_t aom_var_2d_u16_c(uint8_t *src, int src_stride, int width, int height);
|
||||
+#define aom_var_2d_u16 aom_var_2d_u16_c
|
||||
+
|
||||
+uint64_t aom_var_2d_u8_c(uint8_t *src, int src_stride, int width, int height);
|
||||
+#define aom_var_2d_u8 aom_var_2d_u8_c
|
||||
+
|
||||
|
|
@ -1410,14 +1724,14 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+} // extern "C"
|
||||
+#endif
|
||||
+
|
||||
+#endif // AOM_DSP_RTCD_H_
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
|
||||
+#endif
|
||||
Index: chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
|
||||
+++ chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/aom_scale_rtcd.h
|
||||
@@ -0,0 +1,91 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
|
||||
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
|
||||
+ *
|
||||
+ * This source code is subject to the terms of the BSD 2 Clause License and
|
||||
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
|
||||
|
|
@ -1506,14 +1820,14 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+} // extern "C"
|
||||
+#endif
|
||||
+
|
||||
+#endif // AOM_SCALE_RTCD_H_
|
||||
Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
|
||||
+#endif
|
||||
Index: chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
|
||||
@@ -0,0 +1,405 @@
|
||||
+++ chromium-134.0.6998.35/third_party/libaom/source/config/linux/ppc64/config/av1_rtcd.h
|
||||
@@ -0,0 +1,438 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2025, Alliance for Open Media. All rights reserved.
|
||||
+ * Copyright (c) 2024, Alliance for Open Media. All rights reserved.
|
||||
+ *
|
||||
+ * This source code is subject to the terms of the BSD 2 Clause License and
|
||||
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
|
||||
|
|
@ -1615,6 +1929,9 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+ int subpel_y_q3, const uint8_t *ref, int ref_stride, int subpel_search);
|
||||
+#define aom_upsampled_pred aom_upsampled_pred_c
|
||||
+
|
||||
+int av1_apply_selfguided_restoration_c(const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd);
|
||||
+#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_c
|
||||
+
|
||||
+int64_t av1_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
|
||||
+#define av1_block_error av1_block_error_c
|
||||
+
|
||||
|
|
@ -1735,7 +2052,7 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void av1_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
|
||||
+#define av1_fwht4x4 av1_fwht4x4_c
|
||||
+
|
||||
+uint32_t av1_get_crc32c_value_c(void *crc_calculator, const uint8_t *p, size_t length);
|
||||
+uint32_t av1_get_crc32c_value_c(void *crc_calculator, uint8_t *p, size_t length);
|
||||
+#define av1_get_crc32c_value av1_get_crc32c_value_c
|
||||
+
|
||||
+void av1_get_horver_correlation_full_c(const int16_t *diff, int stride, int w, int h, float *hcorr, float *vcorr);
|
||||
|
|
@ -1849,12 +2166,20 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void av1_round_shift_array_c(int32_t *arr, int size, int bit);
|
||||
+#define av1_round_shift_array av1_round_shift_array_c
|
||||
+
|
||||
+int av1_selfguided_restoration_c(const uint8_t *dgd8, int width, int height,
|
||||
+ int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
|
||||
+ int sgr_params_idx, int bit_depth, int highbd);
|
||||
+#define av1_selfguided_restoration av1_selfguided_restoration_c
|
||||
+
|
||||
+void av1_txb_init_levels_c(const tran_low_t *const coeff, const int width, const int height, uint8_t *const levels);
|
||||
+#define av1_txb_init_levels av1_txb_init_levels_c
|
||||
+
|
||||
+void av1_upsample_intra_edge_c(uint8_t *p, int sz);
|
||||
+#define av1_upsample_intra_edge av1_upsample_intra_edge_c
|
||||
+
|
||||
+void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width, int height, int stride, uint8_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
|
||||
+#define av1_warp_affine av1_warp_affine_c
|
||||
+
|
||||
+void av1_wedge_compute_delta_squares_c(int16_t *d, const int16_t *a, const int16_t *b, int N);
|
||||
+#define av1_wedge_compute_delta_squares av1_wedge_compute_delta_squares_c
|
||||
+
|
||||
|
|
@ -1864,6 +2189,12 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+uint64_t av1_wedge_sse_from_residuals_c(const int16_t *r1, const int16_t *d, const uint8_t *m, int N);
|
||||
+#define av1_wedge_sse_from_residuals av1_wedge_sse_from_residuals_c
|
||||
+
|
||||
+void av1_wiener_convolve_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const WienerConvolveParams *conv_params);
|
||||
+#define av1_wiener_convolve_add_src av1_wiener_convolve_add_src_c
|
||||
+
|
||||
+void cdef_copy_rect8_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int width, int height);
|
||||
+#define cdef_copy_rect8_16bit_to_16bit cdef_copy_rect8_16bit_to_16bit_c
|
||||
+
|
||||
+void cdef_copy_rect8_8bit_to_16bit_c(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int width, int height);
|
||||
+#define cdef_copy_rect8_8bit_to_16bit cdef_copy_rect8_8bit_to_16bit_c
|
||||
+
|
||||
|
|
@ -1897,6 +2228,22 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+void cdef_find_dir_dual_c(const uint16_t *img1, const uint16_t *img2, int stride, int32_t *var1, int32_t *var2, int coeff_shift, int *out1, int *out2);
|
||||
+#define cdef_find_dir_dual cdef_find_dir_dual_c
|
||||
+
|
||||
+cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
|
||||
+#define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_c
|
||||
+
|
||||
+cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
|
||||
+#define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_c
|
||||
+
|
||||
+cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
|
||||
+#define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_c
|
||||
+
|
||||
+cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
|
||||
+#define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_c
|
||||
+
|
||||
+cfl_subtract_average_fn cfl_get_subtract_average_fn_c(TX_SIZE tx_size);
|
||||
+cfl_subtract_average_fn cfl_get_subtract_average_fn_vsx(TX_SIZE tx_size);
|
||||
+#define cfl_get_subtract_average_fn cfl_get_subtract_average_fn_vsx
|
||||
+
|
||||
+void av1_rtcd(void);
|
||||
+
|
||||
+#include "config/aom_config.h"
|
||||
|
|
@ -1916,4 +2263,4 @@ Index: chromium-144.0.7559.59/third_party/libaom/source/config/linux/ppc64/confi
|
|||
+} // extern "C"
|
||||
+#endif
|
||||
+
|
||||
+#endif // AV1_RTCD_H_
|
||||
+#endif
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Index: chromium-144.0.7559.59/v8/gni/v8.gni
|
||||
Index: chromium-134.0.6998.117/v8/gni/v8.gni
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/v8/gni/v8.gni
|
||||
+++ chromium-144.0.7559.59/v8/gni/v8.gni
|
||||
@@ -317,7 +317,7 @@ assert(
|
||||
--- chromium-134.0.6998.117.orig/v8/gni/v8.gni
|
||||
+++ chromium-134.0.6998.117/v8/gni/v8.gni
|
||||
@@ -224,7 +224,7 @@ assert(!(v8_enable_webassembly && v8_ena
|
||||
if (v8_enable_pointer_compression == "") {
|
||||
v8_enable_pointer_compression =
|
||||
v8_current_cpu == "arm64" || v8_current_cpu == "x64" ||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ Subject: [PATCH] Force baseline POWER8 / AltiVec / VSX CPU features when on a
|
|||
BUILD.gn | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
Index: chromium-144.0.7559.59/v8/BUILD.gn
|
||||
Index: chromium-130.0.6723.44/v8/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/v8/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/v8/BUILD.gn
|
||||
@@ -1596,7 +1596,14 @@ config("toolchain") {
|
||||
--- chromium-130.0.6723.44.orig/v8/BUILD.gn
|
||||
+++ chromium-130.0.6723.44/v8/BUILD.gn
|
||||
@@ -1431,7 +1431,14 @@ config("toolchain") {
|
||||
if (v8_current_cpu == "ppc64") {
|
||||
defines += [ "V8_TARGET_ARCH_PPC64" ]
|
||||
cflags += [ "-ffp-contract=off" ]
|
||||
|
|
|
|||
|
|
@ -40,20 +40,20 @@ This patch implements support for the PPC64 architecture on Linux hosts.
|
|||
util/misc/capture_context_test_util_linux.cc | 6 +
|
||||
36 files changed, 932 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/CONTRIBUTORS
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/CONTRIBUTORS
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/CONTRIBUTORS
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/CONTRIBUTORS
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/CONTRIBUTORS
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/CONTRIBUTORS
|
||||
@@ -13,3 +13,5 @@ Mark Mentovai <mark@chromium.org>
|
||||
Robert Sesek <rsesek@chromium.org>
|
||||
Scott Graham <scottmg@chromium.org>
|
||||
Joshua Peraza <jperaza@chromium.org>
|
||||
+Shawn Anastasio <sanastasio@raptorengineering.com>
|
||||
+Timothy Pearson <tpearson@raptorengineering.com>
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context.h
|
||||
@@ -686,6 +686,70 @@ struct MinidumpContextRISCV64 {
|
||||
uint32_t fcsr;
|
||||
};
|
||||
|
|
@ -125,10 +125,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_co
|
|||
} // namespace crashpad
|
||||
|
||||
#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
|
||||
@@ -110,6 +110,13 @@ MinidumpContextWriter::CreateFromSnapsho
|
||||
break;
|
||||
}
|
||||
|
|
@ -192,10 +192,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_co
|
|||
+}
|
||||
|
||||
} // namespace crashpad
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
|
||||
@@ -413,6 +413,49 @@ class MinidumpContextRISCV64Writer final
|
||||
MinidumpContextRISCV64 context_;
|
||||
};
|
||||
|
|
@ -246,10 +246,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_co
|
|||
} // namespace crashpad
|
||||
|
||||
#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
|
||||
@@ -322,6 +322,21 @@ TYPED_TEST(MinidumpContextWriter, RISCV6
|
||||
TypeParam>(context, ExpectMinidumpContextRISCV64, kSeed);
|
||||
}
|
||||
|
|
@ -272,10 +272,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_co
|
|||
} // namespace
|
||||
} // namespace test
|
||||
} // namespace crashpad
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
|
||||
@@ -177,6 +177,8 @@ std::string MinidumpMiscInfoDebugBuildSt
|
||||
static constexpr char kCPU[] = "mips64";
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
|
|
@ -285,10 +285,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/minidump_mi
|
|||
#else
|
||||
#error define kCPU for this CPU
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
|
||||
@@ -297,6 +297,40 @@ void InitializeMinidumpContextRISCV64(Mi
|
||||
context->fcsr = value++;
|
||||
}
|
||||
|
|
@ -369,10 +369,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidu
|
|||
+
|
||||
} // namespace test
|
||||
} // namespace crashpad
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.h
|
||||
@@ -90,6 +90,9 @@ void ExpectMinidumpContextMIPS64(uint32_
|
||||
void ExpectMinidumpContextRISCV64(uint32_t expect_seed,
|
||||
const MinidumpContextRISCV64* observed,
|
||||
|
|
@ -383,10 +383,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/minidump/test/minidu
|
|||
//! \}
|
||||
|
||||
} // namespace test
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/capture_memory.cc
|
||||
@@ -123,6 +123,11 @@ void CaptureMemory::PointedToByContext(c
|
||||
for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
|
||||
MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
|
||||
|
|
@ -399,10 +399,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/capture_mem
|
|||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
|
||||
@@ -47,6 +47,9 @@ enum CPUArchitecture {
|
||||
|
||||
//! \brief 64-bit RISC-V.
|
||||
|
|
@ -413,10 +413,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_archite
|
|||
};
|
||||
|
||||
} // namespace crashpad
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/cpu_context.cc
|
||||
@@ -173,6 +173,8 @@ uint64_t CPUContext::InstructionPointer(
|
||||
return arm64->pc;
|
||||
case kCPUArchitectureRISCV64:
|
||||
|
|
@ -443,10 +443,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context
|
|||
case kCPUArchitectureRISCV64:
|
||||
return true;
|
||||
case kCPUArchitectureX86:
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/cpu_context.h
|
||||
@@ -371,6 +371,24 @@ struct CPUContextRISCV64 {
|
||||
uint32_t fcsr;
|
||||
};
|
||||
|
|
@ -480,10 +480,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/cpu_context
|
|||
};
|
||||
};
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
|
||||
@@ -15,6 +15,7 @@
|
||||
#ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
|
||||
#define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
|
||||
|
|
@ -571,10 +571,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/cpu_c
|
|||
} // namespace internal
|
||||
} // namespace crashpad
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
|
||||
@@ -194,12 +194,15 @@ void TestAgainstTarget(PtraceConnection*
|
||||
device == 0 && inode == 0 && mapping_name == "[vdso]";
|
||||
#if defined(ARCH_CPU_X86)
|
||||
|
|
@ -592,10 +592,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/debug
|
|||
},
|
||||
module_mapping->name,
|
||||
module_mapping->device,
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
|
||||
@@ -367,6 +367,69 @@ bool ExceptionSnapshotLinux::ReadContext
|
||||
return internal::ReadContext(reader, context_address, context_.riscv64);
|
||||
}
|
||||
|
|
@ -666,10 +666,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/excep
|
|||
#endif // ARCH_CPU_X86_FAMILY
|
||||
|
||||
bool ExceptionSnapshotLinux::Initialize(
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
|
||||
@@ -94,6 +94,8 @@ class ExceptionSnapshotLinux final : pub
|
||||
CPUContextMIPS64 mips64;
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
|
|
@ -679,10 +679,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/excep
|
|||
#endif
|
||||
} context_union_;
|
||||
CPUContext context_;
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
|
||||
@@ -325,7 +325,28 @@ void ExpectContext(const CPUContext& act
|
||||
sizeof(actual.riscv64->fpregs)),
|
||||
0);
|
||||
|
|
@ -712,10 +712,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/excep
|
|||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
|
||||
@@ -129,6 +129,8 @@ void ProcessReaderLinux::Thread::Initial
|
||||
: thread_info.thread_context.t32.regs[29];
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
|
|
@ -725,10 +725,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/proce
|
|||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
|
||||
@@ -456,6 +456,89 @@ static_assert(offsetof(UContext<ContextT
|
||||
offsetof(ucontext_t, uc_mcontext.__fpregs),
|
||||
"context offset mismatch");
|
||||
|
|
@ -819,11 +819,11 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/signa
|
|||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
@@ -229,6 +229,8 @@ CPUArchitecture SystemSnapshotLinux::Get
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
|
||||
@@ -208,6 +208,8 @@ CPUArchitecture SystemSnapshotLinux::Get
|
||||
: kCPUArchitectureMIPSEL;
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
return kCPUArchitectureRISCV64;
|
||||
|
|
@ -832,7 +832,7 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/syste
|
|||
#else
|
||||
#error port to your architecture
|
||||
#endif
|
||||
@@ -247,6 +249,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
|
||||
@@ -226,6 +228,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
// Not implemented
|
||||
return 0;
|
||||
|
|
@ -842,7 +842,7 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/syste
|
|||
#else
|
||||
#error port to your architecture
|
||||
#endif
|
||||
@@ -270,6 +275,9 @@ std::string SystemSnapshotLinux::CPUVend
|
||||
@@ -249,6 +254,9 @@ std::string SystemSnapshotLinux::CPUVend
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
// Not implemented
|
||||
return std::string();
|
||||
|
|
@ -852,7 +852,7 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/syste
|
|||
#else
|
||||
#error port to your architecture
|
||||
#endif
|
||||
@@ -401,6 +409,9 @@ bool SystemSnapshotLinux::NXEnabled() co
|
||||
@@ -380,6 +388,9 @@ bool SystemSnapshotLinux::NXEnabled() co
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
// Not implemented
|
||||
return false;
|
||||
|
|
@ -862,10 +862,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/syste
|
|||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
|
||||
@@ -196,6 +196,14 @@ bool ThreadSnapshotLinux::Initialize(
|
||||
InitializeCPUContextRISCV64(thread.thread_info.thread_context.t64,
|
||||
thread.thread_info.float_context.f64,
|
||||
|
|
@ -881,10 +881,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/threa
|
|||
#else
|
||||
#error Port.
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
|
||||
@@ -79,6 +79,8 @@ class ThreadSnapshotLinux final : public
|
||||
CPUContextMIPS64 mips64;
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
|
|
@ -894,10 +894,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/linux/threa
|
|||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_X86_FAMILY
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
|
||||
@@ -317,5 +317,38 @@ void InitializeCPUContextRISCV64(CPUCont
|
||||
riscv64->fcsr = value++;
|
||||
}
|
||||
|
|
@ -937,10 +937,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_c
|
|||
+
|
||||
} // namespace test
|
||||
} // namespace crashpad
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.h
|
||||
@@ -64,6 +64,7 @@ void InitializeCPUContextARM64(CPUContex
|
||||
void InitializeCPUContextMIPS(CPUContext* context, uint32_t seed);
|
||||
void InitializeCPUContextMIPS64(CPUContext* context, uint32_t seed);
|
||||
|
|
@ -949,10 +949,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/snapshot/test/test_c
|
|||
//! \}
|
||||
|
||||
} // namespace test
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/test/linux/get_tls.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/test/linux/get_tls.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/test/linux/get_tls.cc
|
||||
@@ -51,6 +51,8 @@ LinuxVMAddress GetTLS() {
|
||||
: "$3");
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
|
|
@ -962,10 +962,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/linux/get_tls.c
|
|||
#else
|
||||
#error Port.
|
||||
#endif // ARCH_CPU_ARMEL
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_posix.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/test/multiprocess_posix.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_posix.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/test/multiprocess_posix.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/test/multiprocess_posix.cc
|
||||
@@ -162,7 +162,8 @@ void Multiprocess::SetExpectedChildTermi
|
||||
}
|
||||
|
||||
|
|
@ -976,10 +976,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/test/multiprocess_po
|
|||
SetExpectedChildTermination(kTerminationSignal, SIGTRAP);
|
||||
#else
|
||||
SetExpectedChildTermination(kTerminationSignal, SIGILL);
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
|
||||
@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
|
||||
if (type == AT_IGNORE) {
|
||||
continue;
|
||||
|
|
@ -992,10 +992,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/auxiliary
|
|||
if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
|
||||
LOG(ERROR) << "duplicate auxv entry";
|
||||
return false;
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/linux/ptracer.cc
|
||||
@@ -430,6 +430,64 @@ bool GetThreadArea64(pid_t tid,
|
||||
return true;
|
||||
}
|
||||
|
|
@ -1071,10 +1071,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/ptracer.c
|
|||
GetThreadArea64(tid,
|
||||
info->thread_context,
|
||||
&info->thread_specific_data_address,
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
@@ -34,6 +34,10 @@
|
||||
#include <asm/ptrace.h>
|
||||
#endif
|
||||
|
|
@ -1193,10 +1193,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/linux/thread_in
|
|||
//! \brief The thread-local storage address for the thread.
|
||||
LinuxVMAddress thread_specific_data_address;
|
||||
};
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context.h
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context.h
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/misc/capture_context.h
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context.h
|
||||
@@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t;
|
||||
//! Linux | ARM/ARM64 | `r0`/`x0`
|
||||
//! Linux | MIPS/MIPS64 | `$a0`
|
||||
|
|
@ -1205,10 +1205,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_co
|
|||
//!
|
||||
//! Additionally, the value `LR` on ARM/ARM64 will be the return address of
|
||||
//! this function.
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
|
||||
@@ -30,7 +30,7 @@
|
||||
.globl CAPTURECONTEXT_SYMBOL2
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
|
|
@ -1435,10 +1435,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_co
|
|||
#elif defined(__riscv)
|
||||
|
||||
#define MCONTEXT_GREGS_OFFSET 176
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
|
||||
@@ -48,7 +48,7 @@ void TestCaptureContext() {
|
||||
uintptr_t pc = ProgramCounterFromContext(context_1);
|
||||
|
||||
|
|
@ -1448,10 +1448,10 @@ Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_co
|
|||
// Sanitizers can cause enough code bloat that the “nearby” check would
|
||||
// likely fail.
|
||||
const uintptr_t kReferencePC =
|
||||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
|
||||
Index: chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
|
||||
+++ chromium-136.0.7103.48/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
|
||||
@@ -38,6 +38,8 @@ void SanityCheckContext(const NativeCPUC
|
||||
#elif defined(ARCH_CPU_RISCV64)
|
||||
EXPECT_EQ(context.uc_mcontext.__gregs[10],
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ https://wiki.raptorcs.com/wiki/Porting/Chromium
|
|||
src/tools/linux/md2core/minidump-2-core.cc | 45 +++++++++++++++
|
||||
25 files changed, 281 insertions(+), 35 deletions(-)
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||
@@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP
|
||||
# else
|
||||
# error "Unexpected __riscv_xlen"
|
||||
|
|
@ -67,10 +67,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dum
|
|||
#else
|
||||
#error "This code has not been ported to your platform yet."
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||
@@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte
|
||||
#error "Unexpected __riscv_xlen"
|
||||
#endif
|
||||
|
|
@ -153,10 +153,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dum
|
|||
+#endif
|
||||
+
|
||||
} // namespace google_breakpad
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||
@@ -67,6 +67,10 @@ struct ThreadInfo {
|
||||
// Use the structures defined in <sys/user.h>
|
||||
struct user_regs_struct regs;
|
||||
|
|
@ -180,10 +180,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dum
|
|||
};
|
||||
|
||||
} // namespace google_breakpad
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
@@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC
|
||||
#error "Unexpected __riscv_xlen"
|
||||
#endif
|
||||
|
|
@ -233,10 +233,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dum
|
|||
#endif
|
||||
|
||||
} // namespace google_breakpad
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
@@ -54,6 +54,9 @@ struct UContextReader {
|
||||
#elif defined(__aarch64__)
|
||||
static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
|
||||
|
|
@ -247,11 +247,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/dum
|
|||
#else
|
||||
static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -466,6 +466,13 @@ bool ExceptionHandler::HandleSignal(int
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -465,6 +465,13 @@ bool ExceptionHandler::HandleSignal(int
|
||||
memcpy(&g_crash_context_.float_state, fp_ptr,
|
||||
sizeof(g_crash_context_.float_state));
|
||||
}
|
||||
|
|
@ -265,7 +265,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||
ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||
if (uc_ptr->uc_mcontext.fpregs) {
|
||||
@@ -704,10 +711,18 @@ bool ExceptionHandler::WriteMinidump() {
|
||||
@@ -703,10 +710,18 @@ bool ExceptionHandler::WriteMinidump() {
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -285,7 +285,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
context.tid = sys_gettid();
|
||||
|
||||
// Add an exception stream to the minidump for better reporting.
|
||||
@@ -728,6 +743,9 @@ bool ExceptionHandler::WriteMinidump() {
|
||||
@@ -727,6 +742,9 @@ bool ExceptionHandler::WriteMinidump() {
|
||||
#elif defined(__mips__)
|
||||
context.siginfo.si_addr =
|
||||
reinterpret_cast<void*>(context.context.uc_mcontext.pc);
|
||||
|
|
@ -295,11 +295,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
#elif defined(__riscv)
|
||||
context.siginfo.si_addr =
|
||||
reinterpret_cast<void*>(context.context.uc_mcontext.__gregs[REG_PC]);
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||
@@ -197,7 +197,11 @@ class ExceptionHandler {
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||
@@ -200,7 +200,11 @@ class ExceptionHandler {
|
||||
siginfo_t siginfo;
|
||||
pid_t tid; // the crashing thread.
|
||||
ucontext_t context;
|
||||
|
|
@ -312,11 +312,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
fpstate_t float_state;
|
||||
#endif
|
||||
};
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||
@@ -325,7 +325,7 @@ TEST(ExceptionHandlerTest, ParallelChild
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||
@@ -326,7 +326,7 @@ TEST(ExceptionHandlerTest, ParallelChild
|
||||
ASSERT_EQ(SIGSEGV, WTERMSIG(status));
|
||||
return;
|
||||
} else {
|
||||
|
|
@ -325,7 +325,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
}
|
||||
}
|
||||
|
||||
@@ -581,6 +581,8 @@ const unsigned char kIllegalInstruction[
|
||||
@@ -582,6 +582,8 @@ const unsigned char kIllegalInstruction[
|
||||
#if defined(__mips__)
|
||||
// mfc2 zero,Impl - usually illegal in userspace.
|
||||
0x48, 0x00, 0x00, 0x48
|
||||
|
|
@ -334,7 +334,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
#else
|
||||
// This crashes with SIGILL on x86/x86-64/arm.
|
||||
0xff, 0xff, 0xff, 0xff
|
||||
@@ -776,10 +778,10 @@ TEST(ExceptionHandlerTest, InstructionPo
|
||||
@@ -777,10 +779,10 @@ TEST(ExceptionHandlerTest, InstructionPo
|
||||
|
||||
// These are defined here so the parent can use them to check the
|
||||
// data from the minidump afterwards.
|
||||
|
|
@ -347,10 +347,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/han
|
|||
const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
|
||||
|
||||
const pid_t child = fork();
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||
@@ -143,7 +143,9 @@ class MicrodumpWriter {
|
||||
const MicrodumpExtraInfo& microdump_extra_info,
|
||||
LinuxDumper* dumper)
|
||||
|
|
@ -393,11 +393,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/mic
|
|||
const google_breakpad::fpstate_t* const float_state_;
|
||||
#endif
|
||||
LinuxDumper* dumper_;
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||
@@ -281,10 +281,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||
@@ -282,10 +282,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
|
||||
CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
|
||||
ASSERT_TRUE(ContainsMicrodump(buf));
|
||||
|
||||
|
|
@ -420,10 +420,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/mic
|
|||
#else
|
||||
ASSERT_NE(std::string::npos,
|
||||
buf.find("M 00001000 0000002A 00001000 "
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||
@@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
|
||||
#elif defined(__riscv)
|
||||
stack_pointer = reinterpret_cast<uint8_t*>(
|
||||
|
|
@ -446,11 +446,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
# if defined(__ANDROID__)
|
||||
for (int i = EF_R0; i <= EF_R31; i++)
|
||||
info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||
@@ -789,7 +789,9 @@ bool LinuxDumper::GetStackInfo(const voi
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||
@@ -770,7 +770,9 @@ bool LinuxDumper::GetStackInfo(const voi
|
||||
reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
|
||||
|
||||
// The number of bytes of stack which we try to capture.
|
||||
|
|
@ -461,10 +461,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
|
||||
const MappingInfo* mapping = FindMapping(stack_pointer);
|
||||
if (!mapping)
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||
@@ -64,7 +64,8 @@ namespace google_breakpad {
|
||||
typedef Elf32_auxv_t elf_aux_entry;
|
||||
#elif defined(__x86_64) || defined(__aarch64__) || \
|
||||
|
|
@ -475,10 +475,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
typedef Elf64_auxv_t elf_aux_entry;
|
||||
#endif
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||
@@ -57,6 +57,8 @@
|
||||
#define TID_PTR_REGISTER "$1"
|
||||
#elif defined(__riscv)
|
||||
|
|
@ -488,10 +488,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
#else
|
||||
#error This test has not been ported to this platform.
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||
@@ -208,12 +208,12 @@ bool LinuxPtraceDumper::ReadRegisterSet(
|
||||
#ifdef PTRACE_GETREGSET
|
||||
struct iovec io;
|
||||
|
|
@ -533,11 +533,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
#else
|
||||
# error "This code hasn't been ported to your platform yet."
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||
@@ -469,6 +469,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||
@@ -470,6 +470,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
|
||||
#elif defined(__riscv)
|
||||
pid_t* process_tid_location =
|
||||
reinterpret_cast<pid_t*>(one_thread.mcontext.__gregs[4]);
|
||||
|
|
@ -547,7 +547,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
#else
|
||||
#error This test has not been ported to this platform.
|
||||
#endif
|
||||
@@ -568,6 +571,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
|
||||
@@ -569,6 +572,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
|
||||
uintptr_t heap_addr = thread_info.mcontext.gregs[1];
|
||||
#elif defined(__riscv)
|
||||
uintptr_t heap_addr = thread_info.mcontext.__gregs[4];
|
||||
|
|
@ -556,10 +556,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
#else
|
||||
#error This test has not been ported to this platform.
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||
@@ -145,7 +145,9 @@ class MinidumpWriter {
|
||||
: fd_(minidump_fd),
|
||||
path_(minidump_path),
|
||||
|
|
@ -613,10 +613,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
const google_breakpad::fpstate_t* const float_state_; // ditto
|
||||
#endif
|
||||
LinuxDumper* dumper_;
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
@@ -47,6 +47,8 @@ class ExceptionHandler;
|
||||
|
||||
#if defined(__aarch64__)
|
||||
|
|
@ -626,10 +626,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
||||
typedef std::remove_pointer<fpregset_t>::type fpstate_t;
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||
@@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi
|
||||
#elif defined(__riscv)
|
||||
context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] =
|
||||
|
|
@ -640,10 +640,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/client/linux/min
|
|||
#else
|
||||
# error "This code has not been ported to your platform yet."
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||
@@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p
|
||||
|
||||
#if defined(__x86_64__) || defined(__aarch64__) || \
|
||||
|
|
@ -654,11 +654,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/mem
|
|||
struct kernel_stat st;
|
||||
if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
|
||||
#else
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||
@@ -178,9 +178,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||
@@ -179,9 +179,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
|
||||
TEST_F(MemoryMappedFileTest, MapWithOffset) {
|
||||
// Put more data in the test file this time. Offsets can only be
|
||||
// done on page boundaries, so we need a two page file to test this.
|
||||
|
|
@ -672,11 +672,11 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/linux/mem
|
|||
for (size_t i = 0; i < data1_size; ++i) {
|
||||
data1[i] = i & 0x7f;
|
||||
}
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||
@@ -64,8 +64,9 @@ TEST(PageAllocatorTest, LargeObject) {
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||
@@ -60,8 +60,9 @@ TEST(PageAllocatorTest, LargeObject) {
|
||||
|
||||
EXPECT_EQ(0U, allocator.pages_allocated());
|
||||
uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
|
||||
|
|
@ -687,10 +687,10 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/common/memory_al
|
|||
for (unsigned i = 1; i < 10; ++i) {
|
||||
uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
|
||||
ASSERT_FALSE(p == nullptr);
|
||||
Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
Index: chromium-136.0.7103.48/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
--- chromium-136.0.7103.48.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
+++ chromium-136.0.7103.48/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||
@@ -82,6 +82,8 @@
|
||||
#define ELF_ARCH EM_AARCH64
|
||||
#elif defined(__riscv)
|
||||
|
|
@ -709,7 +709,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2c
|
|||
#endif
|
||||
|
||||
using google_breakpad::MDTypeHelper;
|
||||
@@ -325,6 +329,9 @@ struct CrashedProcess {
|
||||
@@ -324,6 +328,9 @@ struct CrashedProcess {
|
||||
#if defined(__aarch64__)
|
||||
user_fpsimd_struct fpregs;
|
||||
#endif
|
||||
|
|
@ -719,7 +719,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2c
|
|||
uintptr_t stack_addr;
|
||||
const uint8_t* stack;
|
||||
size_t stack_length;
|
||||
@@ -628,6 +635,38 @@ ParseThreadRegisters(CrashedProcess::Thr
|
||||
@@ -627,6 +634,38 @@ ParseThreadRegisters(CrashedProcess::Thr
|
||||
#error "Unexpected __riscv_xlen"
|
||||
#endif
|
||||
}
|
||||
|
|
@ -758,7 +758,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/breakpad/src/tools/linux/md2c
|
|||
#else
|
||||
#error "This code has not been ported to your platform yet"
|
||||
#endif
|
||||
@@ -733,6 +772,12 @@ ParseSystemInfo(const Options& options,
|
||||
@@ -732,6 +771,12 @@ ParseSystemInfo(const Options& options,
|
||||
# else
|
||||
# error "Unexpected __riscv_xlen"
|
||||
# endif
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
Index: chromium-144.0.7559.59/third_party/xnnpack/generate_build_gn.py
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/xnnpack/generate_build_gn.py
|
||||
+++ chromium-144.0.7559.59/third_party/xnnpack/generate_build_gn.py
|
||||
@@ -239,7 +239,10 @@ _PLATFORMS = [
|
||||
bazel_platform='//:linux_aarch64'),
|
||||
_Platform(gn_cpu='riscv64',
|
||||
bazel_cpu='riscv64',
|
||||
- bazel_platform='//:linux_riscv64')
|
||||
+ bazel_platform='//:linux_riscv64'),
|
||||
+ _Platform(gn_cpu='ppc64',
|
||||
+ bazel_cpu='ppc64le',
|
||||
+ bazel_platform='//:linux_ppc64le')
|
||||
]
|
||||
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/xnnpack/bazelroot/BUILD
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/xnnpack/bazelroot/BUILD
|
||||
+++ chromium-144.0.7559.59/third_party/xnnpack/bazelroot/BUILD
|
||||
@@ -29,6 +29,14 @@ platform(
|
||||
],
|
||||
)
|
||||
|
||||
+platform(
|
||||
+ name = "linux_ppc64le",
|
||||
+ constraint_values = [
|
||||
+ "@platforms//os:linux",
|
||||
+ "@platforms//cpu:ppc64le",
|
||||
+ ],
|
||||
+)
|
||||
+
|
||||
# A dummy clang toolchain for building them for any arch.
|
||||
|
||||
filegroup(name = "empty")
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From b3a14db7637232d30c878cc1f1ad6d8037e81379 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawn@anastas.io>
|
||||
Date: Tue, 15 Jan 2019 22:42:21 -0600
|
||||
Subject: [PATCH] linux/seccomp-bpf: ppc64+glibc workaround in SIGSYS handler
|
||||
|
||||
Workaround for an apparent issue with glibc negating syscall
|
||||
parameters. Observed on a ppc64le machine with glibc.
|
||||
More investigation required.
|
||||
---
|
||||
sandbox/linux/seccomp-bpf/trap.cc | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/trap.cc
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf/trap.cc
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/trap.cc
|
||||
@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
|
||||
SetIsInSigHandler();
|
||||
}
|
||||
|
||||
+#if defined(__powerpc64__)
|
||||
+ // On ppc64+glibc, some syscalls seem to accidentally negate the first
|
||||
+ // parameter which causes checks against it to fail. For now, manually
|
||||
+ // negate them back.
|
||||
+ // TODO(shawn@anastas.io): investigate this issue further
|
||||
+ auto nr = SECCOMP_SYSCALL(ctx);
|
||||
+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
|
||||
+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
|
||||
+ if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
|
||||
+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
// Copy the seccomp-specific data into a arch_seccomp_data structure. This
|
||||
// is what we are showing to TrapFnc callbacks that the system call
|
||||
// evaluator registered with the sandbox.
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,80 @@
|
|||
From 036d209a3f1a771de9aed31dfbe804aaf91d1c27 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 9 Aug 2018 23:35:21 -0500
|
||||
Subject: [PATCH] sandbox/linux: Implement partial support for ppc64 syscalls
|
||||
and ucontext
|
||||
|
||||
Unlike other architectures, the ppc64 files currently rely on applicable
|
||||
headers being provided by the system. It is sufficient for standard
|
||||
GNU/Linux environments, but may require expansion elsewhere.
|
||||
---
|
||||
sandbox/linux/BUILD.gn | 2 ++
|
||||
sandbox/linux/system_headers/linux_syscalls.h | 4 ++++
|
||||
sandbox/linux/system_headers/linux_ucontext.h | 2 ++
|
||||
sandbox/linux/system_headers/ppc64_linux_syscalls.h | 12 ++++++++++++
|
||||
sandbox/linux/system_headers/ppc64_linux_ucontext.h | 12 ++++++++++++
|
||||
5 files changed, 32 insertions(+)
|
||||
create mode 100644 sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||
create mode 100644 sandbox/linux/system_headers/ppc64_linux_ucontext.h
|
||||
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/linux/BUILD.gn
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/BUILD.gn
|
||||
@@ -384,6 +384,8 @@ component("sandbox_services") {
|
||||
|
||||
source_set("sandbox_services_headers") {
|
||||
sources = [
|
||||
+ "system_headers/ppc64_linux_syscalls.h",
|
||||
+ "system_headers/ppc64_linux_ucontext.h",
|
||||
"system_headers/arm64_linux_syscalls.h",
|
||||
"system_headers/arm_linux_syscalls.h",
|
||||
"system_headers/arm_linux_ucontext.h",
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/system_headers/linux_syscalls.h
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/linux/system_headers/linux_syscalls.h
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/system_headers/linux_syscalls.h
|
||||
@@ -35,5 +35,9 @@
|
||||
#include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
|
||||
#endif
|
||||
|
||||
+#if defined(__powerpc64__)
|
||||
+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
|
||||
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||
@@ -0,0 +1,12 @@
|
||||
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
+
|
||||
+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||
+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||
+
|
||||
+#include <asm/unistd.h>
|
||||
+
|
||||
+//TODO: is it necessary to redefine syscall numbers for PPC64?
|
||||
+
|
||||
+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/system_headers/ppc64_linux_ucontext.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/system_headers/ppc64_linux_ucontext.h
|
||||
@@ -0,0 +1,12 @@
|
||||
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
+
|
||||
+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
|
||||
+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
|
||||
+
|
||||
+#include <sys/ucontext.h>
|
||||
+
|
||||
+//TODO: is it necessary to redefine ucontext on PPC64?
|
||||
+
|
||||
+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
From c41cd6ac927f592b161abc04468d3c7a4be91995 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Tue, 23 Oct 2018 15:49:31 -0500
|
||||
Subject: [PATCH] sandbox/linux: Update IsSyscallAllowed in broker_process.cc
|
||||
|
||||
---
|
||||
sandbox/linux/syscall_broker/broker_process.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/syscall_broker/broker_process.cc
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/syscall_broker/broker_process.cc
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/syscall_broker/broker_process.cc
|
||||
@@ -169,7 +169,7 @@ bool BrokerProcess::IsSyscallBrokerable(
|
||||
#if defined(__NR_fstatat64)
|
||||
case __NR_fstatat64:
|
||||
#endif
|
||||
-#if defined(__x86_64__) || defined(__aarch64__)
|
||||
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_newfstatat:
|
||||
#endif
|
||||
return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT);
|
||||
638
0001-sandbox-linux-Update-syscall-helpers-lists-for-ppc64.patch
Normal file
638
0001-sandbox-linux-Update-syscall-helpers-lists-for-ppc64.patch
Normal file
|
|
@ -0,0 +1,638 @@
|
|||
From da52663deec77f705d7d58b18484c3e28e563f10 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Tue, 18 Sep 2018 18:39:28 -0500
|
||||
Subject: [PATCH] sandbox/linux: Update syscall helpers/lists for ppc64
|
||||
|
||||
---
|
||||
.../seccomp-bpf-helpers/baseline_policy.cc | 8 +-
|
||||
.../syscall_parameters_restrictions.cc | 2 +-
|
||||
.../syscall_parameters_restrictions.h | 2 +-
|
||||
.../linux/seccomp-bpf-helpers/syscall_sets.cc | 108 ++++++++++--------
|
||||
.../linux/seccomp-bpf-helpers/syscall_sets.h | 6 +-
|
||||
sandbox/linux/services/syscall_wrappers.cc | 2 +-
|
||||
6 files changed, 73 insertions(+), 55 deletions(-)
|
||||
|
||||
Index: chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
===================================================================
|
||||
--- chromium-136.0.7103.48.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
+++ chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
@@ -90,7 +90,8 @@ bool IsBaselinePolicyWatched(int sysno)
|
||||
SyscallSets::IsPrctl(sysno) ||
|
||||
SyscallSets::IsProcessGroupOrSession(sysno) ||
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
SyscallSets::IsSocketCall(sysno) ||
|
||||
#endif
|
||||
#if defined(__arm__)
|
||||
@@ -255,7 +256,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||
}
|
||||
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
if (sysno == __NR_mmap)
|
||||
return RestrictMmapFlags();
|
||||
#endif
|
||||
@@ -276,7 +277,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||
return RestrictPrctl();
|
||||
|
||||
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
if (sysno == __NR_socketpair) {
|
||||
// Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
|
||||
static_assert(AF_UNIX == PF_UNIX,
|
||||
@@ -340,7 +341,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||
}
|
||||
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
if (SyscallSets::IsSocketCall(sysno))
|
||||
return RestrictSocketcallCommand();
|
||||
#endif
|
||||
Index: chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
===================================================================
|
||||
--- chromium-136.0.7103.48.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
+++ chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "sandbox/linux/system_headers/linux_syscalls.h"
|
||||
#include "sandbox/linux/system_headers/linux_time.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) && !defined(__arm__) && !defined(__aarch64__) && \
|
||||
+#if BUILDFLAG(IS_LINUX) && !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) && \
|
||||
!defined(PTRACE_GET_THREAD_AREA)
|
||||
// Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
|
||||
// the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
|
||||
@@ -45,6 +45,11 @@
|
||||
#include <asm/ptrace-abi.h>
|
||||
#endif
|
||||
|
||||
+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
|
||||
+#ifdef __powerpc64__
|
||||
+#include <termios.h>
|
||||
+#endif
|
||||
+
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if !defined(F_DUPFD_CLOEXEC)
|
||||
@@ -102,6 +107,15 @@ inline bool IsArchitectureMips() {
|
||||
#endif
|
||||
}
|
||||
|
||||
+inline bool IsArchitecturePPC64() {
|
||||
+#if defined(__powerpc64__)
|
||||
+ return true;
|
||||
+#else
|
||||
+ return false;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+
|
||||
// Ubuntu's version of glibc has a race condition in sem_post that can cause
|
||||
// it to call futex(2) with bogus op arguments. To workaround this, we need
|
||||
// to allow those futex(2) calls to fail with EINVAL, instead of crashing the
|
||||
@@ -269,9 +283,11 @@ ResultExpr RestrictFcntlCommands() {
|
||||
// operator.
|
||||
// Glibc overrides the kernel's O_LARGEFILE value. Account for this.
|
||||
uint64_t kOLargeFileFlag = O_LARGEFILE;
|
||||
- if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
|
||||
+ if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips() \
|
||||
+ || IsArchitecturePPC64())
|
||||
kOLargeFileFlag = 0100000;
|
||||
|
||||
+
|
||||
const Arg<int> cmd(1);
|
||||
const Arg<long> long_arg(2);
|
||||
|
||||
@@ -294,8 +310,17 @@ ResultExpr RestrictFcntlCommands() {
|
||||
F_SETLKW,
|
||||
F_GETLK,
|
||||
F_DUPFD,
|
||||
- F_DUPFD_CLOEXEC},
|
||||
- Allow())
|
||||
+ F_DUPFD_CLOEXEC
|
||||
+#if defined(__powerpc64__)
|
||||
+// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
|
||||
+// but glibc will sometimes still use the 32-bit versions. Allow both.
|
||||
+ ,
|
||||
+ 5, /* F_GETLK (32) */
|
||||
+ 6, /* F_SETLK (32) */
|
||||
+ 7 /* F_SETLKW (32) */
|
||||
+#endif
|
||||
+ },
|
||||
+ Allow())
|
||||
.Case(F_SETFL,
|
||||
If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
|
||||
.Case(F_ADD_SEALS,
|
||||
@@ -304,7 +329,7 @@ ResultExpr RestrictFcntlCommands() {
|
||||
// clang-format on
|
||||
}
|
||||
|
||||
-#if defined(__i386__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
|
||||
ResultExpr RestrictSocketcallCommand() {
|
||||
// Unfortunately, we are unable to restrict the first parameter to
|
||||
// socketpair(2). Whilst initially sounding bad, it's noteworthy that very
|
||||
@@ -470,7 +495,7 @@ ResultExpr RestrictPtrace() {
|
||||
#endif
|
||||
return Switch(request)
|
||||
.Cases({
|
||||
-#if !defined(__aarch64__)
|
||||
+#if !defined(__aarch64__) && !defined(__powerpc64__)
|
||||
PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
|
||||
PTRACE_GETREGSET,
|
||||
#endif
|
||||
Index: chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||
===================================================================
|
||||
--- chromium-136.0.7103.48.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||
+++ chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||
@@ -52,7 +52,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
|
||||
// O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
|
||||
SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
|
||||
|
||||
-#if defined(__i386__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
|
||||
// Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
|
||||
// sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
|
||||
SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
|
||||
Index: chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
===================================================================
|
||||
--- chromium-136.0.7103.48.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
+++ chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int s
|
||||
switch (sysno) {
|
||||
case __NR_gettimeofday:
|
||||
#if defined(__i386__) || defined(__x86_64__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_time:
|
||||
#endif
|
||||
return true;
|
||||
@@ -52,12 +53,14 @@ bool SyscallSets::IsAllowedGettime(int s
|
||||
case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
|
||||
#endif
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_ftime: // Obsolete.
|
||||
#endif
|
||||
case __NR_settimeofday: // Privileged.
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_stime:
|
||||
#endif
|
||||
default:
|
||||
@@ -136,7 +139,7 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||
case __NR_faccessat2:
|
||||
case __NR_fchmodat:
|
||||
case __NR_fchownat: // Should be called chownat ?
|
||||
-#if defined(__x86_64__) || defined(__aarch64__)
|
||||
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_newfstatat: // fstatat(). EPERM not a valid errno.
|
||||
#elif defined(__i386__) || defined(__arm__) || \
|
||||
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
@@ -155,7 +158,7 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||
case __NR_memfd_create:
|
||||
case __NR_mkdirat:
|
||||
case __NR_mknodat:
|
||||
-#if defined(__i386__)
|
||||
+#if defined(__i386__) || defined(__powerpc64__)
|
||||
case __NR_oldlstat:
|
||||
case __NR_oldstat:
|
||||
#endif
|
||||
@@ -169,7 +172,8 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||
#endif
|
||||
case __NR_statfs: // EPERM not a valid errno.
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_statfs64:
|
||||
#endif
|
||||
case __NR_statx: // EPERM not a valid errno.
|
||||
@@ -180,7 +184,8 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||
case __NR_truncate64:
|
||||
#endif
|
||||
case __NR_unlinkat:
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_utime:
|
||||
#endif
|
||||
case __NR_utimensat: // New.
|
||||
@@ -220,7 +225,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
|
||||
#endif
|
||||
return true;
|
||||
// TODO(jln): these should be denied gracefully as well (moved below).
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_fadvise64: // EPERM not a valid errno.
|
||||
#endif
|
||||
#if defined(__i386__)
|
||||
@@ -233,11 +239,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
|
||||
case __NR_flock: // EPERM not a valid errno.
|
||||
case __NR_fstatfs: // Give information about the whole filesystem.
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_fstatfs64:
|
||||
#endif
|
||||
case __NR_fsync: // EPERM not a valid errno.
|
||||
-#if defined(__i386__)
|
||||
+#if defined(__i386__) || defined(__powerpc64__)
|
||||
case __NR_oldfstat:
|
||||
#endif
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
@@ -245,6 +252,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
|
||||
case __NR_sync_file_range: // EPERM not a valid errno.
|
||||
#elif defined(__arm__)
|
||||
case __NR_arm_sync_file_range: // EPERM not a valid errno.
|
||||
+#elif defined(__powerpc64__)
|
||||
+ case __NR_sync_file_range2: // EPERM not a valid errno.
|
||||
#endif
|
||||
default:
|
||||
return false;
|
||||
@@ -265,7 +274,8 @@ bool SyscallSets::IsDeniedFileSystemAcce
|
||||
#endif
|
||||
case __NR_getdents64: // EPERM not a valid errno.
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_readdir:
|
||||
#endif
|
||||
return true;
|
||||
@@ -306,7 +316,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
|
||||
bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
|
||||
switch (sysno) {
|
||||
case __NR_capset:
|
||||
-#if defined(__i386__) || defined(__x86_64__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
|
||||
case __NR_ioperm: // Intel privilege.
|
||||
case __NR_iopl: // Intel privilege.
|
||||
#endif
|
||||
@@ -362,7 +372,8 @@ bool SyscallSets::IsAllowedSignalHandlin
|
||||
// overflow.
|
||||
case __NR_sigaltstack:
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_rt_sigtimedwait_time64:
|
||||
case __NR_sigaction:
|
||||
case __NR_sigprocmask:
|
||||
@@ -378,7 +389,8 @@ bool SyscallSets::IsAllowedSignalHandlin
|
||||
#endif
|
||||
case __NR_signalfd4:
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_sigpending:
|
||||
case __NR_sigsuspend:
|
||||
#endif
|
||||
@@ -402,7 +414,7 @@ bool SyscallSets::IsAllowedOperationOnFd
|
||||
#endif
|
||||
case __NR_dup3:
|
||||
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_shutdown:
|
||||
#endif
|
||||
return true;
|
||||
@@ -435,7 +447,7 @@ bool SyscallSets::IsAllowedProcessStartO
|
||||
case __NR_exit_group:
|
||||
case __NR_wait4:
|
||||
case __NR_waitid:
|
||||
-#if defined(__i386__)
|
||||
+#if defined(__i386__) || defined(__powerpc64__)
|
||||
case __NR_waitpid:
|
||||
#endif
|
||||
return true;
|
||||
@@ -452,7 +464,7 @@ bool SyscallSets::IsAllowedProcessStartO
|
||||
#endif
|
||||
case __NR_set_tid_address:
|
||||
case __NR_unshare:
|
||||
-#if !defined(__mips__) && !defined(__aarch64__)
|
||||
+#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_vfork:
|
||||
#endif
|
||||
default:
|
||||
@@ -499,7 +511,7 @@ bool SyscallSets::IsAllowedEpoll(int sys
|
||||
bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
|
||||
switch (sysno) {
|
||||
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_accept:
|
||||
case __NR_accept4:
|
||||
case __NR_bind:
|
||||
@@ -514,7 +526,8 @@ bool SyscallSets::IsDeniedGetOrModifySoc
|
||||
}
|
||||
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
// Big multiplexing system call for sockets.
|
||||
bool SyscallSets::IsSocketCall(int sysno) {
|
||||
switch (sysno) {
|
||||
@@ -528,7 +541,8 @@ bool SyscallSets::IsSocketCall(int sysno
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
|
||||
+#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
bool SyscallSets::IsNetworkSocketInformation(int sysno) {
|
||||
switch (sysno) {
|
||||
case __NR_getpeername:
|
||||
@@ -554,7 +568,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
|
||||
case __NR_mincore:
|
||||
case __NR_mlockall:
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_mmap:
|
||||
#endif
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
@@ -584,7 +598,8 @@ bool SyscallSets::IsAllowedGeneralIo(int
|
||||
switch (sysno) {
|
||||
case __NR_lseek:
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR__llseek:
|
||||
#endif
|
||||
#if !defined(__aarch64__)
|
||||
@@ -604,26 +619,28 @@ bool SyscallSets::IsAllowedGeneralIo(int
|
||||
case __NR_readv:
|
||||
case __NR_pread64:
|
||||
#if defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_recv:
|
||||
#endif
|
||||
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_recvfrom: // Could specify source.
|
||||
case __NR_recvmsg: // Could specify source.
|
||||
#endif
|
||||
-#if defined(__i386__) || defined(__x86_64__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
|
||||
case __NR_select:
|
||||
#endif
|
||||
-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
|
||||
case __NR__newselect:
|
||||
#endif
|
||||
#if defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_send:
|
||||
#endif
|
||||
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_sendmsg: // Could specify destination.
|
||||
case __NR_sendto: // Could specify destination.
|
||||
#endif
|
||||
@@ -679,7 +696,8 @@ bool SyscallSets::IsAllowedBasicSchedule
|
||||
return true;
|
||||
case __NR_getpriority:
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_nice:
|
||||
#endif
|
||||
case __NR_setpriority:
|
||||
@@ -691,7 +709,8 @@ bool SyscallSets::IsAllowedBasicSchedule
|
||||
bool SyscallSets::IsAdminOperation(int sysno) {
|
||||
switch (sysno) {
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_bdflush:
|
||||
#endif
|
||||
case __NR_kexec_load:
|
||||
@@ -707,7 +726,8 @@ bool SyscallSets::IsAdminOperation(int s
|
||||
|
||||
bool SyscallSets::IsKernelModule(int sysno) {
|
||||
switch (sysno) {
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_create_module:
|
||||
case __NR_get_kernel_syms: // Should ENOSYS.
|
||||
case __NR_query_module:
|
||||
@@ -740,7 +760,8 @@ bool SyscallSets::IsFsControl(int sysno)
|
||||
case __NR_swapoff:
|
||||
case __NR_swapon:
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_umount:
|
||||
#endif
|
||||
case __NR_umount2:
|
||||
@@ -756,7 +777,7 @@ bool SyscallSets::IsNuma(int sysno) {
|
||||
case __NR_getcpu:
|
||||
case __NR_mbind:
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_migrate_pages:
|
||||
#endif
|
||||
case __NR_move_pages:
|
||||
@@ -791,14 +812,15 @@ bool SyscallSets::IsGlobalProcessEnviron
|
||||
switch (sysno) {
|
||||
case __NR_acct: // Privileged.
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_getrlimit:
|
||||
#endif
|
||||
-#if defined(__i386__) || defined(__arm__)
|
||||
+#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
|
||||
case __NR_ugetrlimit:
|
||||
#endif
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_ulimit:
|
||||
#endif
|
||||
case __NR_getrusage:
|
||||
@@ -832,7 +854,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
|
||||
#endif
|
||||
case __NR_sysinfo:
|
||||
case __NR_uname:
|
||||
-#if defined(__i386__)
|
||||
+#if defined(__i386__) || defined(__powerpc64__)
|
||||
case __NR_olduname:
|
||||
case __NR_oldolduname:
|
||||
#endif
|
||||
@@ -916,7 +938,8 @@ bool SyscallSets::IsSystemVSemaphores(in
|
||||
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
|
||||
defined(__aarch64__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
// These give a lot of ambient authority and bypass the setuid sandbox.
|
||||
bool SyscallSets::IsSystemVSharedMemory(int sysno) {
|
||||
switch (sysno) {
|
||||
@@ -947,7 +970,8 @@ bool SyscallSets::IsSystemVMessageQueue(
|
||||
#endif
|
||||
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
// Big system V multiplexing system call.
|
||||
bool SyscallSets::IsSystemVIpc(int sysno) {
|
||||
switch (sysno) {
|
||||
@@ -967,7 +991,8 @@ bool SyscallSets::IsAnySystemV(int sysno
|
||||
return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
|
||||
IsSystemVSharedMemory(sysno);
|
||||
#elif defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
return IsSystemVIpc(sysno);
|
||||
#endif
|
||||
}
|
||||
@@ -1024,7 +1049,8 @@ bool SyscallSets::IsFaNotify(int sysno)
|
||||
bool SyscallSets::IsTimer(int sysno) {
|
||||
switch (sysno) {
|
||||
case __NR_getitimer:
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_alarm:
|
||||
#endif
|
||||
case __NR_setitimer:
|
||||
@@ -1103,18 +1129,22 @@ bool SyscallSets::IsMisc(int sysno) {
|
||||
case __NR_syncfs:
|
||||
case __NR_vhangup:
|
||||
// The system calls below are not implemented.
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_afs_syscall:
|
||||
#endif
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_break:
|
||||
#endif
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_getpmsg:
|
||||
#endif
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_gtty:
|
||||
case __NR_idle:
|
||||
case __NR_lock:
|
||||
@@ -1122,20 +1152,22 @@ bool SyscallSets::IsMisc(int sysno) {
|
||||
case __NR_prof:
|
||||
case __NR_profil:
|
||||
#endif
|
||||
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_putpmsg:
|
||||
#endif
|
||||
#if defined(__x86_64__)
|
||||
case __NR_security:
|
||||
#endif
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
case __NR_stty:
|
||||
#endif
|
||||
-#if defined(__x86_64__)
|
||||
+#if defined(__x86_64__) || defined(__powerpc64__)
|
||||
case __NR_tuxcall:
|
||||
#endif
|
||||
-#if !defined(__aarch64__)
|
||||
+#if !defined(__aarch64__) && !defined(__powerpc64__)
|
||||
case __NR_vserver:
|
||||
#endif
|
||||
return true;
|
||||
Index: chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
|
||||
===================================================================
|
||||
--- chromium-136.0.7103.48.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
|
||||
+++ chromium-136.0.7103.48/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
|
||||
@@ -46,13 +46,14 @@ class SANDBOX_EXPORT SyscallSets {
|
||||
static bool IsDeniedGetOrModifySocket(int sysno);
|
||||
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
// Big multiplexing system call for sockets.
|
||||
static bool IsSocketCall(int sysno);
|
||||
#endif
|
||||
|
||||
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
static bool IsNetworkSocketInformation(int sysno);
|
||||
#endif
|
||||
|
||||
@@ -84,7 +85,8 @@ class SANDBOX_EXPORT SyscallSets {
|
||||
#endif
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
|
||||
defined(__aarch64__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
// These give a lot of ambient authority and bypass the setuid sandbox.
|
||||
static bool IsSystemVSharedMemory(int sysno);
|
||||
#endif
|
||||
@@ -95,7 +97,8 @@ class SANDBOX_EXPORT SyscallSets {
|
||||
#endif
|
||||
|
||||
#if defined(__i386__) || \
|
||||
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
+ defined(__powerpc64__)
|
||||
// Big system V multiplexing system call.
|
||||
static bool IsSystemVIpc(int sysno);
|
||||
#endif
|
||||
Index: chromium-136.0.7103.48/sandbox/linux/services/syscall_wrappers.cc
|
||||
===================================================================
|
||||
--- chromium-136.0.7103.48.orig/sandbox/linux/services/syscall_wrappers.cc
|
||||
+++ chromium-136.0.7103.48/sandbox/linux/services/syscall_wrappers.cc
|
||||
@@ -66,7 +66,7 @@ long sys_clone(unsigned long flags,
|
||||
#if defined(ARCH_CPU_X86_64)
|
||||
return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
|
||||
#elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||
- defined(ARCH_CPU_MIPS_FAMILY)
|
||||
+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
|
||||
// CONFIG_CLONE_BACKWARDS defined.
|
||||
return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
|
||||
#endif
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
From c9043a422fb4a5a6c72aaa1b907cea5f6a3061dd Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 9 Aug 2018 19:10:24 -0500
|
||||
Subject: [PATCH 1/4] sandbox/linux/bpf_dsl: Update syscall ranges for ppc64
|
||||
|
||||
---
|
||||
sandbox/linux/bpf_dsl/linux_syscall_ranges.h | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||
@@ -56,6 +56,13 @@
|
||||
#define MAX_PUBLIC_SYSCALL __NR_syscalls
|
||||
#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
|
||||
|
||||
+#elif defined(__powerpc64__)
|
||||
+
|
||||
+#include <asm/unistd.h>
|
||||
+#define MIN_SYSCALL 0u
|
||||
+#define MAX_PUBLIC_SYSCALL 386u
|
||||
+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
|
||||
+
|
||||
#else
|
||||
#error "Unsupported architecture"
|
||||
#endif
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From 7468b266532bd607eb1f5292d758256d800b2eee Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Fri, 10 Aug 2018 00:23:50 -0500
|
||||
Subject: [PATCH] services/service_manager/sandbox/linux: Fix TCGETS
|
||||
declaration on PPC64
|
||||
|
||||
---
|
||||
.../sandbox/linux/bpf_renderer_policy_linux.cc | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
+++ chromium-128.0.6613.113/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
@@ -15,6 +15,11 @@
|
||||
#include "sandbox/linux/system_headers/linux_syscalls.h"
|
||||
#include "sandbox/policy/linux/sandbox_linux.h"
|
||||
|
||||
+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
|
||||
+#ifdef __powerpc64__
|
||||
+#include <termios.h>
|
||||
+#endif
|
||||
+
|
||||
// TODO(vignatti): replace the local definitions below with #include
|
||||
// <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
|
||||
#include <linux/types.h>
|
||||
|
|
@ -1,20 +1,11 @@
|
|||
Description: fix swiftshader build issue on ppc64el
|
||||
Origin: vendor, https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/blob/chromium-131/patches/ppc64le/third_party/0001-swiftshader-fix-build.patch
|
||||
Bug: https://buildd.debian.org/status/fetch.php?pkg=chromium&arch=ppc64el&ver=131.0.6778.204-1&stamp=1734633529&raw=0
|
||||
Last-Update: 2024-12-20
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
Index: chromium-144.0.7559.59/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/swiftshader/third_party/llvm-16.0/BUILD.gn
|
||||
@@ -1599,6 +1599,9 @@ swiftshader_llvm_source_set("swiftshader
|
||||
--- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
|
||||
+++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
|
||||
@@ -1258,6 +1258,8 @@
|
||||
"llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp",
|
||||
"llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp",
|
||||
"llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp",
|
||||
+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
|
||||
+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
|
||||
+ "llvm/lib/MC/MCInstrInfo.cpp",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
|||
11
0001-third-party-hwy-wrong-include.patch
Normal file
11
0001-third-party-hwy-wrong-include.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/third_party/highway/src/hwy/targets.cc
|
||||
+++ b/third_party/highway/src/hwy/targets.cc
|
||||
@@ -35,7 +35,7 @@
|
||||
HWY_OS_LINUX
|
||||
// sys/auxv.h does not always include asm/hwcap.h, or define HWCAP*, hence we
|
||||
// still include this directly. See #1199.
|
||||
-#ifndef TOOLCHAIN_MISS_ASM_HWCAP_H
|
||||
+#if !defined(TOOLCHAIN_MISS_ASM_HWCAP_H) && !defined(HWY_ARCH_PPC)
|
||||
#include <asm/hwcap.h>
|
||||
#endif
|
||||
#if HWY_HAVE_AUXV
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/angle/src/libANGLE/Constants.h
|
||||
Index: chromium-128.0.6613.113/third_party/angle/src/libANGLE/Constants.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/angle/src/libANGLE/Constants.h
|
||||
+++ chromium-144.0.7559.59/third_party/angle/src/libANGLE/Constants.h
|
||||
--- chromium-128.0.6613.113.orig/third_party/angle/src/libANGLE/Constants.h
|
||||
+++ chromium-128.0.6613.113/third_party/angle/src/libANGLE/Constants.h
|
||||
@@ -9,6 +9,7 @@
|
||||
#ifndef LIBANGLE_CONSTANTS_H_
|
||||
#define LIBANGLE_CONSTANTS_H_
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ Subject: [PATCH] third_party/libvpx: Properly generate gni on ppc64
|
|||
third_party/libvpx/generate_gni.sh | 10 ++++++++++
|
||||
2 files changed, 12 insertions(+)
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
|
||||
Index: chromium-128.0.6613.113/third_party/libvpx/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
|
||||
@@ -297,6 +297,8 @@ if (current_cpu == "x86" || (current_cpu
|
||||
--- chromium-128.0.6613.113.orig/third_party/libvpx/BUILD.gn
|
||||
+++ chromium-128.0.6613.113/third_party/libvpx/BUILD.gn
|
||||
@@ -320,6 +320,8 @@ if (current_cpu == "x86" || (current_cpu
|
||||
} else if (current_cpu == "x64") {
|
||||
deps = [ ":libvpx_x86_64_headers" ]
|
||||
sources = libvpx_srcs_x86_64_avx512
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] third_party/pffft: Include altivec.h on ppc64 with SIMD
|
|||
third_party/pffft/src/pffft.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/pffft/src/pffft.c
|
||||
Index: chromium-128.0.6613.113/third_party/pffft/src/pffft.c
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/pffft/src/pffft.c
|
||||
+++ chromium-144.0.7559.59/third_party/pffft/src/pffft.c
|
||||
--- chromium-128.0.6613.113.orig/third_party/pffft/src/pffft.c
|
||||
+++ chromium-128.0.6613.113/third_party/pffft/src/pffft.c
|
||||
@@ -100,6 +100,7 @@
|
||||
Altivec support macros
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.S
|
||||
@@ -0,0 +1,3673 @@
|
||||
+// This file is generated from a similarly-named Perl script in the BoringSSL
|
||||
+// source tree. Do not edit by hand.
|
||||
|
|
@ -3676,10 +3676,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/aesp8-ppc-linux.
|
|||
+// See https://www.airs.ccom/blog/archives/518.
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linux.S
|
||||
@@ -0,0 +1,590 @@
|
||||
+// This file is generated from a similarly-named Perl script in the BoringSSL
|
||||
+// source tree. Do not edit by hand.
|
||||
|
|
@ -4271,11 +4271,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/bcm/ghashp8-ppc-linu
|
|||
+// See https://www.airs.ccom/blog/archives/518.
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/gen/sources.cmake
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.cmake
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
|
||||
@@ -122,6 +122,7 @@ set(
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/gen/sources.cmake
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/gen/sources.cmake
|
||||
@@ -120,6 +120,7 @@ set(
|
||||
gen/bcm/aesni-x86-linux.S
|
||||
gen/bcm/aesni-x86_64-apple.S
|
||||
gen/bcm/aesni-x86_64-linux.S
|
||||
|
|
@ -4283,7 +4283,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
|
|||
gen/bcm/aesv8-armv7-linux.S
|
||||
gen/bcm/aesv8-armv8-apple.S
|
||||
gen/bcm/aesv8-armv8-linux.S
|
||||
@@ -153,6 +154,7 @@ set(
|
||||
@@ -151,6 +152,7 @@ set(
|
||||
gen/bcm/ghash-x86-linux.S
|
||||
gen/bcm/ghash-x86_64-apple.S
|
||||
gen/bcm/ghash-x86_64-linux.S
|
||||
|
|
@ -4291,7 +4291,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
|
|||
gen/bcm/ghashv8-armv7-linux.S
|
||||
gen/bcm/ghashv8-armv8-apple.S
|
||||
gen/bcm/ghashv8-armv8-linux.S
|
||||
@@ -352,6 +354,7 @@ set(
|
||||
@@ -347,6 +349,7 @@ set(
|
||||
crypto/cpu_arm_freebsd.cc
|
||||
crypto/cpu_arm_linux.cc
|
||||
crypto/cpu_intel.cc
|
||||
|
|
@ -4299,7 +4299,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
|
|||
crypto/crypto.cc
|
||||
crypto/curve25519/curve25519.cc
|
||||
crypto/curve25519/curve25519_64_adx.cc
|
||||
@@ -2980,6 +2983,7 @@ set(
|
||||
@@ -2864,6 +2867,7 @@ set(
|
||||
gen/test_support/trampoline-armv8-apple.S
|
||||
gen/test_support/trampoline-armv8-linux.S
|
||||
gen/test_support/trampoline-armv8-win.S
|
||||
|
|
@ -4307,11 +4307,11 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.cmake
|
|||
gen/test_support/trampoline-x86-apple.S
|
||||
gen/test_support/trampoline-x86-linux.S
|
||||
gen/test_support/trampoline-x86_64-apple.S
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/gen/sources.json
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/boringssl/src/gen/sources.json
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
|
||||
@@ -100,6 +100,7 @@
|
||||
--- chromium-136.0.7103.48.orig/third_party/boringssl/src/gen/sources.json
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/gen/sources.json
|
||||
@@ -98,6 +98,7 @@
|
||||
"gen/bcm/aesni-x86-linux.S",
|
||||
"gen/bcm/aesni-x86_64-apple.S",
|
||||
"gen/bcm/aesni-x86_64-linux.S",
|
||||
|
|
@ -4319,7 +4319,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
|
|||
"gen/bcm/aesv8-armv7-linux.S",
|
||||
"gen/bcm/aesv8-armv8-apple.S",
|
||||
"gen/bcm/aesv8-armv8-linux.S",
|
||||
@@ -131,6 +132,7 @@
|
||||
@@ -129,6 +130,7 @@
|
||||
"gen/bcm/ghash-x86-linux.S",
|
||||
"gen/bcm/ghash-x86_64-apple.S",
|
||||
"gen/bcm/ghash-x86_64-linux.S",
|
||||
|
|
@ -4327,7 +4327,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
|
|||
"gen/bcm/ghashv8-armv7-linux.S",
|
||||
"gen/bcm/ghashv8-armv8-apple.S",
|
||||
"gen/bcm/ghashv8-armv8-linux.S",
|
||||
@@ -322,6 +324,7 @@
|
||||
@@ -317,6 +319,7 @@
|
||||
"crypto/cpu_arm_freebsd.cc",
|
||||
"crypto/cpu_arm_linux.cc",
|
||||
"crypto/cpu_intel.cc",
|
||||
|
|
@ -4335,7 +4335,7 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
|
|||
"crypto/crypto.cc",
|
||||
"crypto/curve25519/curve25519.cc",
|
||||
"crypto/curve25519/curve25519_64_adx.cc",
|
||||
@@ -2892,6 +2895,7 @@
|
||||
@@ -2784,6 +2787,7 @@
|
||||
"gen/test_support/trampoline-armv8-apple.S",
|
||||
"gen/test_support/trampoline-armv8-linux.S",
|
||||
"gen/test_support/trampoline-armv8-win.S",
|
||||
|
|
@ -4343,10 +4343,10 @@ Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/sources.json
|
|||
"gen/test_support/trampoline-x86-apple.S",
|
||||
"gen/test_support/trampoline-x86-linux.S",
|
||||
"gen/test_support/trampoline-x86_64-apple.S",
|
||||
Index: chromium-144.0.7559.59/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
|
||||
Index: chromium-136.0.7103.48/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
|
||||
+++ chromium-136.0.7103.48/third_party/boringssl/src/gen/test_support/trampoline-ppc-linux.S
|
||||
@@ -0,0 +1,1413 @@
|
||||
+// This file is generated from a similarly-named Perl script in the BoringSSL
|
||||
+// source tree. Do not edit by hand.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/v8/src/base/immediate-crash.h
|
||||
Index: chromium-128.0.6613.113/v8/src/base/immediate-crash.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/v8/src/base/immediate-crash.h
|
||||
+++ chromium-144.0.7559.59/v8/src/base/immediate-crash.h
|
||||
--- chromium-128.0.6613.113.orig/v8/src/base/immediate-crash.h
|
||||
+++ chromium-128.0.6613.113/v8/src/base/immediate-crash.h
|
||||
@@ -98,6 +98,13 @@
|
||||
#define TRAP_SEQUENCE1_() asm volatile(".2byte 0x0001");
|
||||
#define TRAP_SEQUENCE2_() asm volatile("")
|
||||
|
|
|
|||
21
0002-Include-cstddef-to-fix-build.patch
Normal file
21
0002-Include-cstddef-to-fix-build.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
From 82922bf486e9926a171152f61030dfcd53f017b8 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Pearson <tpearson@raptorengineering.com>
|
||||
Date: Thu, 30 Aug 2018 17:32:05 -0500
|
||||
Subject: [PATCH] Include cstddef to fix build
|
||||
|
||||
size_t is not defined unless cstddef is included.
|
||||
---
|
||||
third_party/crashpad/crashpad/compat/linux/sys/user.h | 1 +
|
||||
|
||||
Index: chromium-127.0.6533.72/third_party/crashpad/crashpad/compat/linux/sys/user.h
|
||||
===================================================================
|
||||
--- chromium-127.0.6533.72.orig/third_party/crashpad/crashpad/compat/linux/sys/user.h
|
||||
+++ chromium-127.0.6533.72/third_party/crashpad/crashpad/compat/linux/sys/user.h
|
||||
@@ -15,6 +15,7 @@
|
||||
#ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
|
||||
#define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
|
||||
|
||||
+#include <cstddef>
|
||||
#include_next <sys/user.h>
|
||||
|
||||
#include <features.h>
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,76 @@
|
|||
From 3c4705bfdda45feb860a1f121631773e5fe8e53f Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 9 Aug 2018 19:11:26 -0500
|
||||
Subject: [PATCH 1/4] sandbox/linux/bpf_dsl: Modify seccomp_macros to add
|
||||
support for ppc64
|
||||
|
||||
---
|
||||
sandbox/linux/bpf_dsl/seccomp_macros.h | 43 ++++++++++++++++++++++++++
|
||||
1 file changed, 43 insertions(+)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||
@@ -14,6 +14,9 @@
|
||||
#if defined(__mips__)
|
||||
// sys/user.h in eglibc misses size_t definition
|
||||
#include <stddef.h>
|
||||
+#elif defined(__powerpc64__)
|
||||
+// Manually define greg_t on ppc64
|
||||
+typedef unsigned long long greg_t;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -343,6 +346,51 @@ struct regs_struct {
|
||||
#define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
|
||||
#define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
|
||||
#define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
|
||||
+
|
||||
+#elif defined(__powerpc64__)
|
||||
+#include <asm/ptrace.h>
|
||||
+
|
||||
+typedef struct pt_regs regs_struct;
|
||||
+
|
||||
+#ifdef ARCH_CPU_LITTLE_ENDIAN
|
||||
+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
|
||||
+#else
|
||||
+#define SECCOMP_ARCH AUDIT_ARCH_PPC64
|
||||
+#endif
|
||||
+
|
||||
+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
|
||||
+
|
||||
+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
|
||||
+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
|
||||
+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
|
||||
+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
|
||||
+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
|
||||
+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
|
||||
+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
|
||||
+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
|
||||
+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
|
||||
+
|
||||
+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
|
||||
+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
|
||||
+#define SECCOMP_IP_MSB_IDX \
|
||||
+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
|
||||
+#define SECCOMP_IP_LSB_IDX \
|
||||
+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
|
||||
+#define SECCOMP_ARG_MSB_IDX(nr) \
|
||||
+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
|
||||
+#define SECCOMP_ARG_LSB_IDX(nr) \
|
||||
+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
|
||||
+
|
||||
+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
|
||||
+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
|
||||
+#define SECCOMP_PT_IP(_regs) (_regs).nip
|
||||
+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
|
||||
+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
|
||||
+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
|
||||
+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
|
||||
+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
|
||||
+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
|
||||
+
|
||||
#else
|
||||
#error Unsupported target platform
|
||||
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
||||
Index: chromium-136.0.7103.48/third_party/lss/linux_syscall_support.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/lss/linux_syscall_support.h
|
||||
+++ chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/lss/linux_syscall_support.h
|
||||
+++ chromium-136.0.7103.48/third_party/lss/linux_syscall_support.h
|
||||
@@ -86,7 +86,7 @@
|
||||
* Porting to other related platforms should not be difficult.
|
||||
*/
|
||||
|
|
@ -11,7 +11,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
defined(__aarch64__) || defined(__s390__) || defined(__e2k__) || \
|
||||
(defined(__riscv) && __riscv_xlen == 64) || defined(__loongarch_lp64)) \
|
||||
&& (defined(__linux) || defined(__ANDROID__))
|
||||
@@ -400,7 +400,7 @@ struct kernel_stat64 {
|
||||
@@ -398,7 +398,7 @@ struct kernel_stat64 {
|
||||
unsigned __pad2;
|
||||
unsigned long long st_blocks;
|
||||
};
|
||||
|
|
@ -20,7 +20,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
struct kernel_stat64 {
|
||||
unsigned long long st_dev;
|
||||
unsigned long long st_ino;
|
||||
@@ -422,6 +422,28 @@ struct kernel_stat64 {
|
||||
@@ -420,6 +420,28 @@ struct kernel_stat64 {
|
||||
unsigned long __unused4;
|
||||
unsigned long __unused5;
|
||||
};
|
||||
|
|
@ -49,7 +49,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
#elif defined(__e2k__)
|
||||
struct kernel_stat64 {
|
||||
unsigned long long st_dev;
|
||||
@@ -538,7 +560,7 @@ struct kernel_stat {
|
||||
@@ -536,7 +558,7 @@ struct kernel_stat {
|
||||
uint64_t st_ctime_nsec_;
|
||||
int64_t __unused4[3];
|
||||
};
|
||||
|
|
@ -58,7 +58,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
typedef unsigned long kernel_blkcnt_t;
|
||||
typedef unsigned long kernel_blksize_t;
|
||||
typedef unsigned kernel_dev_t;
|
||||
@@ -569,6 +591,37 @@ struct kernel_stat {
|
||||
@@ -567,6 +589,37 @@ struct kernel_stat {
|
||||
unsigned long __unused4;
|
||||
unsigned long __unused5;
|
||||
};
|
||||
|
|
@ -96,7 +96,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
#elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64)
|
||||
typedef int kernel_blkcnt_t;
|
||||
typedef int kernel_blksize_t;
|
||||
@@ -1825,6 +1878,28 @@ struct kernel_statx {
|
||||
@@ -1823,6 +1876,28 @@ struct kernel_statx {
|
||||
#ifndef __NR_getcpu
|
||||
#define __NR_getcpu 302
|
||||
#endif
|
||||
|
|
@ -125,7 +125,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
/* End of powerpc definitions */
|
||||
#elif defined(__s390__)
|
||||
#ifndef __NR_quotactl
|
||||
@@ -4826,7 +4901,7 @@ struct kernel_statx {
|
||||
@@ -4824,7 +4899,7 @@ struct kernel_statx {
|
||||
LSS_INLINE _syscall6(void*, mmap, void*, addr, size_t, length, int, prot,
|
||||
int, flags, int, fd, int64_t, offset)
|
||||
#endif
|
||||
|
|
@ -134,7 +134,7 @@ Index: chromium-144.0.7559.59/third_party/lss/linux_syscall_support.h
|
|||
#undef LSS_SC_LOADARGS_0
|
||||
#define LSS_SC_LOADARGS_0(dummy...)
|
||||
#undef LSS_SC_LOADARGS_1
|
||||
@@ -5216,7 +5291,11 @@ struct kernel_statx {
|
||||
@@ -5214,7 +5289,11 @@ struct kernel_statx {
|
||||
#endif
|
||||
|
||||
#if !defined(__NR_pipe)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
From cca78240860abb63bbcfe94d1e5f04a1f23c527d Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 9 Aug 2018 19:11:56 -0500
|
||||
Subject: [PATCH 3/4] sandbox/linux/system_headers: Update linux seccomp header
|
||||
for ppc64
|
||||
|
||||
---
|
||||
sandbox/linux/system_headers/linux_seccomp.h | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_seccomp.h
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_seccomp.h
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_seccomp.h
|
||||
@@ -38,6 +38,9 @@
|
||||
#ifndef EM_AARCH64
|
||||
#define EM_AARCH64 183
|
||||
#endif
|
||||
+#ifndef EM_PPC64
|
||||
+#define EM_PPC64 21
|
||||
+#endif
|
||||
|
||||
#ifndef __AUDIT_ARCH_64BIT
|
||||
#define __AUDIT_ARCH_64BIT 0x80000000
|
||||
@@ -70,6 +73,12 @@
|
||||
#ifndef AUDIT_ARCH_AARCH64
|
||||
#define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
|
||||
#endif
|
||||
+#ifndef AUDIT_ARCH_PPC64
|
||||
+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
|
||||
+#endif
|
||||
+#ifndef AUDIT_ARCH_PPC64LE
|
||||
+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
|
||||
+#endif
|
||||
|
||||
// For prctl.h
|
||||
#ifndef PR_SET_SECCOMP
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
|
||||
@@ -0,0 +1,316 @@
|
||||
+// This file is generated. Do not edit.
|
||||
+#ifndef VP8_RTCD_H_
|
||||
|
|
@ -319,10 +319,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp8_r
|
|||
+#endif
|
||||
+
|
||||
+#endif
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
|
||||
@@ -0,0 +1,267 @@
|
||||
+// This file is generated. Do not edit.
|
||||
+#ifndef VP9_RTCD_H_
|
||||
|
|
@ -591,10 +591,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vp9_r
|
|||
+#endif
|
||||
+
|
||||
+#endif
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
|
||||
@@ -0,0 +1,107 @@
|
||||
+@ This file was created from a .asm file
|
||||
+@ using the ads2gas.pl script.
|
||||
|
|
@ -703,10 +703,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
|
|||
+.equ DECODE_WIDTH_LIMIT , 16384
|
||||
+.equ DECODE_HEIGHT_LIMIT , 16384
|
||||
+ .section .note.GNU-stack,"",%progbits
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
|
||||
+/* */
|
||||
|
|
@ -718,10 +718,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
|
|||
+#include "vpx/vpx_codec.h"
|
||||
+static const char* const cfg = "--target=generic-gnu --enable-vp9-highbitdepth --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv";
|
||||
+const char *vpx_codec_build_config(void) {return cfg;}
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
|
||||
@@ -0,0 +1,116 @@
|
||||
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
|
||||
+/* */
|
||||
|
|
@ -839,10 +839,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_c
|
|||
+#define DECODE_WIDTH_LIMIT 16384
|
||||
+#define DECODE_HEIGHT_LIMIT 16384
|
||||
+#endif /* VPX_CONFIG_H */
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
|
||||
@@ -0,0 +1,4128 @@
|
||||
+// This file is generated. Do not edit.
|
||||
+#ifndef VPX_DSP_RTCD_H_
|
||||
|
|
@ -4972,10 +4972,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_d
|
|||
+#endif
|
||||
+
|
||||
+#endif
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
|
||||
@@ -0,0 +1,96 @@
|
||||
+// This file is generated. Do not edit.
|
||||
+#ifndef VPX_SCALE_RTCD_H_
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
From 298df3dc44f7121cd8cb9a06b29fa3b16c959b8d Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 9 Aug 2018 19:13:25 -0500
|
||||
Subject: [PATCH 4/4] sandbox/linux/system_headers: Update linux signal header
|
||||
for ppc64
|
||||
|
||||
---
|
||||
sandbox/linux/system_headers/linux_signal.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_signal.h
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_signal.h
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_signal.h
|
||||
@@ -13,7 +13,7 @@
|
||||
// (not undefined, but defined different values and in different memory
|
||||
// layouts). So, fill the gap here.
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
|
||||
#define LINUX_SIGHUP 1
|
||||
#define LINUX_SIGINT 2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
+++ chromium-144.0.7559.59/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||
@@ -239,6 +239,12 @@ std::string UserAgent() {
|
||||
#endif
|
||||
#elif defined (ARCH_CPU_RISCV64)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||
--- chromium-136.0.7103.48.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||
@@ -38,6 +38,28 @@ static INLINE int16x8_t vec_max_across(i
|
||||
return vec_max(a, vec_perm(a, a, vec_perm16));
|
||||
}
|
||||
|
|
@ -137,10 +137,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vp9/encoder/ppc/v
|
|||
|
||||
eob = vec_max(eob, vec_or(scan0, zero_coeff0));
|
||||
eob2 = vec_max(vec_or(scan1, zero_coeff1), vec_or(scan2, zero_coeff2));
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||
--- chromium-136.0.7103.48.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||
@@ -15,6 +15,28 @@
|
||||
#include "vpx_dsp/ppc/txfm_common_vsx.h"
|
||||
#include "vpx_dsp/ppc/types_vsx.h"
|
||||
|
|
@ -255,10 +255,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct3
|
|||
}
|
||||
|
||||
// Returns 1 if negative 0 if positive
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||
--- chromium-136.0.7103.48.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||
@@ -13,6 +13,28 @@
|
||||
#include "./vpx_dsp_rtcd.h"
|
||||
#include "vpx_dsp/ppc/types_vsx.h"
|
||||
|
|
|
|||
107
0005-sandbox-linux-seccomp-bpf-Add-ppc64-syscall-stub.patch
Normal file
107
0005-sandbox-linux-seccomp-bpf-Add-ppc64-syscall-stub.patch
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
From 1d44643a7c7cf650efd1093d22cd5bf859fdcb51 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 9 Aug 2018 20:52:13 -0500
|
||||
Subject: [PATCH] sandbox/linux/seccomp-bpf: Add ppc64 syscall stub
|
||||
|
||||
---
|
||||
sandbox/linux/seccomp-bpf/syscall.cc | 53 ++++++++++++++++++++++++++--
|
||||
1 file changed, 51 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/syscall.cc
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf/syscall.cc
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/syscall.cc
|
||||
@@ -23,7 +23,7 @@ namespace sandbox {
|
||||
namespace {
|
||||
|
||||
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||
- defined(ARCH_CPU_MIPS_FAMILY)
|
||||
+ defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
|
||||
// Number that's not currently used by any Linux kernel ABIs.
|
||||
const int kInvalidSyscallNumber = 0x351d3;
|
||||
#else
|
||||
@@ -313,10 +313,54 @@ asm(// We need to be able to tell the ke
|
||||
"2:ret\n"
|
||||
".cfi_endproc\n"
|
||||
".size SyscallAsm, .-SyscallAsm\n"
|
||||
+#elif defined(__powerpc64__)
|
||||
+ ".text\n"
|
||||
+ ".align 4\n"
|
||||
+ ".type SyscallAsm @function\n"
|
||||
+ "SyscallAsm:\n"
|
||||
+ ".cfi_startproc\n"
|
||||
+
|
||||
+ // Check if r3 is negative
|
||||
+ "cmpdi 3, 0\n"
|
||||
+ "bgt 2f\n"
|
||||
+
|
||||
+ // Load address of 3f into r3 and return
|
||||
+ "mflr 10\n"
|
||||
+ "bl 1f\n"
|
||||
+ "1: mflr 3\n"
|
||||
+ "mtlr 10\n"
|
||||
+ "addi 3, 3, 4*13\n"
|
||||
+ "blr\n"
|
||||
+
|
||||
+ // Load arguments from array into r3-8
|
||||
+ // save param 3 in r10
|
||||
+ "2:\n"
|
||||
+ "mr 0, 3\n"
|
||||
+ "ld 3, 0(4)\n"
|
||||
+ "ld 5, 16(4)\n"
|
||||
+ "ld 6, 24(4)\n"
|
||||
+ "ld 7, 32(4)\n"
|
||||
+ "ld 8, 40(4)\n"
|
||||
+ "ld 4, 8(4)\n"
|
||||
+ "li 9, 0\n"
|
||||
+
|
||||
+ // Enter kernel
|
||||
+ "sc\n"
|
||||
+
|
||||
+ // Magic return address
|
||||
+ "3:\n"
|
||||
+ // Like MIPS, ppc64 return values are always positive.
|
||||
+ // Check for error in cr0.SO and negate upon error
|
||||
+ "bc 4, 3, 4f\n"
|
||||
+ "neg 3, 3\n"
|
||||
+ "4: blr\n"
|
||||
+
|
||||
+ ".cfi_endproc\n"
|
||||
+ ".size SyscallAsm, .-SyscallAsm\n"
|
||||
#endif
|
||||
); // asm
|
||||
|
||||
-#if defined(__x86_64__)
|
||||
+#if defined(__x86_64__) || defined(__powerpc64__)
|
||||
extern "C" {
|
||||
intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
|
||||
}
|
||||
@@ -430,6 +474,8 @@ intptr_t Syscall::Call(int nr,
|
||||
ret = inout;
|
||||
}
|
||||
|
||||
+#elif defined(__powerpc64__)
|
||||
+ intptr_t ret = SyscallAsm(nr, args);
|
||||
#else
|
||||
#error "Unimplemented architecture"
|
||||
#endif
|
||||
@@ -446,8 +492,18 @@ void Syscall::PutValueInUcontext(intptr_
|
||||
// needs to be changed back.
|
||||
ret_val = -ret_val;
|
||||
SECCOMP_PARM4(ctx) = 1;
|
||||
- } else
|
||||
+ } else {
|
||||
SECCOMP_PARM4(ctx) = 0;
|
||||
+ }
|
||||
+#endif
|
||||
+#if defined(__powerpc64__)
|
||||
+ // Same as MIPS, need to invert ret and set error register (cr0.SO)
|
||||
+ if (ret_val <= -1 && ret_val >= -4095) {
|
||||
+ ret_val = -ret_val;
|
||||
+ ctx->uc_mcontext.regs->ccr |= (1 << 28);
|
||||
+ } else {
|
||||
+ ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
|
||||
+ }
|
||||
#endif
|
||||
SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
|
||||
}
|
||||
24
0005-sandbox-linux-update-unit-test-for-ppc64.patch
Normal file
24
0005-sandbox-linux-update-unit-test-for-ppc64.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From 6a852c4135864ba87b3cbdd0880d7cfecf7cd654 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||
Date: Thu, 13 Sep 2018 15:12:22 -0500
|
||||
Subject: [PATCH 5/6] sandbox/linux: update unit test for ppc64
|
||||
|
||||
---
|
||||
sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
|
||||
@@ -350,8 +350,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
|
||||
|
||||
#if !defined(__aarch64__)
|
||||
TEST_BASELINE_SIGSYS(__NR_inotify_init)
|
||||
+#if !defined(__powerpc64__)
|
||||
TEST_BASELINE_SIGSYS(__NR_vserver)
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
|
||||
14
0006-sandbox-linux-disable-timedwait-time64-ppc64.patch
Normal file
14
0006-sandbox-linux-disable-timedwait-time64-ppc64.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
@@ -374,7 +374,9 @@ bool SyscallSets::IsAllowedSignalHandlin
|
||||
#if defined(__i386__) || defined(__arm__) || \
|
||||
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||
defined(__powerpc64__)
|
||||
+#if !defined(__powerpc64__)
|
||||
case __NR_rt_sigtimedwait_time64:
|
||||
+#endif
|
||||
case __NR_sigaction:
|
||||
case __NR_sigprocmask:
|
||||
case __NR_sigreturn:
|
||||
33
0007-sandbox-linux-add-ppc64-stat.patch
Normal file
33
0007-sandbox-linux-add-ppc64-stat.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_stat.h
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_stat.h
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_stat.h
|
||||
@@ -173,6 +173,28 @@ struct kernel_stat {
|
||||
unsigned int __unused4;
|
||||
unsigned int __unused5;
|
||||
};
|
||||
+#elif defined(__powerpc64__)
|
||||
+struct kernel_stat {
|
||||
+ unsigned long st_dev;
|
||||
+ ino_t st_ino;
|
||||
+ unsigned long st_nlink;
|
||||
+ mode_t st_mode;
|
||||
+ uid_t st_uid;
|
||||
+ gid_t st_gid;
|
||||
+ unsigned long st_rdev;
|
||||
+ long st_size;
|
||||
+ unsigned long st_blksize;
|
||||
+ unsigned long st_blocks;
|
||||
+ // unsigned long st_atime;
|
||||
+ unsigned long st_atime_nsec;
|
||||
+ //unsigned long st_mtime;
|
||||
+ unsigned long st_mtime_nsec;
|
||||
+ //unsigned long st_ctime;
|
||||
+ unsigned long st_ctime_nsec;
|
||||
+ unsigned long __unused4;
|
||||
+ unsigned long __unused5;
|
||||
+ unsigned long __unused6;
|
||||
+};
|
||||
#endif
|
||||
|
||||
#if !defined(AT_EMPTY_PATH)
|
||||
90
0008-sandbox-fix-ppc64le-glibc234.patch
Normal file
90
0008-sandbox-fix-ppc64le-glibc234.patch
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
Index: chromium-134.0.6998.35/sandbox/policy/linux/bpf_utility_policy_linux.cc
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
|
||||
+++ chromium-134.0.6998.35/sandbox/policy/linux/bpf_utility_policy_linux.cc
|
||||
@@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat
|
||||
case __NR_fdatasync:
|
||||
case __NR_fsync:
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_getrlimit:
|
||||
#endif
|
||||
#if defined(__i386__) || defined(__arm__)
|
||||
Index: chromium-134.0.6998.35/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
+++ chromium-134.0.6998.35/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||
@@ -90,7 +90,7 @@ ResultExpr RendererProcessPolicy::Evalua
|
||||
case __NR_ftruncate64:
|
||||
#endif
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||
- defined(__aarch64__)
|
||||
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||
case __NR_getrlimit:
|
||||
case __NR_setrlimit:
|
||||
// We allow setrlimit to dynamically adjust the address space limit as
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||
@@ -58,9 +58,9 @@
|
||||
|
||||
#elif defined(__powerpc64__)
|
||||
|
||||
-#include <asm/unistd.h>
|
||||
+#include <asm-generic/unistd.h>
|
||||
#define MIN_SYSCALL 0u
|
||||
-#define MAX_PUBLIC_SYSCALL 386u
|
||||
+#define MAX_PUBLIC_SYSCALL __NR_syscalls
|
||||
#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
|
||||
|
||||
#else
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/services/credentials.cc
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/linux/services/credentials.cc
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/services/credentials.cc
|
||||
@@ -96,7 +96,8 @@ bool ChrootToSafeEmptyDir() {
|
||||
|
||||
int clone_flags = CLONE_FS | LINUX_SIGCHLD;
|
||||
void* tls = nullptr;
|
||||
-#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
|
||||
+#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||
+ defined(ARCH_CPU_PPC64_FAMILY)) && \
|
||||
!defined(MEMORY_SANITIZER)
|
||||
// Use CLONE_VM | CLONE_VFORK as an optimization to avoid copying page tables.
|
||||
// Since clone writes to the new child's TLS before returning, we must set a
|
||||
@@ -104,6 +105,11 @@ bool ChrootToSafeEmptyDir() {
|
||||
// glibc performs syscalls by calling a function pointer in TLS, so we do not
|
||||
// attempt this optimization.
|
||||
// TODO(crbug.com/40196869) Broken in MSan builds after LLVM f1bb30a4956f.
|
||||
+ //
|
||||
+ // NOTE: Without CLONE_VM, fontconfig will attempt to reload configuration
|
||||
+ // in every thread. Since the rendered threads are sandboxed without
|
||||
+ // filesystem access (e.g. to /etc/fonts/fonts.conf) this will cause font
|
||||
+ // configuration loading failures and no fonts will be displayed!
|
||||
clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
|
||||
|
||||
char tls_buf[PTHREAD_STACK_MIN_CONST] = {};
|
||||
Index: chromium-134.0.6998.35/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||
===================================================================
|
||||
--- chromium-134.0.6998.35.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||
+++ chromium-134.0.6998.35/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||
@@ -362,7 +362,16 @@ intptr_t SIGSYSFstatatHandler(const stru
|
||||
if (args.nr == __NR_fstatat_default) {
|
||||
if (*reinterpret_cast<const char*>(args.args[1]) == '\0' &&
|
||||
args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
|
||||
- return syscall(__NR_fstat_default, static_cast<int>(args.args[0]),
|
||||
+ int fd = static_cast<int>(args.args[0]);
|
||||
+#if defined(__powerpc64__)
|
||||
+ // On ppc64+glibc, some syscalls seem to accidentally negate the first
|
||||
+ // parameter which causes checks against it to fail. For now, manually
|
||||
+ // negate them back.
|
||||
+ // TODO: Investigate the root cause and fix in glibc
|
||||
+ if (fd < 0)
|
||||
+ fd = -fd;
|
||||
+#endif
|
||||
+ return syscall(__NR_fstat_default, fd,
|
||||
reinterpret_cast<default_stat_struct*>(args.args[2]));
|
||||
}
|
||||
return -reinterpret_cast<intptr_t>(fs_denied_errno);
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/base/compiler_specific.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/compiler_specific.h
|
||||
+++ chromium-144.0.7559.59/base/compiler_specific.h
|
||||
@@ -198,7 +198,7 @@
|
||||
diff -up chromium-131.0.6778.69/base/compiler_specific.h.me chromium-131.0.6778.69/base/compiler_specific.h
|
||||
--- chromium-131.0.6778.69/base/compiler_specific.h.me 2024-11-19 20:44:12.404060581 +0100
|
||||
+++ chromium-131.0.6778.69/base/compiler_specific.h 2024-11-19 20:44:54.434121935 +0100
|
||||
@@ -152,7 +152,7 @@
|
||||
// MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called.
|
||||
// }
|
||||
// ```
|
||||
|
|
@ -11,3 +10,15 @@ Index: chromium-144.0.7559.59/base/compiler_specific.h
|
|||
#define MUSTTAIL [[clang::musttail]]
|
||||
#else
|
||||
#define MUSTTAIL
|
||||
diff -up chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.me chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
|
||||
--- chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.me 2024-11-20 18:50:28.690761262 +0100
|
||||
+++ chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h 2024-11-20 18:54:49.374711202 +0100
|
||||
@@ -138,7 +138,7 @@
|
||||
// PA_MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called.
|
||||
// }
|
||||
// ```
|
||||
-#if PA_HAS_CPP_ATTRIBUTE(clang::musttail)
|
||||
+#if PA_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc64__)
|
||||
#define PA_MUSTTAIL [[clang::musttail]]
|
||||
#else
|
||||
#define PA_MUSTTAIL
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
|
||||
+++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
|
||||
@@ -139,7 +139,7 @@
|
||||
// PA_MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called.
|
||||
// }
|
||||
// ```
|
||||
-#if PA_HAS_CPP_ATTRIBUTE(clang::musttail)
|
||||
+#if PA_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc64__)
|
||||
#define PA_MUSTTAIL [[clang::musttail]]
|
||||
#else
|
||||
#define PA_MUSTTAIL
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
Index: chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/generate_gni.sh
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/generate_gni.sh
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh
|
||||
@@ -429,7 +429,7 @@ gen_config_files linux/mipsel "--target=
|
||||
--- chromium-136.0.7103.48.orig/third_party/libvpx/generate_gni.sh
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/generate_gni.sh
|
||||
@@ -433,7 +433,7 @@ gen_config_files linux/mipsel "--target=
|
||||
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
|
||||
gen_config_files linux/loongarch \
|
||||
"--target=loongarch64-linux-gcc ${all_platforms}"
|
||||
|
|
@ -11,10 +11,10 @@ Index: chromium-144.0.7559.59/third_party/libvpx/generate_gni.sh
|
|||
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
|
||||
gen_config_files win/arm64-highbd \
|
||||
"--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD} ${disable_sve}"
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||
--- chromium-136.0.7103.48.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||
@@ -527,8 +527,9 @@ if ($opts{arch} eq 'x86') {
|
||||
}
|
||||
arm;
|
||||
|
|
@ -27,11 +27,11 @@ Index: chromium-144.0.7559.59/third_party/libvpx/source/libvpx/build/make/rtcd.p
|
|||
} elsif ($opts{arch} =~ /loongarch/ ) {
|
||||
@ALL_ARCHS = filter(qw/lsx lasx/);
|
||||
loongarch;
|
||||
Index: chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
|
||||
Index: chromium-136.0.7103.48/third_party/libvpx/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/libvpx/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/libvpx/BUILD.gn
|
||||
@@ -98,6 +98,14 @@ config("libvpx_config") {
|
||||
--- chromium-136.0.7103.48.orig/third_party/libvpx/BUILD.gn
|
||||
+++ chromium-136.0.7103.48/third_party/libvpx/BUILD.gn
|
||||
@@ -102,6 +102,14 @@ config("libvpx_config") {
|
||||
"-Wno-sign-compare",
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/third_party/webrtc/rtc_base/system/arch.h
|
||||
Index: chromium-128.0.6613.113/third_party/webrtc/rtc_base/system/arch.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/webrtc/rtc_base/system/arch.h
|
||||
+++ chromium-144.0.7559.59/third_party/webrtc/rtc_base/system/arch.h
|
||||
--- chromium-128.0.6613.113.orig/third_party/webrtc/rtc_base/system/arch.h
|
||||
+++ chromium-128.0.6613.113/third_party/webrtc/rtc_base/system/arch.h
|
||||
@@ -46,6 +46,18 @@
|
||||
#endif
|
||||
#if defined(__MIPSEL__)
|
||||
|
|
|
|||
11
Sandbox-linux-services-credentials.cc-PPC.patch
Normal file
11
Sandbox-linux-services-credentials.cc-PPC.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/sandbox/linux/services/credentials.cc
|
||||
+++ b/sandbox/linux/services/credentials.cc
|
||||
@@ -91,7 +91,7 @@ bool ChrootToSafeEmptyDir() {
|
||||
alignas(16) char stack_buf[PTHREAD_STACK_MIN];
|
||||
|
||||
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||
- defined(ARCH_CPU_MIPS_FAMILY)
|
||||
+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
|
||||
// The stack grows downward.
|
||||
void* stack = stack_buf + sizeof(stack_buf);
|
||||
#else
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
Index: chromium-144.0.7559.59/base/system/sys_info.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/system/sys_info.cc
|
||||
+++ chromium-144.0.7559.59/base/system/sys_info.cc
|
||||
@@ -263,6 +263,8 @@ std::string SysInfo::ProcessCPUArchitect
|
||||
--- a/base/system/sys_info.cc
|
||||
+++ b/base/system/sys_info.cc
|
||||
@@ -255,6 +255,8 @@
|
||||
return "ARM";
|
||||
#elif defined(ARCH_CPU_ARM64)
|
||||
return "ARM_64";
|
||||
|
|
|
|||
|
|
@ -1,26 +1,35 @@
|
|||
Index: chromium-144.0.7559.59/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
Index: chromium-128.0.6613.113/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
+++ chromium-144.0.7559.59/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
@@ -383,6 +383,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
|
||||
--- chromium-128.0.6613.113.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
+++ chromium-128.0.6613.113/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||
@@ -303,6 +303,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
|
||||
info->arch = extensions::api::runtime::PlatformArch::kMips;
|
||||
} else if (strcmp(arch, "mips64el") == 0) {
|
||||
info->arch = extensions::api::runtime::PlatformArch::kMips64;
|
||||
} else if (arch == "riscv64") {
|
||||
info->arch = extensions::api::runtime::PlatformArch::kRiscv64;
|
||||
+ } else if (arch == "ppc64") {
|
||||
+ } else if (strcmp(arch, "ppc64") == 0) {
|
||||
+ info->arch = extensions::api::runtime::PlatformArch::kPpc64;
|
||||
} else {
|
||||
NOTREACHED();
|
||||
}
|
||||
Index: chromium-144.0.7559.59/extensions/common/api/runtime.json
|
||||
NOTREACHED_IN_MIGRATION();
|
||||
return false;
|
||||
@@ -319,6 +321,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
|
||||
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kMips;
|
||||
} else if (strcmp(nacl_arch, "mips64") == 0) {
|
||||
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kMips64;
|
||||
+ } else if (strcmp(nacl_arch, "ppc64") == 0) {
|
||||
+ info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kPpc64;
|
||||
} else {
|
||||
NOTREACHED_IN_MIGRATION();
|
||||
return false;
|
||||
Index: chromium-128.0.6613.113/extensions/common/api/runtime.json
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/extensions/common/api/runtime.json
|
||||
+++ chromium-144.0.7559.59/extensions/common/api/runtime.json
|
||||
--- chromium-128.0.6613.113.orig/extensions/common/api/runtime.json
|
||||
+++ chromium-128.0.6613.113/extensions/common/api/runtime.json
|
||||
@@ -98,7 +98,8 @@
|
||||
{"name": "x86-32", "description": "Specifies the processer architecture as x86-32."},
|
||||
{"name": "x86-64", "description": "Specifies the processer architecture as x86-64."},
|
||||
{"name": "mips", "description": "Specifies the processer architecture as mips."},
|
||||
{"name": "mips64", "description": "Specifies the processer architecture as mips64."},
|
||||
- {"name": "riscv64", "description": "Specifies the processer architecture as riscv64."}
|
||||
+ {"name": "riscv64", "description": "Specifies the processer architecture as riscv64."},
|
||||
- {"name": "mips64", "description": "Specifies the processer architecture as mips64."}
|
||||
+ {"name": "mips64", "description": "Specifies the processer architecture as mips64."},
|
||||
+ {"name": "ppc64", "description": "Specifies the processer architecture as ppc64."}
|
||||
],
|
||||
"description": "The machine's processor architecture."
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
Index: chromium-144.0.7559.59/base/process/launch.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/process/launch.h
|
||||
+++ chromium-144.0.7559.59/base/process/launch.h
|
||||
@@ -58,6 +58,9 @@ enum TerminationStatus : int;
|
||||
#if defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_LOONGARCH64)
|
||||
--- a/base/process/launch.h
|
||||
+++ b/base/process/launch.h
|
||||
@@ -54,6 +54,9 @@
|
||||
#if defined(ARCH_CPU_ARM64)
|
||||
#define PTHREAD_STACK_MIN_CONST \
|
||||
(__builtin_constant_p(PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : 131072)
|
||||
+#elif defined(ARCH_CPU_PPC64)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
Fix FTBFS on EL9 due to old ffmpeg-5.x
|
||||
|
||||
diff -up chromium-142.0.7444.59/media/filters/legacy_audio_file_reader.cc.me chromium-142.0.7444.59/media/filters/legacy_audio_file_reader.cc
|
||||
--- chromium-142.0.7444.59/media/filters/legacy_audio_file_reader.cc.me 2025-11-02 08:20:16.949092776 +0100
|
||||
+++ chromium-142.0.7444.59/media/filters/legacy_audio_file_reader.cc 2025-11-02 08:22:01.331132435 +0100
|
||||
@@ -273,10 +273,10 @@ bool LegacyAudioFileReader::OnNewFrame(
|
||||
diff -up chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me chromium-107.0.5304.121/media/filters/audio_file_reader.cc
|
||||
--- chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me 2022-12-17 08:27:12.204753071 +0100
|
||||
+++ chromium-107.0.5304.121/media/filters/audio_file_reader.cc 2022-12-17 08:28:40.908211808 +0100
|
||||
@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
|
||||
// silence from being output. In the case where we are also discarding some
|
||||
// portion of the packet (as indicated by a negative pts), we further want to
|
||||
// adjust the duration downward by however much exists before zero.
|
||||
- if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
|
||||
+ if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
|
||||
const base::TimeDelta pkt_duration = ConvertFromTimeBase(
|
||||
UNSAFE_TODO(glue_->format_context()->streams[stream_index_])->time_base,
|
||||
glue_->format_context()->streams[stream_index_]->time_base,
|
||||
- frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
|
||||
+ frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
|
||||
const base::TimeDelta frame_duration =
|
||||
34
chromium-121-system-old-ffmpeg.patch
Normal file
34
chromium-121-system-old-ffmpeg.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
diff -up chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc.me chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc
|
||||
--- chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc.me 2024-01-16 10:54:38.994173911 +0100
|
||||
+++ chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc 2024-01-16 11:06:20.974160612 +0100
|
||||
@@ -710,8 +710,13 @@ bool AVStreamToVideoDecoderConfig(const
|
||||
}
|
||||
|
||||
VideoTransformation video_transformation = VideoTransformation();
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ for (int i = 0; i < stream->nb_side_data; i++) {
|
||||
+ const auto& side_data = stream->side_data[i];
|
||||
+#else
|
||||
for (int i = 0; i < stream->codecpar->nb_coded_side_data; ++i) {
|
||||
const auto& side_data = stream->codecpar->coded_side_data[i];
|
||||
+#endif
|
||||
switch (side_data.type) {
|
||||
case AV_PKT_DATA_DISPLAYMATRIX: {
|
||||
CHECK_EQ(side_data.size, sizeof(int32_t) * 3 * 3);
|
||||
diff -up chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc.me chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc
|
||||
--- chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc.me 2024-01-16 11:12:27.521534151 +0100
|
||||
+++ chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc 2024-01-16 11:15:08.717337026 +0100
|
||||
@@ -113,8 +113,13 @@ bool AudioVideoMetadataExtractor::Extrac
|
||||
if (!stream)
|
||||
continue;
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ for (int j = 0; j < stream->nb_side_data; j++) {
|
||||
+ const AVPacketSideData& sd = stream->side_data[j];
|
||||
+#else
|
||||
for (int j = 0; j < stream->codecpar->nb_coded_side_data; j++) {
|
||||
const AVPacketSideData& sd = stream->codecpar->coded_side_data[j];
|
||||
+#endif
|
||||
if (sd.type == AV_PKT_DATA_DISPLAYMATRIX) {
|
||||
CHECK_EQ(sd.size, sizeof(int32_t) * 3 * 3);
|
||||
rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
||||
105
chromium-125-ffmpeg-5.x-reordered_opaque.patch
Normal file
105
chromium-125-ffmpeg-5.x-reordered_opaque.patch
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
commit 62274859104bd828373ae406aa9309e610449ac5
|
||||
Author: Ted Meyer <tmathmeyer@chromium.org>
|
||||
Date: Fri Mar 22 19:56:55 2024 +0000
|
||||
|
||||
Replace deprecated use of AVCodecContext::reordered_opaque
|
||||
|
||||
We can use the AV_CODEC_FLAG_COPY_OPAQUE flag on the codec context
|
||||
now to trigger timestamp propagation.
|
||||
|
||||
Bug: 330573128
|
||||
Change-Id: I6bc57241a35ab5283742aad8d42acb4dc5e85858
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384308
|
||||
Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
|
||||
Reviewed-by: Dan Sanders <sandersd@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1277051}
|
||||
|
||||
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
|
||||
index bd75477feeabb..8a658a58caac5 100644
|
||||
--- a/media/filters/ffmpeg_video_decoder.cc
|
||||
+++ b/media/filters/ffmpeg_video_decoder.cc
|
||||
@@ -134,7 +134,7 @@ bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
|
||||
}
|
||||
|
||||
FFmpegVideoDecoder::FFmpegVideoDecoder(MediaLog* media_log)
|
||||
- : media_log_(media_log) {
|
||||
+ : media_log_(media_log), timestamp_map_(128) {
|
||||
DVLOG(1) << __func__;
|
||||
DETACH_FROM_SEQUENCE(sequence_checker_);
|
||||
}
|
||||
@@ -363,8 +363,10 @@ bool FFmpegVideoDecoder::FFmpegDecode(const DecoderBuffer& buffer) {
|
||||
DCHECK(packet->data);
|
||||
DCHECK_GT(packet->size, 0);
|
||||
|
||||
- // Let FFmpeg handle presentation timestamp reordering.
|
||||
- codec_context_->reordered_opaque = buffer.timestamp().InMicroseconds();
|
||||
+ const int64_t timestamp = buffer.timestamp().InMicroseconds();
|
||||
+ const TimestampId timestamp_id = timestamp_id_generator_.GenerateNextId();
|
||||
+ timestamp_map_.Put(std::make_pair(timestamp_id, timestamp));
|
||||
+ packet->opaque = reinterpret_cast<void*>(timestamp_id.GetUnsafeValue());
|
||||
}
|
||||
FFmpegDecodingLoop::DecodeStatus decode_status = decoding_loop_->DecodePacket(
|
||||
packet, base::BindRepeating(&FFmpegVideoDecoder::OnNewFrame,
|
||||
@@ -423,7 +425,12 @@ bool FFmpegVideoDecoder::OnNewFrame(AVFrame* frame) {
|
||||
}
|
||||
gfx::Size natural_size = aspect_ratio.GetNaturalSize(visible_rect);
|
||||
|
||||
- const auto pts = base::Microseconds(frame->reordered_opaque);
|
||||
+ const auto ts_id = TimestampId(reinterpret_cast<size_t>(frame->opaque));
|
||||
+ const auto ts_lookup = timestamp_map_.Get(ts_id);
|
||||
+ if (ts_lookup == timestamp_map_.end()) {
|
||||
+ return false;
|
||||
+ }
|
||||
+ const auto pts = base::Microseconds(std::get<1>(*ts_lookup));
|
||||
auto video_frame = VideoFrame::WrapExternalDataWithLayout(
|
||||
opaque->layout, visible_rect, natural_size, opaque->data, opaque->size,
|
||||
pts);
|
||||
@@ -498,8 +505,10 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
|
||||
codec_context_->thread_count = GetFFmpegVideoDecoderThreadCount(config);
|
||||
codec_context_->thread_type =
|
||||
FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME);
|
||||
+
|
||||
codec_context_->opaque = this;
|
||||
codec_context_->get_buffer2 = GetVideoBufferImpl;
|
||||
+ codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE;
|
||||
|
||||
if (base::FeatureList::IsEnabled(kFFmpegAllowLists)) {
|
||||
// Note: FFmpeg will try to free this string, so we must duplicate it.
|
||||
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
|
||||
index d02cb89c3ddf7..0a2de1c623fff 100644
|
||||
--- a/media/filters/ffmpeg_video_decoder.h
|
||||
+++ b/media/filters/ffmpeg_video_decoder.h
|
||||
@@ -7,10 +7,12 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
+#include "base/containers/lru_cache.h"
|
||||
#include "base/functional/callback.h"
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/memory/scoped_refptr.h"
|
||||
#include "base/sequence_checker.h"
|
||||
+#include "base/types/id_type.h"
|
||||
#include "media/base/frame_buffer_pool.h"
|
||||
#include "media/base/supported_video_decoder_config.h"
|
||||
#include "media/base/video_decoder.h"
|
||||
@@ -87,6 +89,20 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
||||
// FFmpeg structures owned by this object.
|
||||
std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
|
||||
|
||||
+ // The gist here is that timestamps need to be 64 bits to store microsecond
|
||||
+ // precision. A 32 bit integer would overflow at ~35 minutes at this level of
|
||||
+ // precision. We can't cast the timestamp to the void ptr object used by the
|
||||
+ // opaque field in ffmpeg then, because it would lose data on a 32 bit build.
|
||||
+ // However, we don't actually have 2^31 timestamped frames in a single
|
||||
+ // playback, so it's fine to use the 32 bit value as a key in a map which
|
||||
+ // contains the actual timestamps. Additionally, we've in the past set 128
|
||||
+ // outstanding frames for re-ordering as a limit for cross-thread decoding
|
||||
+ // tasks, so we'll do that here too with the LRU cache.
|
||||
+ using TimestampId = base::IdType<int64_t, size_t, 0>;
|
||||
+
|
||||
+ TimestampId::Generator timestamp_id_generator_;
|
||||
+ base::LRUCache<TimestampId, int64_t> timestamp_map_;
|
||||
+
|
||||
VideoDecoderConfig config_;
|
||||
|
||||
scoped_refptr<FrameBufferPool> frame_pool_;
|
||||
|
|
@ -1,13 +1,15 @@
|
|||
diff -up chromium-142.0.7444.52/build/config/compiler/BUILD.gn.split-threshold-for-reg-with-hint chromium-142.0.7444.52/build/config/compiler/BUILD.gn
|
||||
--- chromium-142.0.7444.52/build/config/compiler/BUILD.gn.split-threshold-for-reg-with-hint 2025-10-28 19:31:53.885979941 +0100
|
||||
+++ chromium-142.0.7444.52/build/config/compiler/BUILD.gn 2025-10-28 19:39:50.279574752 +0100
|
||||
@@ -680,22 +680,6 @@ config("compiler") {
|
||||
diff -up chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me chromium-126.0.6478.26/build/config/compiler/BUILD.gn
|
||||
--- chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me 2024-06-02 14:02:52.516602574 +0200
|
||||
+++ chromium-126.0.6478.26/build/config/compiler/BUILD.gn 2024-06-02 14:17:24.527503540 +0200
|
||||
@@ -575,24 +575,6 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
|
||||
- # other problems.
|
||||
- if (default_toolchain != "//build/toolchain/cros:target") {
|
||||
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
|
||||
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
||||
- !llvm_android_mainline) {
|
||||
- cflags += [
|
||||
- "-mllvm",
|
||||
- "-split-threshold-for-reg-with-hint=0",
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
From b9075d0e1f687f9a5cf80a7778bde99cece9fdf7 Mon Sep 17 00:00:00 2001
|
||||
From: Than Ngo <than@redhat.com>
|
||||
Date: Sat, 23 Nov 2024 12:33:22 +0100
|
||||
Subject: [PATCH] Enable qt-ui
|
||||
|
||||
|
||||
diff -up chromium-131.0.6778.85/ui/qt/qt_shim.cc.me chromium-131.0.6778.85/ui/qt/qt_shim.cc
|
||||
--- chromium-131.0.6778.85/ui/qt/qt_shim.cc.me 2024-11-23 10:04:16.789121846 +0100
|
||||
+++ chromium-131.0.6778.85/ui/qt/qt_shim.cc 2024-11-23 11:40:02.905064702 +0100
|
||||
@@ -265,7 +265,7 @@ FontRenderParams QtShim::GetFontRenderPa
|
||||
FontDescription QtShim::GetFontDescription() const {
|
||||
QFont font = app_.font();
|
||||
return {
|
||||
- .family = String(font.family().toStdString().c_str()),
|
||||
+ .family = String(font.family().toUtf8().constData()),
|
||||
.size_pixels = font.pixelSize(),
|
||||
.size_points = font.pointSize(),
|
||||
.is_italic = IsStyleItalic(font.style()),
|
||||
|
||||
12
chromium-132-el8-clang18-build-error.patch
Normal file
12
chromium-132-el8-clang18-build-error.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -up chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc.me chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc
|
||||
--- chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc.me 2025-01-10 11:17:44.598459092 +0100
|
||||
+++ chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc 2025-01-10 11:18:55.910222909 +0100
|
||||
@@ -147,7 +147,7 @@ std::u16string GetPageObjectMarkName(FPD
|
||||
|
||||
// Number of characters, including the NUL.
|
||||
const size_t expected_size = base::checked_cast<size_t>(buflen_bytes / 2);
|
||||
- PDFiumAPIStringBufferAdapter adapter(&name, expected_size,
|
||||
+ PDFiumAPIStringBufferAdapter<std::u16string> adapter(&name, expected_size,
|
||||
/*check_expected_size=*/true);
|
||||
unsigned long actual_buflen_bytes = 0; // NOLINT(runtime/int)
|
||||
bool result =
|
||||
12
chromium-133-clang18-template.patch
Normal file
12
chromium-133-clang18-template.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -up chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc.me chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc
|
||||
--- chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc.me 2025-02-10 14:16:34.810693753 +0100
|
||||
+++ chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc 2025-02-10 14:16:39.747791800 +0100
|
||||
@@ -543,7 +543,7 @@ void ComposeSession::RequestWithSession(
|
||||
// execution in case request fails.
|
||||
compose::LogComposeRequestReason(request_reason);
|
||||
|
||||
- optimization_guide::ModelExecutionSessionCallbackWithLogging callback =
|
||||
+ optimization_guide::ModelExecutionSessionCallbackWithLogging<optimization_guide::proto::ComposeLoggingData> callback =
|
||||
base::BindRepeating(&ComposeSession::ModelExecutionCallback,
|
||||
weak_ptr_factory_.GetWeakPtr(),
|
||||
std::move(request_timer), request_id_, request_reason,
|
||||
11
chromium-133-rust-crc32fast.patch
Normal file
11
chromium-133-rust-crc32fast.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up chromium-133.0.6943.53/third_party/rust/crc32fast/v1/BUILD.gn.me chromium-133.0.6943.53/third_party/rust/crc32fast/v1/BUILD.gn
|
||||
--- chromium-133.0.6943.53/third_party/rust/crc32fast/v1/BUILD.gn.me 2025-02-11 00:13:06.132152874 +0100
|
||||
+++ chromium-133.0.6943.53/third_party/rust/crc32fast/v1/BUILD.gn 2025-02-11 00:28:22.785233997 +0100
|
||||
@@ -41,7 +41,6 @@ cargo_crate("lib") {
|
||||
proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||
deps = [ "//third_party/rust/cfg_if/v1:lib" ]
|
||||
features = [
|
||||
- "nightly",
|
||||
"std",
|
||||
]
|
||||
rustflags = [
|
||||
14
chromium-134-rust-libadler2.patch
Normal file
14
chromium-134-rust-libadler2.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Fix warning: libadler2 not found
|
||||
|
||||
diff -up chromium-134.0.6998.23/build/rust/std/BUILD.gn.than chromium-134.0.6998.23/build/rust/std/BUILD.gn
|
||||
--- chromium-134.0.6998.23/build/rust/std/BUILD.gn.than 2025-02-24 09:47:57.560506410 +0100
|
||||
+++ chromium-134.0.6998.23/build/rust/std/BUILD.gn 2025-02-24 09:48:02.335676712 +0100
|
||||
@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
|
||||
# These are no longer present in the Windows toolchain.
|
||||
stdlib_files += [
|
||||
"addr2line",
|
||||
- "adler2",
|
||||
+ "adler",
|
||||
"gimli",
|
||||
"libc",
|
||||
"memchr",
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
From 0eebf40b9914bca8fe69bef8eea89522c1a5d4ce Mon Sep 17 00:00:00 2001
|
||||
From: Jan Grulich <grulja@gmail.com>
|
||||
Date: Tue, 01 Apr 2025 12:23:37 -0700
|
||||
Subject: [PATCH] Add more CFI suppressions for inline PipeWire functions
|
||||
|
||||
There are now more inline functions with PipeWire 1.4, which are causing
|
||||
SIGILL as we hit CFI check.
|
||||
|
||||
Bug: chromium:354776214
|
||||
Change-Id: I055dd7edcaf3ca190ec7b4cc576ebe97a2baf82f
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6421030
|
||||
Reviewed-by: Peter Collingbourne <pcc@chromium.org>
|
||||
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
|
||||
Commit-Queue: Jan Grulich <grulja@gmail.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1441109}
|
||||
---
|
||||
|
||||
diff --git a/tools/cfi/ignores.txt b/tools/cfi/ignores.txt
|
||||
index 9a1180e..0a002bc6 100644
|
||||
--- a/tools/cfi/ignores.txt
|
||||
+++ b/tools/cfi/ignores.txt
|
||||
@@ -260,8 +260,16 @@
|
||||
src:*third_party/skia/src/ports/SkFontHost_FreeType.cpp
|
||||
|
||||
# WebRTC / PipeWire
|
||||
-fun:*pw_registry_bind*
|
||||
+fun:*pw_core_add_listener*
|
||||
fun:*pw_core_get_registry*
|
||||
+fun:*pw_core_sync*
|
||||
+fun:*pw_node_add_listener*
|
||||
+fun:*pw_node_enum_params*
|
||||
+fun:*pw_loop_add_event*
|
||||
+fun:*pw_loop_signal_event*
|
||||
+fun:*pw_registry_add_listener*
|
||||
+fun:*pw_registry_bind*
|
||||
+fun:*spa_loop_utils*
|
||||
|
||||
######### Function pointers cast to incorrect type signatures
|
||||
|
||||
35
chromium-135-gperf.patch
Normal file
35
chromium-135-gperf.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
From b552a86d494c1acf9c3472b8e5f00d90f9d3a704 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Richard G <iskunk@gmail.com>
|
||||
Date: Thu, 10 Apr 2025 04:35:40 -0400
|
||||
Subject: [PATCH] Don't apply /*FALLTHROUGH*/ edit to gperf 3.2 output
|
||||
|
||||
The gperf issue at https://savannah.gnu.org/bugs/index.php?53029
|
||||
has been resolved as of the 3.2 release, and not only is the
|
||||
/*FALLTHROUGH*/ comment replacement no longer needed, it now
|
||||
breaks the build with "error: fallthrough annotation does not
|
||||
directly precede switch label". Only do the edit for 3.1.
|
||||
|
||||
Bug: None
|
||||
Change-Id: I1f12a2a685b62d0dedb4298bc171ab4c94ec6b47
|
||||
---
|
||||
|
||||
diff --git a/third_party/blink/renderer/build/scripts/gperf.py b/third_party/blink/renderer/build/scripts/gperf.py
|
||||
index 42630d3..0df5abd 100644
|
||||
--- a/third_party/blink/renderer/build/scripts/gperf.py
|
||||
+++ b/third_party/blink/renderer/build/scripts/gperf.py
|
||||
@@ -35,10 +35,11 @@
|
||||
# https://savannah.gnu.org/bugs/index.php?53028
|
||||
gperf_output = re.sub(r'\bregister ', '', gperf_output)
|
||||
# -Wimplicit-fallthrough needs an explicit fallthrough statement,
|
||||
- # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
|
||||
- # https://savannah.gnu.org/bugs/index.php?53029
|
||||
- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
|
||||
- ' [[fallthrough]];')
|
||||
+ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
|
||||
+ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
|
||||
+ if '/* C++ code produced by gperf version 3.1 */' in gperf_output:
|
||||
+ gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
|
||||
+ ' [[fallthrough]];')
|
||||
# -Wpointer-to-int-cast warns about casting pointers to smaller ints
|
||||
# Replace {(int)(long)&(foo), bar} with
|
||||
# {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
|
||||
90
chromium-135-rust-clanglib.patch
Normal file
90
chromium-135-rust-clanglib.patch
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
diff -up chromium-135.0.7049.84/build/config/clang/BUILD.gn.than chromium-135.0.7049.84/build/config/clang/BUILD.gn
|
||||
--- chromium-135.0.7049.84/build/config/clang/BUILD.gn.than 2025-04-09 10:22:51.699058451 +0200
|
||||
+++ chromium-135.0.7049.84/build/config/clang/BUILD.gn 2025-04-09 10:43:06.524085005 +0200
|
||||
@@ -166,8 +166,8 @@ template("clang_lib") {
|
||||
_prefix = "lib"
|
||||
_suffix = ""
|
||||
_ext = "a"
|
||||
+ _libprefix = ""
|
||||
|
||||
- _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
|
||||
if (is_win) {
|
||||
_dir = "windows"
|
||||
_prefix = ""
|
||||
@@ -197,7 +197,33 @@ template("clang_lib") {
|
||||
} else {
|
||||
assert(false) # Unhandled cpu type
|
||||
}
|
||||
- } else if (is_linux || is_chromeos) {
|
||||
+ } else if (is_linux) {
|
||||
+ if (current_cpu == "x64") {
|
||||
+ _dir = "x86_64-redhat-linux-gnu"
|
||||
+ _suffix ="-x86_64"
|
||||
+ } else if (current_cpu == "x86") {
|
||||
+ _dir = "i386-redhat-linux-gnu"
|
||||
+ _suffix = "-i386"
|
||||
+ } else if (current_cpu == "arm64") {
|
||||
+ _dir = "aarch64-redhat-linux-gnu"
|
||||
+ _suffix = "-aarch64"
|
||||
+ } else if (current_cpu == "arm") {
|
||||
+ _dir = "armhf-redhat-linux-gnu"
|
||||
+ _suffix = "-armhf"
|
||||
+ } else if (current_cpu == "ppc64") {
|
||||
+ _dir = "ppc64le-redhat-linux-gnu"
|
||||
+ _suffix = "-ppc64le"
|
||||
+ } else {
|
||||
+ assert(false) # Unhandled cpu type
|
||||
+ }
|
||||
+ # different clang lib dir in fedora/epel
|
||||
+ if (clang_version == "17" || clang_version == "18" || clang_version == "19" || clang_version == "20") {
|
||||
+ _suffix = ""
|
||||
+ } else if (clang_version == "14" || clang_version == "15" || clang_version == "16") {
|
||||
+ _libprefix = "64"
|
||||
+ _dir = ""
|
||||
+ }
|
||||
+ } else if (is_chromeos) {
|
||||
if (current_cpu == "x64") {
|
||||
_dir = "x86_64-unknown-linux-gnu"
|
||||
} else if (current_cpu == "x86") {
|
||||
@@ -236,6 +262,7 @@ template("clang_lib") {
|
||||
assert(false) # Unhandled target platform
|
||||
}
|
||||
|
||||
+ _clang_lib_dir = "$clang_base_path/lib${_libprefix}/clang/$clang_version/lib"
|
||||
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
|
||||
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
|
||||
|
||||
diff -up chromium-135.0.7049.84/build/rust/rust_bindgen_generator.gni.than chromium-135.0.7049.84/build/rust/rust_bindgen_generator.gni
|
||||
--- chromium-135.0.7049.84/build/rust/rust_bindgen_generator.gni.than 2025-04-09 10:46:48.772413981 +0200
|
||||
+++ chromium-135.0.7049.84/build/rust/rust_bindgen_generator.gni 2025-04-09 10:47:15.480900587 +0200
|
||||
@@ -18,11 +18,11 @@ if (host_os == "win") {
|
||||
|
||||
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
|
||||
# ../lib.
|
||||
-_libclang_path = rust_bindgen_root
|
||||
+_libclang_path = clang_base_path
|
||||
if (host_os == "win") {
|
||||
_libclang_path += "/bin"
|
||||
} else {
|
||||
- _libclang_path += "/lib"
|
||||
+ _libclang_path += "/lib64"
|
||||
}
|
||||
|
||||
# Template to build Rust/C bindings with bindgen.
|
||||
diff -up chromium-135.0.7049.84/build/rust/rust_bindgen.gni.than chromium-135.0.7049.84/build/rust/rust_bindgen.gni
|
||||
--- chromium-135.0.7049.84/build/rust/rust_bindgen.gni.than 2025-04-09 10:45:53.577078718 +0200
|
||||
+++ chromium-135.0.7049.84/build/rust/rust_bindgen.gni 2025-04-09 10:46:29.974649891 +0200
|
||||
@@ -19,11 +19,11 @@ if (host_os == "win") {
|
||||
|
||||
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
|
||||
# ../lib.
|
||||
-_libclang_path = rust_bindgen_root
|
||||
+_libclang_path = clang_base_path
|
||||
if (host_os == "win") {
|
||||
_libclang_path += "/bin"
|
||||
} else {
|
||||
- _libclang_path += "/lib"
|
||||
+ _libclang_path += "/lib64"
|
||||
}
|
||||
|
||||
# Template to build Rust/C bindings with bindgen.
|
||||
11
chromium-136-cnnpack-clang18-crash-x86_64.patch
Normal file
11
chromium-136-cnnpack-clang18-crash-x86_64.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn.than chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn
|
||||
--- chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn.than 2025-04-30 17:40:49.303107833 +0200
|
||||
+++ chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn 2025-04-30 17:51:06.934912263 +0200
|
||||
@@ -28,6 +28,7 @@ config("xnnpack_config") {
|
||||
cflags = [
|
||||
"-Wno-unused-function",
|
||||
"-Wno-deprecated-comma-subscript",
|
||||
+ "-O0",
|
||||
]
|
||||
|
||||
defines = [
|
||||
38
chromium-136-system-brotli.patch
Normal file
38
chromium-136-system-brotli.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
diff -up chromium-136.0.7103.33/net/filter/brotli_source_stream.cc.system-brotli chromium-136.0.7103.33/net/filter/brotli_source_stream.cc
|
||||
--- chromium-136.0.7103.33/net/filter/brotli_source_stream.cc.system-brotli 2025-04-15 23:18:07.000000000 +0200
|
||||
+++ chromium-136.0.7103.33/net/filter/brotli_source_stream.cc 2025-04-21 11:12:15.771632937 +0200
|
||||
@@ -17,8 +17,8 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "net/base/io_buffer.h"
|
||||
#include "net/filter/source_stream_type.h"
|
||||
-#include "third_party/brotli/include/brotli/decode.h"
|
||||
-#include "third_party/brotli/include/brotli/shared_dictionary.h"
|
||||
+#include <brotli/decode.h>
|
||||
+#include <brotli/shared_dictionary.h>
|
||||
|
||||
namespace net {
|
||||
|
||||
diff -up chromium-136.0.7103.33/net/ssl/cert_compression.cc.system-brotli chromium-136.0.7103.33/net/ssl/cert_compression.cc
|
||||
--- chromium-136.0.7103.33/net/ssl/cert_compression.cc.system-brotli 2025-04-15 23:18:07.000000000 +0200
|
||||
+++ chromium-136.0.7103.33/net/ssl/cert_compression.cc 2025-04-21 11:12:15.775633048 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "third_party/boringssl/src/include/openssl/ssl.h"
|
||||
|
||||
#if !defined(NET_DISABLE_BROTLI)
|
||||
-#include "third_party/brotli/include/brotli/decode.h"
|
||||
+#include <brotli/decode.h>
|
||||
#endif
|
||||
|
||||
namespace net {
|
||||
diff -up chromium-136.0.7103.33/ui/base/resource/resource_bundle.cc.system-brotli chromium-136.0.7103.33/ui/base/resource/resource_bundle.cc
|
||||
--- chromium-136.0.7103.33/ui/base/resource/resource_bundle.cc.system-brotli 2025-04-15 23:18:07.000000000 +0200
|
||||
+++ chromium-136.0.7103.33/ui/base/resource/resource_bundle.cc 2025-04-21 11:19:08.136223039 +0200
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "net/filter/gzip_header.h"
|
||||
#include "skia/ext/image_operations.h"
|
||||
-#include "third_party/brotli/include/brotli/decode.h"
|
||||
+#include <brotli/decode.h>
|
||||
#include "third_party/skia/include/codec/SkPngDecoder.h"
|
||||
#include "third_party/skia/include/core/SkBitmap.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff -up chromium-138.0.7204.15/third_party/node/node.gni.me chromium-138.0.7204.15/third_party/node/node.gni
|
||||
--- chromium-138.0.7204.15/third_party/node/node.gni.me 2025-06-03 23:20:09.000000000 +0200
|
||||
+++ chromium-138.0.7204.15/third_party/node/node.gni 2025-06-09 09:59:21.788545159 +0200
|
||||
@@ -44,7 +44,6 @@ template("node") {
|
||||
if (!defined(deps)) {
|
||||
deps = []
|
||||
}
|
||||
- deps += [ "//third_party/node:check_version" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -up chromium-138.0.7204.15/third_party/node/BUILD.gn.me chromium-138.0.7204.15/third_party/node/BUILD.gn
|
||||
diff -up chromium-138.0.7204.15/third_party/protobuf/proto_library.gni.me chromium-138.0.7204.15/third_party/protobuf/proto_library.gni
|
||||
--- chromium-138.0.7204.15/third_party/protobuf/proto_library.gni.me 2025-06-09 11:33:08.279645775 +0200
|
||||
+++ chromium-138.0.7204.15/third_party/protobuf/proto_library.gni 2025-06-09 12:10:07.040045476 +0200
|
||||
@@ -562,7 +562,6 @@ template("proto_library") {
|
||||
_protoc_gen_ts_path,
|
||||
"//tools/protoc_wrapper/protoc-gen-ts_proto.py",
|
||||
] + _protoc_gen_ts_runtime_deps
|
||||
- deps += [ "//third_party/node:check_version" ]
|
||||
}
|
||||
|
||||
if (_generate_with_plugin) {
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
https://chromium-review.googlesource.com/c/chromium/src/+/6506529
|
||||
|
||||
Revert CL rolls ffmpeg for M138 as it breaks the build due to old ffmpeg version on EL9
|
||||
|
||||
diff -up chromium-138.0.7204.49/media/ffmpeg/ffmpeg_common.cc.me chromium-138.0.7204.49/media/ffmpeg/ffmpeg_common.cc
|
||||
--- chromium-138.0.7204.49/media/ffmpeg/ffmpeg_common.cc.me 2025-06-23 23:34:26.000000000 +0200
|
||||
+++ chromium-138.0.7204.49/media/ffmpeg/ffmpeg_common.cc 2025-06-25 15:13:17.958054182 +0200
|
||||
@@ -263,22 +263,22 @@ AVCodecID VideoCodecToCodecID(VideoCodec
|
||||
static VideoCodecProfile ProfileIDToVideoCodecProfile(int profile) {
|
||||
// Clear out the CONSTRAINED & INTRA flags which are strict subsets of the
|
||||
// corresponding profiles with which they're used.
|
||||
- profile &= ~AV_PROFILE_H264_CONSTRAINED;
|
||||
- profile &= ~AV_PROFILE_H264_INTRA;
|
||||
+ profile &= ~FF_PROFILE_H264_CONSTRAINED;
|
||||
+ profile &= ~FF_PROFILE_H264_INTRA;
|
||||
switch (profile) {
|
||||
- case AV_PROFILE_H264_BASELINE:
|
||||
+ case FF_PROFILE_H264_BASELINE:
|
||||
return H264PROFILE_BASELINE;
|
||||
- case AV_PROFILE_H264_MAIN:
|
||||
+ case FF_PROFILE_H264_MAIN:
|
||||
return H264PROFILE_MAIN;
|
||||
- case AV_PROFILE_H264_EXTENDED:
|
||||
+ case FF_PROFILE_H264_EXTENDED:
|
||||
return H264PROFILE_EXTENDED;
|
||||
- case AV_PROFILE_H264_HIGH:
|
||||
+ case FF_PROFILE_H264_HIGH:
|
||||
return H264PROFILE_HIGH;
|
||||
- case AV_PROFILE_H264_HIGH_10:
|
||||
+ case FF_PROFILE_H264_HIGH_10:
|
||||
return H264PROFILE_HIGH10PROFILE;
|
||||
- case AV_PROFILE_H264_HIGH_422:
|
||||
+ case FF_PROFILE_H264_HIGH_422:
|
||||
return H264PROFILE_HIGH422PROFILE;
|
||||
- case AV_PROFILE_H264_HIGH_444_PREDICTIVE:
|
||||
+ case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
|
||||
return H264PROFILE_HIGH444PREDICTIVEPROFILE;
|
||||
default:
|
||||
DVLOG(1) << "Unknown profile id: " << profile;
|
||||
@@ -289,23 +289,23 @@ static VideoCodecProfile ProfileIDToVide
|
||||
static int VideoCodecProfileToProfileID(VideoCodecProfile profile) {
|
||||
switch (profile) {
|
||||
case H264PROFILE_BASELINE:
|
||||
- return AV_PROFILE_H264_BASELINE;
|
||||
+ return FF_PROFILE_H264_BASELINE;
|
||||
case H264PROFILE_MAIN:
|
||||
- return AV_PROFILE_H264_MAIN;
|
||||
+ return FF_PROFILE_H264_MAIN;
|
||||
case H264PROFILE_EXTENDED:
|
||||
- return AV_PROFILE_H264_EXTENDED;
|
||||
+ return FF_PROFILE_H264_EXTENDED;
|
||||
case H264PROFILE_HIGH:
|
||||
- return AV_PROFILE_H264_HIGH;
|
||||
+ return FF_PROFILE_H264_HIGH;
|
||||
case H264PROFILE_HIGH10PROFILE:
|
||||
- return AV_PROFILE_H264_HIGH_10;
|
||||
+ return FF_PROFILE_H264_HIGH_10;
|
||||
case H264PROFILE_HIGH422PROFILE:
|
||||
- return AV_PROFILE_H264_HIGH_422;
|
||||
+ return FF_PROFILE_H264_HIGH_422;
|
||||
case H264PROFILE_HIGH444PREDICTIVEPROFILE:
|
||||
- return AV_PROFILE_H264_HIGH_444_PREDICTIVE;
|
||||
+ return FF_PROFILE_H264_HIGH_444_PREDICTIVE;
|
||||
default:
|
||||
DVLOG(1) << "Unknown VideoCodecProfile: " << profile;
|
||||
}
|
||||
- return AV_PROFILE_UNKNOWN;
|
||||
+ return FF_PROFILE_UNKNOWN;
|
||||
}
|
||||
|
||||
SampleFormat AVSampleFormatToSampleFormat(AVSampleFormat sample_format,
|
||||
@@ -441,7 +441,7 @@ bool AVCodecContextToAudioDecoderConfig(
|
||||
// TODO(dalecurtis): Just use the profile from the codec context if ffmpeg
|
||||
// ever starts supporting xHE-AAC.
|
||||
// FFmpeg provides the (defined_profile - 1) for AVCodecContext::profile
|
||||
- if (codec_context->profile == AV_PROFILE_UNKNOWN ||
|
||||
+ if (codec_context->profile == FF_PROFILE_UNKNOWN ||
|
||||
codec_context->profile == mp4::AAC::kXHeAAcType - 1) {
|
||||
// Errors aren't fatal here, so just drop any MediaLog messages.
|
||||
NullMediaLog media_log;
|
||||
@@ -659,16 +659,16 @@ bool AVStreamToVideoDecoderConfig(const
|
||||
break;
|
||||
case VideoCodec::kVP9:
|
||||
switch (codec_context->profile) {
|
||||
- case AV_PROFILE_VP9_0:
|
||||
+ case FF_PROFILE_VP9_0:
|
||||
profile = VP9PROFILE_PROFILE0;
|
||||
break;
|
||||
- case AV_PROFILE_VP9_1:
|
||||
+ case FF_PROFILE_VP9_1:
|
||||
profile = VP9PROFILE_PROFILE1;
|
||||
break;
|
||||
- case AV_PROFILE_VP9_2:
|
||||
+ case FF_PROFILE_VP9_2:
|
||||
profile = VP9PROFILE_PROFILE2;
|
||||
break;
|
||||
- case AV_PROFILE_VP9_3:
|
||||
+ case FF_PROFILE_VP9_3:
|
||||
profile = VP9PROFILE_PROFILE3;
|
||||
break;
|
||||
default:
|
||||
diff -up chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter.cc.me chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter.cc
|
||||
--- chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter.cc.me 2025-06-23 23:34:26.000000000 +0200
|
||||
+++ chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter.cc 2025-06-25 15:13:17.958541707 +0200
|
||||
@@ -68,17 +68,17 @@ bool GenerateAdtsHeader(int codec,
|
||||
hdr[1] |= 1;
|
||||
|
||||
switch (audio_profile) {
|
||||
- case AV_PROFILE_AAC_MAIN:
|
||||
+ case FF_PROFILE_AAC_MAIN:
|
||||
break;
|
||||
- case AV_PROFILE_AAC_HE:
|
||||
- case AV_PROFILE_AAC_HE_V2:
|
||||
- case AV_PROFILE_AAC_LOW:
|
||||
+ case FF_PROFILE_AAC_HE:
|
||||
+ case FF_PROFILE_AAC_HE_V2:
|
||||
+ case FF_PROFILE_AAC_LOW:
|
||||
hdr[2] |= (1 << 6);
|
||||
break;
|
||||
- case AV_PROFILE_AAC_SSR:
|
||||
+ case FF_PROFILE_AAC_SSR:
|
||||
hdr[2] |= (2 << 6);
|
||||
break;
|
||||
- case AV_PROFILE_AAC_LTP:
|
||||
+ case FF_PROFILE_AAC_LTP:
|
||||
hdr[2] |= (3 << 6);
|
||||
break;
|
||||
default:
|
||||
diff -up chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc.me chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
||||
--- chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc.me 2025-06-23 23:34:26.000000000 +0200
|
||||
+++ chromium-138.0.7204.49/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc 2025-06-25 15:13:17.958839001 +0200
|
||||
@@ -41,7 +41,7 @@ class FFmpegAACBitstreamConverterTest :
|
||||
// Set up reasonable aac parameters
|
||||
memset(&test_parameters_, 0, sizeof(AVCodecParameters));
|
||||
test_parameters_.codec_id = AV_CODEC_ID_AAC;
|
||||
- test_parameters_.profile = AV_PROFILE_AAC_MAIN;
|
||||
+ test_parameters_.profile = FF_PROFILE_AAC_MAIN;
|
||||
test_parameters_.ch_layout.nb_channels = 2;
|
||||
test_parameters_.extradata = extradata_header_;
|
||||
test_parameters_.extradata_size = sizeof(extradata_header_);
|
||||
@@ -131,7 +131,7 @@ TEST_F(FFmpegAACBitstreamConverterTest,
|
||||
|
||||
EXPECT_EQ(profile, kAacMainProfile);
|
||||
|
||||
- test_parameters_.profile = AV_PROFILE_AAC_HE;
|
||||
+ test_parameters_.profile = FF_PROFILE_AAC_HE;
|
||||
FFmpegAACBitstreamConverter converter_he(&test_parameters_);
|
||||
|
||||
test_packet = ScopedAVPacket::Allocate();
|
||||
@@ -143,7 +143,7 @@ TEST_F(FFmpegAACBitstreamConverterTest,
|
||||
|
||||
EXPECT_EQ(profile, kAacLowComplexityProfile);
|
||||
|
||||
- test_parameters_.profile = AV_PROFILE_AAC_ELD;
|
||||
+ test_parameters_.profile = FF_PROFILE_AAC_ELD;
|
||||
FFmpegAACBitstreamConverter converter_eld(&test_parameters_);
|
||||
|
||||
test_packet = ScopedAVPacket::Allocate();
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up chromium-139.0.7258.127/build/rust/cargo_crate.gni.than chromium-139.0.7258.127/build/rust/cargo_crate.gni
|
||||
--- chromium-139.0.7258.127/build/rust/cargo_crate.gni.than 2025-08-14 09:44:51.783560032 +0200
|
||||
+++ chromium-139.0.7258.127/build/rust/cargo_crate.gni 2025-08-14 09:48:37.407051268 +0200
|
||||
@@ -310,6 +310,9 @@ template("cargo_crate") {
|
||||
rustflags +=
|
||||
[ "-Awarnings" ] # Suppress other warnings in 3rd-party crates.
|
||||
|
||||
+ rustflags +=
|
||||
+ [ "--cap-lints=warn" ] # Suppress other warnings, causes FTBFS in Fedora build rhbz#2387446
|
||||
+
|
||||
if (!defined(build_native_rust_unit_tests)) {
|
||||
build_native_rust_unit_tests = _crate_type != "proc-macro"
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Fix ftbfs
|
||||
|
||||
v8/include/cppgc/visitor.h:440:19: error: invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'
|
||||
440 | static_assert(sizeof(T), "Pointee type must be fully defined.");
|
||||
|
||||
diff -up chromium-141.0.7390.37/third_party/blink/renderer/bindings/scripts/bind_gen/observable_array.py.ftbfs-csss_style_sheet chromium-141.0.7390.37/third_party/blink/renderer/bindings/scripts/bind_gen/observable_array.py
|
||||
--- chromium-141.0.7390.37/third_party/blink/renderer/bindings/scripts/bind_gen/observable_array.py.ftbfs-csss_style_sheet 2025-09-23 22:21:14.000000000 +0200
|
||||
+++ chromium-141.0.7390.37/third_party/blink/renderer/bindings/scripts/bind_gen/observable_array.py 2025-10-01 17:55:51.303926035 +0200
|
||||
@@ -433,6 +433,7 @@ def generate_observable_array(observable
|
||||
header_node.accumulator.add_include_headers([
|
||||
component_export_header(api_component, for_testing),
|
||||
"third_party/blink/renderer/bindings/core/v8/idl_types.h",
|
||||
+ "third_party/blink/renderer/core/css/css_style_sheet.h",
|
||||
"third_party/blink/renderer/platform/bindings/observable_array.h",
|
||||
])
|
||||
source_node.accumulator.add_include_headers([
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
Fix FTBFS
|
||||
|
||||
/usr/include/bits/siginfo-consts.h:219:3: error: expected identifier
|
||||
219 | SYS_SECCOMP = 1, /* Seccomp triggered. */
|
||||
| ^
|
||||
../../sandbox/linux/system_headers/linux_seccomp.h:220:39: note: expanded from macro 'SYS_SECCOMP'
|
||||
220 | #define SYS_SECCOMP 1
|
||||
| ^
|
||||
../../sandbox/linux/seccomp-bpf/trap.cc:159:46: error: use of undeclared identifier 'SYS_SECCOMP'
|
||||
159 | if (nr != LINUX_SIGSYS || info->si_code != SYS_SECCOMP || !ctx ||
|
||||
| ^~~~~~~~~~~
|
||||
/usr/include/bits/siginfo-consts.h:220:23: note: expanded from macro 'SYS_SECCOMP'
|
||||
220 | # define SYS_SECCOMP SYS_SECCOMP
|
||||
|
||||
diff -up chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h.me chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h
|
||||
--- chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h.me 2025-10-28 10:05:44.970248151 +0100
|
||||
+++ chromium-141.0.7390.122/sandbox/linux/system_headers/linux_seccomp.h 2025-10-28 10:05:52.291345772 +0100
|
||||
@@ -214,8 +214,11 @@ struct seccomp_notif_addfd {
|
||||
#define SECCOMP_RET_INVALID 0x00010000U // Illegal return value
|
||||
#endif
|
||||
|
||||
+// check glibc version < 2.42
|
||||
+#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 42)
|
||||
#ifndef SYS_SECCOMP
|
||||
#define SYS_SECCOMP 1
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
Fix FTBFS
|
||||
|
||||
../../build/modules/linux-x64/module.modulemap:11:12: error: header '../../linux/debian_bullseye_amd64-sysroot/usr/include/alloca.h' not found
|
||||
11 | header "../../linux/debian_bullseye_amd64-sysroot/usr/include/alloca.h"
|
||||
| ^
|
||||
1 error generated
|
||||
|
||||
diff -up chromium-141.0.7390.37/build/config/BUILDCONFIG.gn.me chromium-141.0.7390.37/build/config/BUILDCONFIG.gn
|
||||
--- chromium-141.0.7390.37/build/config/BUILDCONFIG.gn.me 2025-10-01 17:39:47.242174153 +0200
|
||||
+++ chromium-141.0.7390.37/build/config/BUILDCONFIG.gn 2025-10-01 17:49:54.736578295 +0200
|
||||
@@ -557,6 +557,8 @@ foreach(_target_type,
|
||||
]) {
|
||||
template(_target_type) {
|
||||
target(_target_type, target_name) {
|
||||
+ use_libcxx_modules = false
|
||||
+
|
||||
forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
|
||||
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
|
||||
if (!defined(inputs)) {
|
||||
@@ -660,6 +662,8 @@ foreach(_target_type,
|
||||
# TODO(crbug.com/326584510): Reclient doesn't respect this variable, see
|
||||
# rbe_bug_326584510_missing_inputs in //build/config/clang/clang.gni
|
||||
_uses_cflags = false
|
||||
+ use_libcxx_modules = false
|
||||
+
|
||||
if (defined(sources)) {
|
||||
foreach(f, sources) {
|
||||
if (string_replace(f + ".END", ".cc.END", "") != f + ".END" ||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up chromium-142.0.7444.52/build/config/compiler/BUILD.gn.clang++-unsupported-argument chromium-142.0.7444.52/build/config/compiler/BUILD.gn
|
||||
--- chromium-142.0.7444.52/build/config/compiler/BUILD.gn.clang++-unsupported-argument 2025-10-28 19:41:59.131433882 +0100
|
||||
+++ chromium-142.0.7444.52/build/config/compiler/BUILD.gn 2025-10-28 19:42:51.792779638 +0100
|
||||
@@ -2160,9 +2160,6 @@ config("default_warnings") {
|
||||
# TODO(crbug.com/40284799): Fix and re-enable.
|
||||
"-Wno-thread-safety-reference-return",
|
||||
|
||||
- # TODO(crbug.com/376641662): Fix and re-enable.
|
||||
- "-Wno-nontrivial-memcall",
|
||||
-
|
||||
# TODO(crbug.com/432275627): Fix and re-enable.
|
||||
"-Wno-uninitialized-const-pointer",
|
||||
]
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
Workaround for FTBFS
|
||||
|
||||
error: cannot find attribute `sanitize` in this scope
|
||||
--> ../../third_party/crabbyavif/src/src/capi/io.rs:210:41
|
||||
|
|
||||
210 | #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
|
||||
|
||||
diff -up chromium-142.0.7444.52/third_party/crabbyavif/BUILD.gn.me chromium-142.0.7444.52/third_party/crabbyavif/BUILD.gn
|
||||
--- chromium-142.0.7444.52/third_party/crabbyavif/BUILD.gn.me 2025-10-27 10:40:59.373768499 +0100
|
||||
+++ chromium-142.0.7444.52/third_party/crabbyavif/BUILD.gn 2025-10-27 10:45:12.142749942 +0100
|
||||
@@ -197,12 +197,11 @@ rust_static_library("crabbyavif") {
|
||||
"dav1d",
|
||||
"libyuv",
|
||||
"capi",
|
||||
- "disable_cfi",
|
||||
]
|
||||
|
||||
# Required for disable_cfi feature.
|
||||
configs -= [ "//build/config/compiler:disallow_unstable_features" ]
|
||||
- rustflags = [ "-Zallow-features=sanitize" ]
|
||||
+ rustflags = [ "-Zallow-features=no_sanitize" ]
|
||||
|
||||
public_deps = [ ":header_files" ]
|
||||
deps = [
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
diff -up chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc
|
||||
--- chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc.el9-ffmpeg-5.1.x 2025-11-01 22:14:10.116779876 +0100
|
||||
+++ chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.cc 2025-11-01 22:14:10.134140132 +0100
|
||||
@@ -800,8 +803,13 @@ bool AVStreamToVideoDecoderConfig(const
|
||||
}
|
||||
|
||||
VideoTransformation video_transformation = VideoTransformation();
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ for (int i = 0; i < stream->nb_side_data; i++) {
|
||||
+ const auto& side_data = stream->side_data[i];
|
||||
+#else
|
||||
for (const auto& side_data :
|
||||
AVCodecParametersCodedSideToSpan(stream->codecpar)) {
|
||||
+#endif
|
||||
switch (side_data.type) {
|
||||
case AV_PKT_DATA_DISPLAYMATRIX: {
|
||||
CHECK_EQ(side_data.size, sizeof(int32_t) * 3 * 3);
|
||||
diff -up chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h
|
||||
--- chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h.el9-ffmpeg-5.1.x 2025-10-24 18:42:30.000000000 +0200
|
||||
+++ chromium-142.0.7444.59/media/ffmpeg/ffmpeg_common.h 2025-11-02 08:06:48.997329630 +0100
|
||||
@@ -111,9 +111,13 @@ inline base::span<AVPacketSideData> AVCo
|
||||
// https://ffmpeg.org/doxygen/trunk/structAVCodecParameters.html#a29643cfd94231e2d148a5d17b08d115b
|
||||
// ffmpeg documentation: `nb_coded_side_data` is the amount of entries in
|
||||
// `coded_side_data`.
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 31, 102)
|
||||
return UNSAFE_BUFFERS(
|
||||
base::span(codecpar->coded_side_data,
|
||||
base::checked_cast<size_t>(codecpar->nb_coded_side_data)));
|
||||
+#else
|
||||
+ return base::span<AVPacketSideData>();
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Converts an int64_t timestamp in |time_base| units to a base::TimeDelta.
|
||||
diff -up chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc
|
||||
--- chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc.el9-ffmpeg-5.1.x 2025-10-24 18:42:30.000000000 +0200
|
||||
+++ chromium-142.0.7444.59/media/filters/audio_video_metadata_extractor.cc 2025-11-01 22:14:10.124748634 +0100
|
||||
@@ -109,17 +109,33 @@ bool AudioVideoMetadataExtractor::Extrac
|
||||
container_info.type = format_context->iformat->name;
|
||||
ExtractDictionary(format_context->metadata, &container_info.tags);
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ for (unsigned int i = 0; i < format_context->nb_streams; ++i) {
|
||||
+ stream_infos_.push_back(StreamInfo());
|
||||
+#else
|
||||
base::span<AVStream*> format_context_span =
|
||||
AVFormatContextToSpan(format_context);
|
||||
std::ranges::for_each(format_context_span, [&](AVStream* stream) {
|
||||
stream_infos_.emplace_back();
|
||||
+#endif
|
||||
StreamInfo& info = stream_infos_.back();
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ AVStream* stream = format_context->streams[i];
|
||||
+ if (!stream)
|
||||
+ continue;
|
||||
+#else
|
||||
if (!stream) {
|
||||
return;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ for (int j = 0; j < stream->nb_side_data; j++) {
|
||||
+ const AVPacketSideData& sd = stream->side_data[j];
|
||||
+#else
|
||||
for (const auto& sd : AVCodecParametersCodedSideToSpan(stream->codecpar)) {
|
||||
+#endif
|
||||
if (sd.type == AV_PKT_DATA_DISPLAYMATRIX) {
|
||||
CHECK_EQ(sd.size, sizeof(int32_t) * 3 * 3);
|
||||
rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
||||
@@ -135,7 +151,11 @@ bool AudioVideoMetadataExtractor::Extrac
|
||||
ExtractDictionary(stream->metadata, &info.tags);
|
||||
|
||||
if (!stream->codecpar) {
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ continue;
|
||||
+#else
|
||||
return;
|
||||
+#endif
|
||||
}
|
||||
|
||||
info.type = avcodec_get_name(stream->codecpar->codec_id);
|
||||
@@ -158,7 +178,11 @@ bool AudioVideoMetadataExtractor::Extrac
|
||||
reinterpret_cast<const char*>(stream->attached_pic.data),
|
||||
stream->attached_pic.size);
|
||||
}
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ }
|
||||
+#else
|
||||
});
|
||||
+#endif
|
||||
|
||||
extracted_ = true;
|
||||
return true;
|
||||
diff -up chromium-142.0.7444.59/media/filters/media_file_checker.cc.el9-ffmpeg-5.1.x chromium-142.0.7444.59/media/filters/media_file_checker.cc
|
||||
--- chromium-142.0.7444.59/media/filters/media_file_checker.cc.el9-ffmpeg-5.1.x 2025-10-24 18:42:30.000000000 +0200
|
||||
+++ chromium-142.0.7444.59/media/filters/media_file_checker.cc 2025-11-01 22:14:10.125099595 +0100
|
||||
@@ -64,6 +64,10 @@ bool MediaFileChecker::Start(base::TimeD
|
||||
// Remember the codec context for any decodable audio or video streams.
|
||||
bool found_streams = false;
|
||||
std::vector<Decoder> stream_contexts(format_context->nb_streams);
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ for (size_t i = 0; i < format_context->nb_streams; ++i) {
|
||||
+ AVCodecParameters* cp = format_context->streams[i]->codecpar;
|
||||
+#else
|
||||
base::span<AVStream*> format_context_span =
|
||||
AVFormatContextToSpan(format_context);
|
||||
std::ranges::transform(
|
||||
@@ -85,9 +89,26 @@ bool MediaFileChecker::Start(base::TimeD
|
||||
}
|
||||
}
|
||||
|
||||
+#endif
|
||||
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||
+ if (cp->codec_type == AVMEDIA_TYPE_AUDIO ||
|
||||
+ cp->codec_type == AVMEDIA_TYPE_VIDEO) {
|
||||
+ auto context = AVStreamToAVCodecContext(format_context->streams[i]);
|
||||
+ if (!context)
|
||||
+ continue;
|
||||
+ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
|
||||
+ if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
|
||||
+ auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
|
||||
+ stream_contexts[i] = {std::move(context), std::move(loop)};
|
||||
+ found_streams = true;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+#else
|
||||
return Decoder{};
|
||||
});
|
||||
|
||||
+#endif
|
||||
if (!found_streams)
|
||||
return false;
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
commit 069d424e41f42c6f4a4551334eafc7cfaed6e880
|
||||
Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
|
||||
Date: Mon Oct 13 02:29:29 2025 -0700
|
||||
|
||||
Add missing include for FormFieldData type completeness.
|
||||
|
||||
Bug: 450752866
|
||||
Change-Id: I25b2d6cd627063e006014289de68d2ecc70a2db7
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7030724
|
||||
Reviewed-by: Christoph Schwering <schwering@google.com>
|
||||
Reviewed-by: Jihad Hanna <jihadghanna@google.com>
|
||||
Commit-Queue: Jihad Hanna <jihadghanna@google.com>
|
||||
Reviewed-by: Matthias Körber <koerber@google.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1528799}
|
||||
|
||||
diff --git a/components/autofill/core/browser/form_parsing/autofill_scanner.h b/components/autofill/core/browser/form_parsing/autofill_scanner.h
|
||||
index 844526a5f77..eab073266e8 100644
|
||||
--- a/components/autofill/core/browser/form_parsing/autofill_scanner.h
|
||||
+++ b/components/autofill/core/browser/form_parsing/autofill_scanner.h
|
||||
@@ -10,11 +10,10 @@
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/span.h"
|
||||
#include "base/memory/raw_span.h"
|
||||
+#include "components/autofill/core/common/form_field_data.h"
|
||||
|
||||
namespace autofill {
|
||||
|
||||
-class FormFieldData;
|
||||
-
|
||||
// A helper class for parsing a stream of |FormFieldData|'s with lookahead.
|
||||
class AutofillScanner {
|
||||
private:
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff -up chromium-142.0.7444.52/net/filter/brotli_source_stream.cc.system-brotli chromium-142.0.7444.52/net/filter/brotli_source_stream.cc
|
||||
--- chromium-142.0.7444.52/net/filter/brotli_source_stream.cc.system-brotli 2025-10-21 22:19:54.000000000 +0200
|
||||
+++ chromium-142.0.7444.52/net/filter/brotli_source_stream.cc 2025-10-26 16:55:51.220605842 +0100
|
||||
@@ -14,8 +14,8 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "net/base/io_buffer.h"
|
||||
#include "net/filter/source_stream_type.h"
|
||||
-#include "third_party/brotli/include/brotli/decode.h"
|
||||
-#include "third_party/brotli/include/brotli/shared_dictionary.h"
|
||||
+#include <brotli/decode.h>
|
||||
+#include <brotli/shared_dictionary.h>
|
||||
|
||||
namespace net {
|
||||
|
||||
diff -up chromium-142.0.7444.52/net/ssl/cert_compression.cc.system-brotli chromium-142.0.7444.52/net/ssl/cert_compression.cc
|
||||
--- chromium-142.0.7444.52/net/ssl/cert_compression.cc.system-brotli 2025-10-21 22:19:54.000000000 +0200
|
||||
+++ chromium-142.0.7444.52/net/ssl/cert_compression.cc 2025-10-26 16:55:51.220845216 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "third_party/boringssl/src/include/openssl/ssl.h"
|
||||
|
||||
#if !defined(NET_DISABLE_BROTLI)
|
||||
-#include "third_party/brotli/include/brotli/decode.h"
|
||||
+#include <brotli/decode.h>
|
||||
#endif
|
||||
|
||||
namespace net {
|
||||
diff -up chromium-142.0.7444.52/ui/base/resource/resource_bundle.cc.system-brotli chromium-142.0.7444.52/ui/base/resource/resource_bundle.cc
|
||||
--- chromium-142.0.7444.52/ui/base/resource/resource_bundle.cc.system-brotli 2025-10-21 22:19:54.000000000 +0200
|
||||
+++ chromium-142.0.7444.52/ui/base/resource/resource_bundle.cc 2025-10-26 17:04:17.085726059 +0100
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "net/filter/gzip_header.h"
|
||||
#include "skia/ext/image_operations.h"
|
||||
-#include "third_party/brotli/include/brotli/decode.h"
|
||||
+#include <brotli/decode.h>
|
||||
#include "third_party/skia/include/codec/SkPngRustDecoder.h"
|
||||
#include "third_party/skia/include/core/SkBitmap.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
Workaround auto darkmode issue, image are not inverted correctly in darkmode
|
||||
|
||||
diff -up chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc.than chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
|
||||
--- chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc.than 2025-12-09 12:28:52.592092242 +0100
|
||||
+++ chromium-143.0.7499.40/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc 2025-12-09 12:42:57.776716951 +0100
|
||||
@@ -276,16 +276,20 @@ DarkModeResult DarkModeImageClassifier::
|
||||
float high_color_count_threshold =
|
||||
kHighColorCountThreshold[features.is_colorful];
|
||||
|
||||
+#if 0
|
||||
// Very few colors means it's not a photo, apply the filter.
|
||||
if (features.color_buckets_ratio < low_color_count_threshold)
|
||||
return DarkModeResult::kApplyFilter;
|
||||
+#endif
|
||||
|
||||
// Too many colors means it's probably photorealistic, do not apply it.
|
||||
if (features.color_buckets_ratio > high_color_count_threshold)
|
||||
return DarkModeResult::kDoNotApplyFilter;
|
||||
|
||||
+#if 0
|
||||
// In-between, decision tree cannot give a precise result.
|
||||
return DarkModeResult::kNotClassified;
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace blink
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Fix build errors:
|
||||
|
||||
error[E0428]: the name `__rust_alloc_error_handler_should_panic_v2` is defined multiple times
|
||||
--> ../../build/rust/allocator/lib.rs:101:5
|
||||
|
||||
error: undefined symbol: __rust_no_alloc_shim_is_unstable
|
||||
|
||||
diff -up chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable chromium-141.0.7390.37/build/rust/allocator/lib.rs
|
||||
--- chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable 2025-09-23 22:21:14.000000000 +0200
|
||||
+++ chromium-141.0.7390.37/build/rust/allocator/lib.rs 2025-09-27 15:14:54.661952048 +0200
|
||||
@@ -103,6 +103,11 @@ mod both_allocators {
|
||||
#[linkage = "weak"]
|
||||
static __rust_alloc_error_handler_should_panic: u8 = 0;
|
||||
|
||||
+ // Mangle the symbol name as rustc (1.84) expects on EL9
|
||||
+ #[unsafe(no_mangle)]
|
||||
+ #[linkage = "weak"]
|
||||
+ static __rust_no_alloc_shim_is_unstable: u8 = 0;
|
||||
+
|
||||
// Mangle the symbol name as rustc expects.
|
||||
#[rustc_std_internal_symbol]
|
||||
#[allow(non_upper_case_globals)]
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
diff -up chromium-142.0.7444.162/build/rust/allocator/lib.rs.el9-rust_alloc_error_handler_should_panic chromium-142.0.7444.162/build/rust/allocator/lib.rs
|
||||
--- chromium-142.0.7444.162/build/rust/allocator/lib.rs.el9-rust_alloc_error_handler_should_panic 2025-11-12 09:39:31.616713829 +0100
|
||||
+++ chromium-142.0.7444.162/build/rust/allocator/lib.rs 2025-11-14 11:43:32.115426831 +0100
|
||||
@@ -96,6 +96,13 @@ mod both_allocators {
|
||||
0
|
||||
}
|
||||
|
||||
+ // Mangle the symbol name as rustc (1.88) expects on EL9
|
||||
+ #[rustc_std_internal_symbol]
|
||||
+ #[linkage = "weak"]
|
||||
+ fn __rust_alloc_error_handler_should_panic() -> u8 {
|
||||
+ 0
|
||||
+ }
|
||||
+
|
||||
// Mangle the symbol name as rustc (1.84) expects on EL9
|
||||
#[unsafe(no_mangle)]
|
||||
#[linkage = "weak"]
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
Author: <than@redhat.com>
|
||||
|
||||
Fix build error caused by python-3.9 on EL9
|
||||
|
||||
Traceback (most recent call last):
|
||||
File "/builddir/build/BUILD/chromium-143.0.7499.40/out/Release/../../tools/metrics/histograms/generate_allowlist_from_histograms_file.py", line 10, in <module>
|
||||
import extract_histograms
|
||||
File "/builddir/build/BUILD/chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py", line 24, in <module>
|
||||
import xml_utils
|
||||
File "/builddir/build/BUILD/chromium-143.0.7499.40/tools/metrics/histograms/../common/xml_utils.py", line 14, in <module>
|
||||
DomTree = minidom.Element | minidom.Document
|
||||
TypeError: unsupported operand type(s) for |: 'type' and 'type'
|
||||
|
||||
diff -up chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.python-3.9-ftbfs chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py
|
||||
--- chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py.python-3.9-ftbfs 2025-11-19 22:40:05.000000000 +0100
|
||||
+++ chromium-143.0.7499.40/tools/metrics/histograms/extract_histograms.py 2025-12-02 17:23:41.996802101 +0100
|
||||
@@ -18,6 +18,7 @@ import re
|
||||
import sys
|
||||
from typing import TypedDict
|
||||
import xml.dom.minidom
|
||||
+from typing import Optional, Union
|
||||
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
|
||||
import xml_utils
|
||||
@@ -84,7 +85,7 @@ class EnumDict(TypedDict, total=False):
|
||||
"""A dict representing an enum."""
|
||||
|
||||
name: str
|
||||
- type: str | None
|
||||
+ type: Optional[str]
|
||||
buckets: list[_BucketDict]
|
||||
summary: str
|
||||
|
||||
@@ -108,7 +109,7 @@ def ExpandHistogramNameWithSuffixes(
|
||||
suffix_name: str,
|
||||
histogram_name: str,
|
||||
histogram_suffixes_node: xml.dom.minidom.Element,
|
||||
-) -> tuple[str | None, ExtractionErrors]:
|
||||
+) -> tuple[Optional[str], ExtractionErrors]:
|
||||
"""Creates a new histogram name based on a histogram suffix.
|
||||
|
||||
Args:
|
||||
@@ -310,7 +311,7 @@ def _ExtractOwners(node: xml.dom.minidom
|
||||
|
||||
def _ExtractImprovementDirection(
|
||||
histogram_node: xml.dom.minidom.Element,
|
||||
-) -> tuple[str | None, ExtractionErrors]:
|
||||
+) -> tuple[Union[str, None], ExtractionErrors]:
|
||||
"""Extracts improvement direction from the given histogram element, if any.
|
||||
|
||||
Args:
|
||||
@@ -644,7 +645,7 @@ def ExtractVariantsFromXmlTree(
|
||||
return variants_dict, errors
|
||||
|
||||
|
||||
-def _GetObsoleteReason(node: xml.dom.minidom.Element) -> str | None:
|
||||
+def _GetObsoleteReason(node: xml.dom.minidom.Element) -> Optional[str]:
|
||||
"""If the node's histogram is obsolete, returns a string explanation.
|
||||
|
||||
Otherwise, returns None.
|
||||
diff -up chromium-143.0.7499.40/tools/metrics/common/xml_utils.py.than chromium-143.0.7499.40/tools/metrics/common/xml_utils.py
|
||||
--- chromium-143.0.7499.40/tools/metrics/common/xml_utils.py.than 2025-12-04 17:48:11.924111675 +0100
|
||||
+++ chromium-143.0.7499.40/tools/metrics/common/xml_utils.py 2025-12-04 17:49:42.451979769 +0100
|
||||
@@ -11,7 +11,8 @@ from xml.dom import minidom
|
||||
# The implementation of Node type is possible with extra runtime checks, however
|
||||
# using a more specific type makes the intent clearer and avoids potential
|
||||
# warnings about attributes like `tagName` not being present on all Node types.
|
||||
-DomTree = minidom.Element | minidom.Document
|
||||
+from typing import Union
|
||||
+DomTree = Union[minidom.Element, minidom.Document]
|
||||
|
||||
_ELEMENT_NODE = minidom.Node.ELEMENT_NODE
|
||||
|
||||
|
|
@ -1,137 +0,0 @@
|
|||
commit 4f7637304eca894adf2e70078a55654a88224a30
|
||||
Author: Lukasz Anforowicz <lukasza@chromium.org>
|
||||
Date: Tue Sep 30 07:08:03 2025 -0700
|
||||
|
||||
[rust png] Reland: Reinforce `testonly`-ness of some users of `libpng`.
|
||||
|
||||
This reverts commit 7fa4c2d7ab42a48247ce8e0290cbb7e854990f1e and
|
||||
effectively relands https://crrev.com/c/6976870. The reland is
|
||||
attempted after using wildcards to cover extra gni-generated targets.
|
||||
`Cq-Include-Trybots` directives in the CL description should verify
|
||||
correctness of the reland. Original CL description follows:
|
||||
|
||||
This CL extracts a separate `third_party/libpng:libpng_for_testonly`
|
||||
target which:
|
||||
|
||||
1) Is a `group` that proxies/forwards to the `libpng` target by listing
|
||||
it as its `public_deps`
|
||||
2) Has limited visibility (based on the new `libpng_testonly_visibility`
|
||||
introduced in the refactored `third_party/libpng/visibility.gni`).
|
||||
The new visibility is almost unchanged, except for explicitly
|
||||
spelling out some targets instead of using wildcards
|
||||
3) Is marked as `testonly`
|
||||
|
||||
Bug: 443128323
|
||||
Change-Id: If7ba0d184324a5c662aaf2d52122994ea778d452
|
||||
Cq-Include-Trybots: luci.chromium.try:ios-catalyst
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6991491
|
||||
Auto-Submit: Łukasz Anforowicz <lukasza@chromium.org>
|
||||
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
|
||||
Reviewed-by: Nico Weber <thakis@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1522830}
|
||||
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
index a4703c3692d..2d70f7a5fe9 100644
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -11152,7 +11152,7 @@ if (!is_android) {
|
||||
"//testing/gtest",
|
||||
"//third_party/hunspell",
|
||||
"//third_party/icu",
|
||||
- "//third_party/libpng",
|
||||
+ "//third_party/libpng:libpng_for_testonly",
|
||||
"//ui/base:test_support",
|
||||
"//ui/events:test_support",
|
||||
"//ui/ozone",
|
||||
@@ -11512,7 +11512,7 @@ if (!is_android && !is_chromeos_device) {
|
||||
"//testing/gtest",
|
||||
"//third_party/hunspell",
|
||||
"//third_party/icu",
|
||||
- "//third_party/libpng",
|
||||
+ "//third_party/libpng:libpng_for_testonly",
|
||||
"//ui/base:base_interactive_ui_tests",
|
||||
"//ui/base:ozone_buildflags",
|
||||
"//ui/base:test_support",
|
||||
@@ -12470,7 +12470,7 @@ if (!is_android) {
|
||||
"//testing/gtest",
|
||||
"//third_party/hunspell",
|
||||
"//third_party/icu",
|
||||
- "//third_party/libpng",
|
||||
+ "//third_party/libpng:libpng_for_testonly",
|
||||
"//ui/base:test_support",
|
||||
"//ui/resources:ui_test_pak",
|
||||
"//ui/views",
|
||||
diff --git a/testing/libfuzzer/fuzzers/BUILD.gn b/testing/libfuzzer/fuzzers/BUILD.gn
|
||||
index 7d242e177f0..1c67eee1598 100644
|
||||
--- a/testing/libfuzzer/fuzzers/BUILD.gn
|
||||
+++ b/testing/libfuzzer/fuzzers/BUILD.gn
|
||||
@@ -104,7 +104,7 @@ fuzzer_test("libpng_progressive_read_fuzzer") {
|
||||
sources = [ "libpng_read_fuzzer.cc" ]
|
||||
deps = [
|
||||
"//base",
|
||||
- "//third_party/libpng",
|
||||
+ "//third_party/libpng:libpng_for_testonly",
|
||||
]
|
||||
dict = "dicts/png.dict"
|
||||
seed_corpuses = libpng_seed_corpuses
|
||||
diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn
|
||||
index d4bdea1e33c..3e31348b94f 100644
|
||||
--- a/third_party/libpng/BUILD.gn
|
||||
+++ b/third_party/libpng/BUILD.gn
|
||||
@@ -130,6 +130,14 @@ if (is_win) {
|
||||
}
|
||||
}
|
||||
|
||||
+group("libpng_for_testonly") {
|
||||
+ testonly = true
|
||||
+ public_deps = [ ":libpng" ]
|
||||
+
|
||||
+ visibility = []
|
||||
+ visibility = libpng_testonly_visibility
|
||||
+}
|
||||
+
|
||||
if (build_with_chromium) {
|
||||
libpng_ossfuzz_seed_corpuses = [
|
||||
"//components/test/data/viz",
|
||||
diff --git a/tools/imagediff/BUILD.gn b/tools/imagediff/BUILD.gn
|
||||
index d56651bedc7..2b5f3d38488 100644
|
||||
--- a/tools/imagediff/BUILD.gn
|
||||
+++ b/tools/imagediff/BUILD.gn
|
||||
@@ -34,6 +34,7 @@ if (target_os == "win" && host_os != "win") {
|
||||
# If the current toolchain is the test host toolchain, build the tool.
|
||||
if (current_toolchain == imagediff_toolchain) {
|
||||
executable("imagediff") {
|
||||
+ testonly = true
|
||||
output_name = "image_diff" # Different than dir name for historical
|
||||
# reasons.
|
||||
sources = [
|
||||
@@ -47,7 +48,7 @@ if (current_toolchain == imagediff_toolchain) {
|
||||
deps = [
|
||||
"//base",
|
||||
"//build/win:default_exe_manifest",
|
||||
- "//third_party/libpng",
|
||||
+ "//third_party/libpng:libpng_for_testonly",
|
||||
"//third_party/zlib",
|
||||
]
|
||||
}
|
||||
@@ -60,6 +61,7 @@ if (current_toolchain == imagediff_toolchain) {
|
||||
} else if (current_toolchain == default_toolchain &&
|
||||
default_toolchain != imagediff_toolchain) {
|
||||
binary_symlink("imagediff") {
|
||||
+ testonly = true
|
||||
binary_label = ":$target_name($imagediff_toolchain)"
|
||||
binary_output_name = "image_diff"
|
||||
|
||||
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
|
||||
index f6a40abfe99..83d8f55027a 100644
|
||||
--- a/ui/gfx/BUILD.gn
|
||||
+++ b/ui/gfx/BUILD.gn
|
||||
@@ -906,7 +906,7 @@ test("gfx_unittests") {
|
||||
"//skia:skcms",
|
||||
"//testing/gtest",
|
||||
"//third_party/icu:icuuc",
|
||||
- "//third_party/libpng",
|
||||
+ "//third_party/libpng:libpng_for_testonly",
|
||||
"//third_party/zlib",
|
||||
"//ui/base",
|
||||
"//ui/gfx/animation",
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn.llvm-16 chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn
|
||||
--- chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn.llvm-16 2025-12-02 23:25:25.379315827 +0100
|
||||
+++ chromium-143.0.7499.40/third_party/swiftshader/src/Reactor/BUILD.gn 2025-12-02 23:25:58.697291861 +0100
|
||||
@@ -307,7 +307,7 @@ if (supports_subzero) {
|
||||
|
||||
if (supports_llvm) {
|
||||
swiftshader_source_set("swiftshader_llvm_reactor") {
|
||||
- llvm_dir = "../../third_party/llvm-10.0"
|
||||
+ llvm_dir = "../../third_party/llvm-16.0"
|
||||
|
||||
deps = [
|
||||
":swiftshader_reactor_base",
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
diff -up chromium-144.0.7559.31/build/config/clang/BUILD.gn.rust-clang_lib chromium-144.0.7559.31/build/config/clang/BUILD.gn
|
||||
--- chromium-144.0.7559.31/build/config/clang/BUILD.gn.rust-clang_lib 2025-12-17 01:06:32.000000000 +0100
|
||||
+++ chromium-144.0.7559.31/build/config/clang/BUILD.gn 2025-12-23 19:01:33.876897379 +0100
|
||||
@@ -177,7 +177,21 @@ template("clang_lib") {
|
||||
}
|
||||
} else if (is_apple) {
|
||||
_dir = "darwin"
|
||||
- } else if (is_linux || is_chromeos) {
|
||||
+ } else if (is_linux) {
|
||||
+ if (current_cpu == "x64") {
|
||||
+ _dir = "x86_64-redhat-linux-gnu"
|
||||
+ } else if (current_cpu == "x86") {
|
||||
+ _dir = "i386-redhat-linux-gnu"
|
||||
+ } else if (current_cpu == "arm64") {
|
||||
+ _dir = "aarch64-redhat-linux-gnu"
|
||||
+ } else if (current_cpu == "arm") {
|
||||
+ _dir = "armhf-redhat-linux-gnu"
|
||||
+ } else if (current_cpu == "ppc64") {
|
||||
+ _dir = "ppc64le-redhat-linux-gnu"
|
||||
+ } else {
|
||||
+ assert(false) # Unhandled cpu type
|
||||
+ }
|
||||
+ } else if (is_chromeos) {
|
||||
if (current_cpu == "x64") {
|
||||
_dir = "x86_64-unknown-linux-gnu"
|
||||
} else if (current_cpu == "x86") {
|
||||
diff -up chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni.rust-clang_lib chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni
|
||||
--- chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni.rust-clang_lib 2025-12-17 01:06:32.000000000 +0100
|
||||
+++ chromium-144.0.7559.31/build/rust/rust_bindgen_generator.gni 2025-12-23 19:21:34.335924481 +0100
|
||||
@@ -26,14 +26,14 @@ if (!use_chromium_rust_toolchain &&
|
||||
|
||||
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
|
||||
# ../lib.
|
||||
-_libclang_path = rust_bindgen_root
|
||||
+_libclang_path = clang_base_path
|
||||
if (!use_chromium_rust_toolchain &&
|
||||
(host_cpu == "ppc64" || host_cpu == "s390x")) {
|
||||
_libclang_path = rust_sysroot_absolute + "/lib64"
|
||||
} else if (host_os == "win") {
|
||||
_libclang_path += "/bin"
|
||||
} else {
|
||||
- _libclang_path += "/lib"
|
||||
+ _libclang_path += "/lib64"
|
||||
}
|
||||
|
||||
# Template to build Rust/C bindings with bindgen.
|
||||
diff -up chromium-144.0.7559.31/build/rust/rust_bindgen.gni.rust-clang_lib chromium-144.0.7559.31/build/rust/rust_bindgen.gni
|
||||
--- chromium-144.0.7559.31/build/rust/rust_bindgen.gni.rust-clang_lib 2025-12-17 01:06:32.000000000 +0100
|
||||
+++ chromium-144.0.7559.31/build/rust/rust_bindgen.gni 2025-12-23 19:22:12.089755683 +0100
|
||||
@@ -19,14 +19,14 @@ if (host_os == "win") {
|
||||
|
||||
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
|
||||
# ../lib.
|
||||
-_libclang_path = rust_bindgen_root
|
||||
+_libclang_path = clang_base_path
|
||||
if (!use_chromium_rust_toolchain &&
|
||||
(current_cpu == "ppc64" || current_cpu == "s390x")) {
|
||||
_libclang_path = rust_sysroot_absolute + "/lib64"
|
||||
} else if (host_os == "win") {
|
||||
_libclang_path += "/bin"
|
||||
} else {
|
||||
- _libclang_path += "/lib"
|
||||
+ _libclang_path += "/lib64"
|
||||
}
|
||||
|
||||
# Template to build Rust/C bindings with bindgen.
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
diff -up chromium-144.0.7559.31/build/rust/std/BUILD.gn.than chromium-144.0.7559.31/build/rust/std/BUILD.gn
|
||||
--- chromium-144.0.7559.31/build/rust/std/BUILD.gn.than 2025-12-26 15:06:36.274081861 +0100
|
||||
+++ chromium-144.0.7559.31/build/rust/std/BUILD.gn 2025-12-26 16:11:45.697054423 +0100
|
||||
@@ -55,11 +55,7 @@ if (toolchain_has_rust) {
|
||||
"miniz_oxide",
|
||||
"object",
|
||||
]
|
||||
- if (rustc_nightly_capability) {
|
||||
- stdlib_files += [ "adler2" ]
|
||||
- } else {
|
||||
- stdlib_files += [ "adler" ]
|
||||
- }
|
||||
+ stdlib_files += [ "adler2" ]
|
||||
}
|
||||
|
||||
if (toolchain_for_rust_host_build_tools) {
|
||||
|
|
@ -150,8 +150,8 @@ Name[ast]=Ventana nueva
|
|||
Name[az]=Yeni Pəncərə
|
||||
Name[be]=Новае акно
|
||||
Name[bg]=Нов прозорец
|
||||
Name[bn_BD]=নতুন উইন্ডো (N)
|
||||
Name[bn_IN]=নতুন উইন্ডো
|
||||
Name[bn-BD]=নতুন উইন্ডো (N)
|
||||
Name[bn-IN]=নতুন উইন্ডো
|
||||
Name[br]=Prenestr nevez
|
||||
Name[brx]=गोदान उइन्ड'(N)
|
||||
Name[bs]=Novi prozor
|
||||
|
|
@ -163,37 +163,37 @@ Name[da]=Nyt vindue
|
|||
Name[de]=Neues Fenster
|
||||
Name[dsb]=Nowe wokno
|
||||
Name[el]=Νέο παράθυρο
|
||||
Name[en_GB]=New Window
|
||||
Name[en_US]=New Window
|
||||
Name[en_ZA]=New Window
|
||||
Name[en-GB]=New Window
|
||||
Name[en-US]=New Window
|
||||
Name[en-ZA]=New Window
|
||||
Name[eo]=Nova fenestro
|
||||
Name[es_AR]=Nueva ventana
|
||||
Name[es_CL]=Nueva ventana
|
||||
Name[es_ES]=Nueva ventana
|
||||
Name[es_MX]=Nueva ventana
|
||||
Name[es-AR]=Nueva ventana
|
||||
Name[es-CL]=Nueva ventana
|
||||
Name[es-ES]=Nueva ventana
|
||||
Name[es-MX]=Nueva ventana
|
||||
Name[et]=Uus aken
|
||||
Name[eu]=Leiho berria
|
||||
Name[fa]=پنجره جدید
|
||||
Name[ff]=Henorde Hesere
|
||||
Name[fi]=Uusi ikkuna
|
||||
Name[fr]=Nouvelle fenêtre
|
||||
Name[fy_NL]=Nij finster
|
||||
Name[ga_IE]=Fuinneog Nua
|
||||
Name[fy-NL]=Nij finster
|
||||
Name[ga-IE]=Fuinneog Nua
|
||||
Name[gd]=Uinneag ùr
|
||||
Name[gl]=Nova xanela
|
||||
Name[gn]=Ovetã pyahu
|
||||
Name[gu_IN]=નવી વિન્ડો
|
||||
Name[gu-IN]=નવી વિન્ડો
|
||||
Name[he]=חלון חדש
|
||||
Name[hi_IN]=नया विंडो
|
||||
Name[hi-IN]=नया विंडो
|
||||
Name[hr]=Novi prozor
|
||||
Name[hsb]=Nowe wokno
|
||||
Name[hu]=Új ablak
|
||||
Name[hy_AM]=Նոր Պատուհան
|
||||
Name[hy-AM]=Նոր Պատուհան
|
||||
Name[id]=Jendela Baru
|
||||
Name[is]=Nýr gluggi
|
||||
Name[it]=Nuova finestra
|
||||
Name[ja]=新しいウィンドウ
|
||||
Name[ja_JP@mac]=新規ウインドウ
|
||||
Name[ja-JP-mac]=新規ウインドウ
|
||||
Name[ka]=ახალი ფანჯარა
|
||||
Name[kk]=Жаңа терезе
|
||||
Name[km]=បង្អួចថ្មី
|
||||
|
|
@ -212,15 +212,15 @@ Name[ml]=പുതിയ ജാലകം
|
|||
Name[mr]=नवीन पटल
|
||||
Name[ms]=Tetingkap Baru
|
||||
Name[my]=ဝင်းဒိုးအသစ်
|
||||
Name[nb_NO]=Nytt vindu
|
||||
Name[ne_NP]=नयाँ सञ्झ्याल
|
||||
Name[nb-NO]=Nytt vindu
|
||||
Name[ne-NP]=नयाँ सञ्झ्याल
|
||||
Name[nl]=Nieuw venster
|
||||
Name[nn_NO]=Nytt vindauge
|
||||
Name[nn-NO]=Nytt vindauge
|
||||
Name[or]=ନୂତନ ୱିଣ୍ଡୋ
|
||||
Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
|
||||
Name[pa-IN]=ਨਵੀਂ ਵਿੰਡੋ
|
||||
Name[pl]=Nowe okno
|
||||
Name[pt_BR]=Nova janela
|
||||
Name[pt_PT]=Nova janela
|
||||
Name[pt-BR]=Nova janela
|
||||
Name[pt-PT]=Nova janela
|
||||
Name[rm]=Nova fanestra
|
||||
Name[ro]=Fereastră nouă
|
||||
Name[ru]=Новое окно
|
||||
|
|
@ -231,7 +231,7 @@ Name[sl]=Novo okno
|
|||
Name[son]=Zanfun taaga
|
||||
Name[sq]=Dritare e Re
|
||||
Name[sr]=Нови прозор
|
||||
Name[sv_SE]=Nytt fönster
|
||||
Name[sv-SE]=Nytt fönster
|
||||
Name[ta]=புதிய சாளரம்
|
||||
Name[te]=కొత్త విండో
|
||||
Name[th]=หน้าต่างใหม่
|
||||
|
|
@ -243,8 +243,8 @@ Name[uz]=Yangi oyna
|
|||
Name[vi]=Cửa sổ mới
|
||||
Name[wo]=Palanteer bu bees
|
||||
Name[xh]=Ifestile entsha
|
||||
Name[zh_CN]=新建窗口
|
||||
Name[zh_TW]=開新視窗
|
||||
Name[zh-CN]=新建窗口
|
||||
Name[zh-TW]=開新視窗
|
||||
Exec=chromium-browser %U
|
||||
|
||||
[Desktop Action new-private-window]
|
||||
|
|
@ -258,8 +258,8 @@ Name[ast]=Ventana privada nueva
|
|||
Name[az]=Yeni Məxfi Pəncərə
|
||||
Name[be]=Новае акно адасаблення
|
||||
Name[bg]=Нов прозорец за поверително сърфиране
|
||||
Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
|
||||
Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
|
||||
Name[bn-BD]=নতুন ব্যক্তিগত উইন্ডো
|
||||
Name[bn-IN]=নতুন ব্যক্তিগত উইন্ডো
|
||||
Name[br]=Prenestr merdeiñ prevez nevez
|
||||
Name[brx]=गोदान प्राइभेट उइन्ड'
|
||||
Name[bs]=Novi privatni prozor
|
||||
|
|
@ -271,37 +271,37 @@ Name[da]=Nyt privat vindue
|
|||
Name[de]=Neues privates Fenster
|
||||
Name[dsb]=Nowe priwatne wokno
|
||||
Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
|
||||
Name[en_GB]=New Private Window
|
||||
Name[en_US]=New Private Window
|
||||
Name[en_ZA]=New Private Window
|
||||
Name[en-GB]=New Private Window
|
||||
Name[en-US]=New Private Window
|
||||
Name[en-ZA]=New Private Window
|
||||
Name[eo]=Nova privata fenestro
|
||||
Name[es_AR]=Nueva ventana privada
|
||||
Name[es_CL]=Nueva ventana privada
|
||||
Name[es_ES]=Nueva ventana privada
|
||||
Name[es_MX]=Nueva ventana privada
|
||||
Name[es-AR]=Nueva ventana privada
|
||||
Name[es-CL]=Nueva ventana privada
|
||||
Name[es-ES]=Nueva ventana privada
|
||||
Name[es-MX]=Nueva ventana privada
|
||||
Name[et]=Uus privaatne aken
|
||||
Name[eu]=Leiho pribatu berria
|
||||
Name[fa]=پنجره ناشناس جدید
|
||||
Name[ff]=Henorde Suturo Hesere
|
||||
Name[fi]=Uusi yksityinen ikkuna
|
||||
Name[fr]=Nouvelle fenêtre de navigation privée
|
||||
Name[fy_NL]=Nij priveefinster
|
||||
Name[ga_IE]=Fuinneog Nua Phríobháideach
|
||||
Name[fy-NL]=Nij priveefinster
|
||||
Name[ga-IE]=Fuinneog Nua Phríobháideach
|
||||
Name[gd]=Uinneag phrìobhaideach ùr
|
||||
Name[gl]=Nova xanela privada
|
||||
Name[gn]=Ovetã ñemi pyahu
|
||||
Name[gu_IN]=નવી ખાનગી વિન્ડો
|
||||
Name[gu-IN]=નવી ખાનગી વિન્ડો
|
||||
Name[he]=חלון פרטי חדש
|
||||
Name[hi-IN]=नयी निजी विंडो
|
||||
Name[hr]=Novi privatni prozor
|
||||
Name[hsb]=Nowe priwatne wokno
|
||||
Name[hu]=Új privát ablak
|
||||
Name[hy_AM]=Սկսել Գաղտնի դիտարկում
|
||||
Name[hy-AM]=Սկսել Գաղտնի դիտարկում
|
||||
Name[id]=Jendela Mode Pribadi Baru
|
||||
Name[is]=Nýr huliðsgluggi
|
||||
Name[it]=Nuova finestra anonima
|
||||
Name[ja]=新しいプライベートウィンドウ
|
||||
Name[ja_JP@mac]=新規プライベートウインドウ
|
||||
Name[ja-JP-mac]=新規プライベートウインドウ
|
||||
Name[ka]=ახალი პირადი ფანჯარა
|
||||
Name[kk]=Жаңа жекелік терезе
|
||||
Name[km]=បង្អួចឯកជនថ្មី
|
||||
|
|
@ -320,15 +320,15 @@ Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
|
|||
Name[mr]=नवीन वैयक्तिक पटल
|
||||
Name[ms]=Tetingkap Persendirian Baharu
|
||||
Name[my]=New Private Window
|
||||
Name[nb_NO]=Nytt privat vindu
|
||||
Name[ne_NP]=नयाँ निजी सञ्झ्याल
|
||||
Name[nb-NO]=Nytt privat vindu
|
||||
Name[ne-NP]=नयाँ निजी सञ्झ्याल
|
||||
Name[nl]=Nieuw privévenster
|
||||
Name[nn_NO]=Nytt privat vindauge
|
||||
Name[nn-NO]=Nytt privat vindauge
|
||||
Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
|
||||
Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
|
||||
Name[pa-IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
|
||||
Name[pl]=Nowe okno prywatne
|
||||
Name[pt_BR]=Nova janela privativa
|
||||
Name[pt_PT]=Nova janela privada
|
||||
Name[pt-BR]=Nova janela privativa
|
||||
Name[pt-PT]=Nova janela privada
|
||||
Name[rm]=Nova fanestra privata
|
||||
Name[ro]=Fereastră privată nouă
|
||||
Name[ru]=Новое приватное окно
|
||||
|
|
@ -339,7 +339,7 @@ Name[sl]=Novo zasebno okno
|
|||
Name[son]=Sutura zanfun taaga
|
||||
Name[sq]=Dritare e Re Private
|
||||
Name[sr]=Нови приватан прозор
|
||||
Name[sv_SE]=Nytt privat fönster
|
||||
Name[sv-SE]=Nytt privat fönster
|
||||
Name[ta]=புதிய தனிப்பட்ட சாளரம்
|
||||
Name[te]=కొత్త ఆంతరంగిక విండో
|
||||
Name[th]=หน้าต่างส่วนตัวใหม่
|
||||
|
|
@ -351,6 +351,6 @@ Name[uz]=Yangi maxfiy oyna
|
|||
Name[vi]=Cửa sổ riêng tư mới
|
||||
Name[wo]=Panlanteeru biir bu bees
|
||||
Name[xh]=Ifestile yangasese entsha
|
||||
Name[zh_CN]=新建隐私浏览窗口
|
||||
Name[zh_TW]=新增隱私視窗
|
||||
Name[zh-CN]=新建隐私浏览窗口
|
||||
Name[zh-TW]=新增隱私視窗
|
||||
Exec=chromium-browser --incognito %U
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up chromium-140.0.7339.80/media/filters/ffmpeg_video_decoder.cc.me chromium-140.0.7339.80/media/filters/ffmpeg_video_decoder.cc
|
||||
--- chromium-140.0.7339.80/media/filters/ffmpeg_video_decoder.cc.me 2025-09-05 02:43:56.666833745 +0200
|
||||
+++ chromium-140.0.7339.80/media/filters/ffmpeg_video_decoder.cc 2025-09-05 03:09:01.121397898 +0200
|
||||
@@ -486,7 +486,7 @@ bool FFmpegVideoDecoder::ConfigureDecode
|
||||
|
||||
codec_context_->opaque = this;
|
||||
codec_context_->get_buffer2 = GetVideoBufferImpl;
|
||||
- codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE;
|
||||
+ //codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE;
|
||||
|
||||
if (decode_nalus_) {
|
||||
codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
|
||||
|
|
@ -324,12 +324,7 @@ if __name__ == '__main__':
|
|||
'third_party/node/linux/node-linux-x64',
|
||||
'third_party/rust-toolchain',
|
||||
'third_party/rust-src',
|
||||
'third_party/devtools-frontend/src/third_party/esbuild',
|
||||
'third_party/enterprise_companion/chromium_linux64',
|
||||
'third_party/enterprise_companion/chromium_mac_amd64',
|
||||
'third_party/enterprise_companion/chromium_mac_arm64',
|
||||
'third_party/enterprise_companion/chromium_win_x86',
|
||||
'third_party/enterprise_companion/chromium_win_x86_64']
|
||||
'third_party/devtools-frontend/src/third_party/esbuild']
|
||||
junk_files = ['third_party/node/linux/node-linux-x64.tar.gz',
|
||||
'buildtools/third_party/eu-strip/bin/eu-strip',
|
||||
'buildtools/linux64/gn']
|
||||
|
|
|
|||
|
|
@ -1,72 +1,54 @@
|
|||
# system wide chromium flags
|
||||
|
||||
ARCH="$(arch)"
|
||||
MODE="$(systemd-detect-virt)"
|
||||
|
||||
# GRAPHIC_DRIVER=[amd|intel|nvidia|default]
|
||||
GRAPHIC_DRIVER=default
|
||||
|
||||
# WEB_AUTO_DARKMODE_WEBCONTENT=[on|off]
|
||||
WEB_AUTO_DARKMODE_WEBCONTENT=off
|
||||
# WEB_DARKMODE=[on|off]
|
||||
WEB_DARKMODE=off
|
||||
|
||||
# NATIVE_WAYLAND=[on|off]
|
||||
# chromium >=141 switched to --ozone-platform-hint=auto
|
||||
if [ ! -z "$WAYLAND_DISPLAY" ]; then
|
||||
NATIVE_WAYLAND=on
|
||||
else
|
||||
NATIVE_WAYLAND=off
|
||||
fi
|
||||
NATIVE_WAYLAND=off
|
||||
|
||||
DISABLE_FEATURES="LensOverlay"
|
||||
ENABLE_FEATURES="AllowQt"
|
||||
CHROMIUM_FLAGS=" --enable-chrome-browser-cloud-management"
|
||||
if [ "$NATIVE_WAYLAND" == "on" ] ; then
|
||||
ENABLE_FEATURES+=",WaylandLinuxDrmSyncobj,WaylandPerSurfaceScale,WaylandUiScale"
|
||||
else
|
||||
CHROMIUM_FLAGS=""
|
||||
if [ "$NATIVE_WAYLAND" == "off" ] ; then
|
||||
CHROMIUM_FLAGS+=" --enable-native-gpu-memory-buffers"
|
||||
CHROMIUM_FLAGS+=" --enable-gpu-memory-buffer-video-frames"
|
||||
CHROMIUM_FLAGS+=" --enable-zero-copy"
|
||||
CHROMIUM_FLAGS+=" --ignore-gpu-blocklist --disable-gpu-driver-bug-workaround"
|
||||
CHROMIUM_FLAGS+=" --enable-chrome-browser-cloud-management"
|
||||
CHROMIUM_FLAGS+=" --enable-gpu-rasterization"
|
||||
fi
|
||||
|
||||
ENABLE_FEATURES+=",AcceleratedVideoDecodeLinuxGL,AcceleratedVideoDecodeLinuxZeroCopyGL"
|
||||
FEATURES=""
|
||||
|
||||
case "$GRAPHIC_DRIVER" in
|
||||
amd|intel)
|
||||
# Need new mesa with AMD multi planes support, is supported in fedora >= 40 (mesa-24.1.1 or newer)
|
||||
# see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26165
|
||||
CHROMIUM_FLAGS+=" --enable-accelerated-video-decode"
|
||||
ENABLE_FEATURES+=",VaapiIgnoreDriverChecks,UseMultiPlaneFormatForHardwareVideo"
|
||||
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=vulkan --enable-accelerated-video-decode"
|
||||
FEATURES+="Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,UseMultiPlaneFormatForHardwareVideo"
|
||||
;;
|
||||
nvidia)
|
||||
# The NVIDIA VaAPI drivers are known to not support Chromium
|
||||
# see https://crbug.com/1492880. This feature switch is
|
||||
# provided for developers to test VaAPI drivers on NVIDIA GPUs
|
||||
ENABLE_FEATURES+=",VaapiOnNvidiaGPUs"
|
||||
export CUDA_DISABLE_PERF_BOOST=1
|
||||
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
|
||||
FEATURES+="VaapiVideoDecodeLinuxGL,VaapiVideoEncoder,VaapiOnNvidiaGPUs"
|
||||
;;
|
||||
*)
|
||||
ENABLE_FEATURES+=",AcceleratedVideoEncoder"
|
||||
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
|
||||
FEATURES+="VaapiVideoEncoder,VaapiVideoDecodeLinuxGL"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "$MODE" != "none" ] ; then
|
||||
# chromium in VM, running with standard setting
|
||||
CHROMIUM_FLAGS=""
|
||||
DISABLE_FEATURES=""
|
||||
ENABLE_FEATURES=""
|
||||
fi
|
||||
|
||||
|
||||
# Web Dark mode
|
||||
if [ "$WEB_AUTO_DARKMODE_WEBCONTENT" == "on" ] ; then
|
||||
darktype="WebContentsForceDark"
|
||||
if [ -z "$ENABLE_FEATURES" ] ; then
|
||||
ENABLE_FEATURES+="$darktype"
|
||||
else
|
||||
ENABLE_FEATURES+=",$darktype"
|
||||
fi
|
||||
CHROMIUM_FLAGS+=" --force-dark-mode"
|
||||
if [ "$WEB_DARKMODE" == "on" ] ; then
|
||||
darktype="WebContentsForceDark:inversion_method/cielab_based/image_behavior/none/foreground_lightness_threshold/150/background_lightness_threshold/205"
|
||||
FEATURES+=",$darktype"
|
||||
fi
|
||||
|
||||
[ -z "$DISABLE_FEATURES" ] || CHROMIUM_FLAGS+=" --disable-features=$DISABLE_FEATURES"
|
||||
[ -z "$ENABLE_FEATURES" ] || CHROMIUM_FLAGS+=" --enable-features=$ENABLE_FEATURES"
|
||||
if [ "$ARCH" == "x86_64" ] ; then
|
||||
CHROMIUM_FLAGS+=" --enable-features=$FEATURES"
|
||||
fi
|
||||
|
|
|
|||
879
chromium.spec
879
chromium.spec
File diff suppressed because it is too large
Load diff
|
|
@ -1,8 +1,6 @@
|
|||
Index: chromium-144.0.7559.59/third_party/dawn/src/dawn/common/Platform.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/dawn/src/dawn/common/Platform.h
|
||||
+++ chromium-144.0.7559.59/third_party/dawn/src/dawn/common/Platform.h
|
||||
@@ -163,10 +163,12 @@
|
||||
--- a/third_party/dawn/src/dawn/common/Platform.h
|
||||
+++ b/third_party/dawn/src/dawn/common/Platform.h
|
||||
@@ -159,10 +159,12 @@
|
||||
#elif defined(__s390x__)
|
||||
#define DAWN_PLATFORM_IS_S390X 1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
|
||||
Index: chromium-128.0.6613.113/third_party/breakpad/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/breakpad/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
|
||||
@@ -804,7 +804,6 @@ if (is_linux || is_chromeos || is_androi
|
||||
--- chromium-128.0.6613.113.orig/third_party/breakpad/BUILD.gn
|
||||
+++ chromium-128.0.6613.113/third_party/breakpad/BUILD.gn
|
||||
@@ -782,7 +782,6 @@ if (is_linux || is_chromeos || is_androi
|
||||
"breakpad/src/client/minidump_file_writer.h",
|
||||
"breakpad/src/common/convert_UTF.cc",
|
||||
"breakpad/src/common/convert_UTF.h",
|
||||
|
|
@ -10,7 +10,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
|
|||
"breakpad/src/common/linux/elf_core_dump.cc",
|
||||
"breakpad/src/common/linux/elf_core_dump.h",
|
||||
"breakpad/src/common/linux/elfutils.cc",
|
||||
@@ -836,6 +835,8 @@ if (is_linux || is_chromeos || is_androi
|
||||
@@ -814,6 +813,8 @@ if (is_linux || is_chromeos || is_androi
|
||||
configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||
public_configs = [ ":client_config" ]
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ Index: chromium-144.0.7559.59/third_party/breakpad/BUILD.gn
|
|||
if (current_cpu == "arm" && is_chromeos_ash) {
|
||||
# Avoid running out of registers in
|
||||
# linux_syscall_support.h:sys_clone()'s inline assembly.
|
||||
@@ -893,7 +894,6 @@ if (is_linux || is_chromeos || is_androi
|
||||
@@ -871,7 +872,6 @@ if (is_linux || is_chromeos || is_androi
|
||||
"breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
|
||||
"breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
|
||||
"breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
|
||||
|
|
|
|||
12
fix-clang-selection.patch
Normal file
12
fix-clang-selection.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
Index: chromium-128.0.6613.113/build/config/BUILDCONFIG.gn
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/build/config/BUILDCONFIG.gn
|
||||
+++ chromium-128.0.6613.113/build/config/BUILDCONFIG.gn
|
||||
@@ -138,7 +138,6 @@ declare_args() {
|
||||
# Set to true when compiling with the Clang compiler.
|
||||
is_clang = current_os != "linux" ||
|
||||
(current_cpu != "s390x" && current_cpu != "s390" &&
|
||||
- current_cpu != "ppc64" && current_cpu != "ppc" &&
|
||||
current_cpu != "mips" && current_cpu != "mips64" &&
|
||||
current_cpu != "riscv64")
|
||||
|
||||
|
|
@ -24,11 +24,11 @@ inconsistency in data layouts when targeting this particular platform.
|
|||
The error reported by the linker is not technically an error, however, only
|
||||
a warning goosed up by a --fatal-warnings flag.
|
||||
|
||||
Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn
|
||||
Index: chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/build/config/compiler/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/build/config/compiler/BUILD.gn
|
||||
@@ -470,7 +470,7 @@ config("compiler") {
|
||||
--- chromium-128.0.6613.113.orig/build/config/compiler/BUILD.gn
|
||||
+++ chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||
@@ -380,7 +380,7 @@ config("compiler") {
|
||||
|
||||
# Linker warnings.
|
||||
if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
Index: chromium-144.0.7559.59/base/allocator/dispatcher/tls.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/allocator/dispatcher/tls.h
|
||||
+++ chromium-144.0.7559.59/base/allocator/dispatcher/tls.h
|
||||
@@ -88,6 +88,8 @@ struct BASE_EXPORT MMapAllocator {
|
||||
constexpr static size_t AllocationChunkSize = 16384;
|
||||
#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
constexpr static size_t AllocationChunkSize = 16384;
|
||||
+#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_PPC64)
|
||||
+ constexpr static size_t AllocationChunkSize = 16384;
|
||||
#else
|
||||
constexpr static size_t AllocationChunkSize = 4096;
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
|
||||
+++ chromium-144.0.7559.59/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
|
||||
@@ -399,7 +399,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDir
|
||||
// TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation
|
||||
// where a normal slot span will be large enough to contain multiple items,
|
||||
// but the address will go over the final partition page after being aligned.
|
||||
-#if PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)
|
||||
+#if PA_BUILDFLAG(IS_LINUX) && (PA_BUILDFLAG(PA_ARCH_CPU_ARM64) || PA_BUILDFLAG(PA_ARCH_CPU_PPC64))
|
||||
constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 4;
|
||||
#else
|
||||
constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 2;
|
||||
|
|
@ -1,15 +1,16 @@
|
|||
kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni
|
||||
===================================================================
|
||||
Index: chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni
|
||||
Index: chromium-128.0.6613.113/base/allocator/partition_allocator/partition_alloc.gni
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/base/allocator/partition_allocator/partition_alloc.gni
|
||||
+++ chromium-144.0.7559.59/base/allocator/partition_allocator/partition_alloc.gni
|
||||
@@ -71,7 +71,7 @@ is_clang_or_gcc = is_clang || !is_win
|
||||
# Whether 64-bit pointers are used.
|
||||
# A static_assert in partition_alloc_config.h verifies that.
|
||||
if (current_cpu == "x64" || current_cpu == "arm64" || current_cpu == "arm64e" ||
|
||||
- current_cpu == "loong64" || current_cpu == "riscv64") {
|
||||
+ current_cpu == "loong64" || current_cpu == "riscv64" || current_cpu == "ppc64") {
|
||||
assert(current_cpu != "arm64e" || (is_ios && target_environment == "device"))
|
||||
--- chromium-128.0.6613.113.orig/base/allocator/partition_allocator/partition_alloc.gni
|
||||
+++ chromium-128.0.6613.113/base/allocator/partition_allocator/partition_alloc.gni
|
||||
@@ -19,7 +19,8 @@ if (is_nacl) {
|
||||
# NaCl targets don't use 64-bit pointers.
|
||||
has_64_bit_pointers = false
|
||||
} else if (current_cpu == "x64" || current_cpu == "arm64" ||
|
||||
- current_cpu == "loong64" || current_cpu == "riscv64") {
|
||||
+ current_cpu == "loong64" || current_cpu == "riscv64" ||
|
||||
+ current_cpu == "ppc64") {
|
||||
has_64_bit_pointers = true
|
||||
} else if (current_cpu == "x86" || current_cpu == "arm" ||
|
||||
} else if (current_cpu == "x86" || current_cpu == "arm") {
|
||||
has_64_bit_pointers = false
|
||||
|
|
|
|||
23
fix-ppc64-linux-syscalls-headers.patch
Normal file
23
fix-ppc64-linux-syscalls-headers.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||
===================================================================
|
||||
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||
@@ -8,5 +8,18 @@
|
||||
#include <asm/unistd.h>
|
||||
|
||||
//TODO: is it necessary to redefine syscall numbers for PPC64?
|
||||
+// Needed for Ubuntu/Debian/Centos/RHEL:
|
||||
+#if !defined(__NR_shmget)
|
||||
+#define __NR_shmget 395
|
||||
+#endif
|
||||
+#if !defined(__NR_shmdt)
|
||||
+#define __NR_shmdt 398
|
||||
+#endif
|
||||
+#if !defined(__NR_shmctl)
|
||||
+#define __NR_shmctl 396
|
||||
+#endif
|
||||
+#if !defined(__NR_shmat)
|
||||
+#define __NR_shmat 397
|
||||
+#endif
|
||||
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||
11
fix-ppc64-rust_png-build-error.patch
Normal file
11
fix-ppc64-rust_png-build-error.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up chromium-135.0.7049.52/third_party/skia/experimental/rust_png/ffi/FFI.h.than chromium-135.0.7049.52/third_party/skia/experimental/rust_png/ffi/FFI.h
|
||||
--- chromium-135.0.7049.52/third_party/skia/experimental/rust_png/ffi/FFI.h.than 2025-04-03 12:00:57.623069853 +0200
|
||||
+++ chromium-135.0.7049.52/third_party/skia/experimental/rust_png/ffi/FFI.h 2025-04-03 12:02:42.234420632 +0200
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
+#include <memory>
|
||||
|
||||
// TODO(https://crbug.com/356698922): Use a real `#include` if possible.
|
||||
namespace rust {
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
Index: chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
|
||||
Index: chromium-128.0.6613.113/build/toolchain/gcc_toolchain.gni
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/build/toolchain/gcc_toolchain.gni
|
||||
+++ chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
|
||||
@@ -415,7 +415,13 @@ template("single_gcc_toolchain") {
|
||||
--- chromium-128.0.6613.113.orig/build/toolchain/gcc_toolchain.gni
|
||||
+++ chromium-128.0.6613.113/build/toolchain/gcc_toolchain.gni
|
||||
@@ -441,7 +441,13 @@ template("single_gcc_toolchain") {
|
||||
# -soname flag is not available on aix ld
|
||||
soname_flag = "-Wl,-soname=\"$soname\""
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ Index: chromium-144.0.7559.59/build/toolchain/gcc_toolchain.gni
|
|||
|
||||
# Generate a map file to be used for binary size analysis.
|
||||
# Map file adds ~10% to the link time on a z620.
|
||||
@@ -527,7 +533,13 @@ template("single_gcc_toolchain") {
|
||||
@@ -553,7 +559,13 @@ template("single_gcc_toolchain") {
|
||||
whole_archive_flag = "-Wl,--whole-archive"
|
||||
no_whole_archive_flag = "-Wl,--no-whole-archive"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
author: Andres Salomon <dilinger@debian.org>
|
||||
description: allow ppc64le to build by using proper rustc target
|
||||
Index: chromium-144.0.7559.59/build/config/rust.gni
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/build/config/rust.gni
|
||||
+++ chromium-144.0.7559.59/build/config/rust.gni
|
||||
@@ -186,6 +186,9 @@ rust_abi_target = ""
|
||||
if (is_linux || is_chromeos) {
|
||||
diff -up chromium-131.0.6778.69/build/config/rust.gni.fix-rustc chromium-131.0.6778.69/build/config/rust.gni
|
||||
--- chromium-131.0.6778.69/build/config/rust.gni.fix-rustc 2024-11-12 22:48:45.000000000 +0100
|
||||
+++ chromium-131.0.6778.69/build/config/rust.gni 2024-11-19 23:01:25.484436409 +0100
|
||||
@@ -200,6 +200,9 @@ if (is_linux || is_chromeos) {
|
||||
if (current_cpu == "arm64") {
|
||||
rust_abi_target = "aarch64-unknown-linux-gnu"
|
||||
cargo_target_abi = ""
|
||||
+ } else if (current_cpu == "ppc64") {
|
||||
+ rust_abi_target = "powerpc64le-unknown-linux-gnu"
|
||||
+ cargo_target_abi = ""
|
||||
} else if (current_cpu == "x86") {
|
||||
rust_abi_target = "i686-unknown-linux-gnu"
|
||||
} else if (current_cpu == "x64") {
|
||||
cargo_target_abi = ""
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
Index: chromium-144.0.7559.59/components/variations/proto/study.proto
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/components/variations/proto/study.proto
|
||||
+++ chromium-144.0.7559.59/components/variations/proto/study.proto
|
||||
@@ -293,6 +293,9 @@ message Study {
|
||||
--- a/components/variations/proto/study.proto
|
||||
+++ b/components/variations/proto/study.proto
|
||||
@@ -264,6 +264,9 @@
|
||||
// A Mac-only value, indicating an x86-64 binary running on an arm64 host
|
||||
// via "Rosetta 2" binary translation.
|
||||
TRANSLATED_X86_64 = 4;
|
||||
|
|
@ -12,11 +10,9 @@ Index: chromium-144.0.7559.59/components/variations/proto/study.proto
|
|||
}
|
||||
|
||||
// Enum to pass as optional bool.
|
||||
Index: chromium-144.0.7559.59/components/variations/service/variations_field_trial_creator.cc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/components/variations/service/variations_field_trial_creator.cc
|
||||
+++ chromium-144.0.7559.59/components/variations/service/variations_field_trial_creator.cc
|
||||
@@ -108,6 +108,9 @@ Study::CpuArchitecture GetCurrentCpuArch
|
||||
--- a/components/variations/service/variations_field_trial_creator_base.cc
|
||||
+++ b/components/variations/service/variations_field_trial_creator_base.cc
|
||||
@@ -109,6 +109,9 @@
|
||||
if (process_arch == "x86") {
|
||||
return Study::X86_32;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn
|
||||
Index: chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/build/config/compiler/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/build/config/compiler/BUILD.gn
|
||||
@@ -2129,7 +2129,9 @@ config("default_warnings") {
|
||||
--- chromium-128.0.6613.113.orig/build/config/compiler/BUILD.gn
|
||||
+++ chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||
@@ -1844,7 +1844,7 @@ config("default_warnings") {
|
||||
|
||||
# -Wno-class-memaccess warns about hash table and vector in blink.
|
||||
# But the violation is intentional.
|
||||
- if (!is_nacl) {
|
||||
+ if ((!is_nacl) && (current_cpu != "ppc64")) {
|
||||
cflags_cc += [ "-Wno-class-memaccess" ]
|
||||
}
|
||||
|
||||
@@ -1854,7 +1854,9 @@ config("default_warnings") {
|
||||
|
||||
# Don't warn about "maybe" uninitialized. Clang doesn't include this
|
||||
# in -Wall but gcc does, and it gives false positives.
|
||||
|
|
@ -13,7 +22,7 @@ Index: chromium-144.0.7559.59/build/config/compiler/BUILD.gn
|
|||
cflags += [ "-Wno-deprecated-declarations" ]
|
||||
|
||||
# -Wcomment gives too many false positives in the case a
|
||||
@@ -2140,7 +2142,9 @@ config("default_warnings") {
|
||||
@@ -1865,7 +1867,9 @@ config("default_warnings") {
|
||||
|
||||
# -Wpacked-not-aligned complains all generated mojom-shared-internal.h
|
||||
# files.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c82dcae326090d3b7e31694a7e229f536ead56b7 Mon Sep 17 00:00:00 2001
|
||||
From 1915558377f7dc194ff2238c79b70ceacd88f474 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Gonzalez <rymg19@gmail.com>
|
||||
Date: Tue, 17 Mar 2020 13:18:27 -0500
|
||||
Subject: [PATCH] flatpak: Add initial sandbox support
|
||||
|
|
@ -30,10 +30,10 @@ Subject: [PATCH] flatpak: Add initial sandbox support
|
|||
create mode 100644 sandbox/linux/services/flatpak_sandbox.h
|
||||
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
index 22985d0edf211..62631942103f0 100644
|
||||
index 375db3d02ce28..1eee661c2bed4 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -79,6 +79,7 @@ vs-chromium-project.txt
|
||||
@@ -75,6 +75,7 @@ vs-chromium-project.txt
|
||||
/.android_emulator/
|
||||
/.clangd/
|
||||
/.clangd-index/
|
||||
|
|
@ -42,10 +42,10 @@ index 22985d0edf211..62631942103f0 100644
|
|||
/.externalToolBuilders/
|
||||
/.settings/
|
||||
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
|
||||
index 7739b7379ba67..01d99a3ac5772 100644
|
||||
index 56ddbc2d4fa33..736a06ab1d673 100644
|
||||
--- a/base/threading/thread_restrictions.h
|
||||
+++ b/base/threading/thread_restrictions.h
|
||||
@@ -410,6 +410,9 @@ class ScopedAllowThreadJoinForWebRtcTransport;
|
||||
@@ -405,6 +405,9 @@ class ScopedAllowThreadJoinForWebRtcTransport;
|
||||
namespace rlz_lib {
|
||||
class FinancialPing;
|
||||
}
|
||||
|
|
@ -63,7 +63,7 @@ index 7739b7379ba67..01d99a3ac5772 100644
|
|||
friend class ui::DrmDisplayHostManager;
|
||||
friend class ui::ScopedAllowBlockingForGbmSurface;
|
||||
friend class ui::SelectFileDialogLinux;
|
||||
@@ -780,6 +784,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
|
||||
@@ -783,6 +787,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
|
||||
friend class rlz_lib::FinancialPing;
|
||||
friend class shell_integration_linux::
|
||||
LaunchXdgUtilityScopedAllowBaseSyncPrimitives;
|
||||
|
|
@ -125,10 +125,10 @@ index 1174a704b8126..e7fd738b705fb 100644
|
|||
status & sandbox::policy::SandboxLinux::kNetNS;
|
||||
// A second-layer sandbox is also required to be adequately sandboxed.
|
||||
diff --git a/content/browser/child_process_host_impl.cc b/content/browser/child_process_host_impl.cc
|
||||
index 685af654e0832..cb2d7fb0966d1 100644
|
||||
index 583a386414590..c1cf93992da5b 100644
|
||||
--- a/content/browser/child_process_host_impl.cc
|
||||
+++ b/content/browser/child_process_host_impl.cc
|
||||
@@ -37,6 +37,7 @@
|
||||
@@ -46,6 +46,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
#include "base/linux_util.h"
|
||||
|
|
@ -136,7 +136,7 @@ index 685af654e0832..cb2d7fb0966d1 100644
|
|||
#elif BUILDFLAG(IS_MAC)
|
||||
#include "base/apple/foundation_util.h"
|
||||
#include "content/browser/mac_helpers.h"
|
||||
@@ -62,7 +63,12 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
|
||||
@@ -72,7 +73,12 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
// Use /proc/self/exe rather than our known binary path so updates
|
||||
// can't swap out the binary from underneath us.
|
||||
|
|
@ -151,10 +151,10 @@ index 685af654e0832..cb2d7fb0966d1 100644
|
|||
}
|
||||
#endif
|
||||
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
||||
index 5707dd93fd5e9..c87e1248171cf 100644
|
||||
index e84c86a30d504..595a469c765a6 100644
|
||||
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
|
||||
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/posix/unix_domain_socket.h"
|
||||
#include "base/process/kill.h"
|
||||
|
|
@ -162,7 +162,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
#include "base/process/memory.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/types/fixed_array.h"
|
||||
@@ -22,6 +23,7 @@
|
||||
@@ -26,6 +27,7 @@
|
||||
#include "content/common/zygote/zygote_handle_impl_linux.h"
|
||||
#include "content/public/common/zygote/zygote_handle.h"
|
||||
#include "sandbox/linux/services/credentials.h"
|
||||
|
|
@ -170,7 +170,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
#include "sandbox/linux/services/namespace_sandbox.h"
|
||||
#include "sandbox/linux/suid/client/setuid_sandbox_host.h"
|
||||
#include "sandbox/linux/suid/common/sandbox.h"
|
||||
@@ -72,6 +74,7 @@ ZygoteHostImpl::ZygoteHostImpl()
|
||||
@@ -76,6 +78,7 @@ ZygoteHostImpl::ZygoteHostImpl()
|
||||
: use_namespace_sandbox_(false),
|
||||
use_suid_sandbox_(false),
|
||||
use_suid_sandbox_for_adj_oom_score_(false),
|
||||
|
|
@ -178,7 +178,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
sandbox_binary_(),
|
||||
zygote_pids_lock_(),
|
||||
zygote_pids_() {}
|
||||
@@ -110,9 +113,12 @@ void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
|
||||
@@ -114,9 +117,12 @@ void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
|
||||
sandbox_binary_ = setuid_sandbox_host->GetSandboxBinaryPath().value();
|
||||
}
|
||||
|
||||
|
|
@ -194,7 +194,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
use_namespace_sandbox_ = true;
|
||||
} else if (!command_line.HasSwitch(
|
||||
sandbox::policy::switches::kDisableSetuidSandbox) &&
|
||||
@@ -183,10 +189,16 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
@@ -187,10 +193,16 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
sandbox_host->SetupLaunchEnvironment();
|
||||
}
|
||||
|
||||
|
|
@ -215,7 +215,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
CHECK(process.IsValid()) << "Failed to launch zygote process";
|
||||
|
||||
dummy_fd.reset();
|
||||
@@ -195,7 +207,8 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
@@ -199,7 +211,8 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
|
||||
pid_t pid = process.Pid();
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
// The namespace and SUID sandbox will execute the zygote in a new
|
||||
// PID namespace, and the main zygote process will then fork from
|
||||
// there. Watch now our elaborate dance to find and validate the
|
||||
@@ -223,7 +236,11 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
@@ -227,7 +240,11 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
|
||||
if (real_pid != pid) {
|
||||
// Reap the sandbox.
|
||||
|
|
@ -238,7 +238,7 @@ index 5707dd93fd5e9..c87e1248171cf 100644
|
|||
}
|
||||
pid = real_pid;
|
||||
}
|
||||
@@ -274,6 +291,10 @@ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
|
||||
@@ -278,6 +295,10 @@ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
|
||||
selinux_valid = true;
|
||||
}
|
||||
|
||||
|
|
@ -262,10 +262,10 @@ index 8ef884a7db6f4..f441900dd6343 100644
|
|||
|
||||
// This lock protects the |zygote_pids_| set.
|
||||
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc
|
||||
index c90abfaf2e346..5b9cb3e1bd313 100644
|
||||
index f2c3b43281d53..9f3f3f6b1bc12 100644
|
||||
--- a/content/zygote/zygote_linux.cc
|
||||
+++ b/content/zygote/zygote_linux.cc
|
||||
@@ -122,7 +122,7 @@ bool Zygote::ProcessRequests() {
|
||||
@@ -126,7 +126,7 @@ bool Zygote::ProcessRequests() {
|
||||
PCHECK(sigaddset(&sigset, SIGCHLD) == 0);
|
||||
PCHECK(sigprocmask(SIG_BLOCK, &sigset, &orig_sigmask) == 0);
|
||||
|
||||
|
|
@ -274,7 +274,7 @@ index c90abfaf2e346..5b9cb3e1bd313 100644
|
|||
// Let the ZygoteHost know we are ready to go.
|
||||
// The receiving code is in
|
||||
// content/browser/zygote_host/zygote_host_impl_linux.cc.
|
||||
@@ -227,6 +227,10 @@ bool Zygote::UsingNSSandbox() const {
|
||||
@@ -231,6 +231,10 @@ bool Zygote::UsingNSSandbox() const {
|
||||
return sandbox_flags_ & sandbox::policy::SandboxLinux::kUserNS;
|
||||
}
|
||||
|
||||
|
|
@ -362,10 +362,10 @@ index c7ee91878e6dd..9c2c7a04bd968 100644
|
|||
base::GlobalDescriptors::Descriptor(
|
||||
static_cast<uint32_t>(kSandboxIPCChannel), GetSandboxFD()));
|
||||
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
|
||||
index 478194aaf43a8..c97710907565e 100644
|
||||
index 4eac178764a41..8bd0de35f246f 100644
|
||||
--- a/sandbox/linux/BUILD.gn
|
||||
+++ b/sandbox/linux/BUILD.gn
|
||||
@@ -303,6 +303,10 @@ if (is_linux || is_chromeos) {
|
||||
@@ -309,6 +309,10 @@ if (is_linux || is_chromeos) {
|
||||
|
||||
component("sandbox_services") {
|
||||
sources = [
|
||||
|
|
@ -376,7 +376,7 @@ index 478194aaf43a8..c97710907565e 100644
|
|||
"services/init_process_reaper.cc",
|
||||
"services/init_process_reaper.h",
|
||||
"services/proc_util.cc",
|
||||
@@ -321,8 +325,10 @@ component("sandbox_services") {
|
||||
@@ -327,8 +331,10 @@ component("sandbox_services") {
|
||||
|
||||
defines = [ "SANDBOX_IMPLEMENTATION" ]
|
||||
|
||||
|
|
@ -506,7 +506,7 @@ index 0000000000000..22799eb42f782
|
|||
+#endif
|
||||
diff --git a/sandbox/linux/services/flatpak_sandbox.cc b/sandbox/linux/services/flatpak_sandbox.cc
|
||||
new file mode 100644
|
||||
index 0000000000000..c854f32b185a3
|
||||
index 0000000000000..b5da5a5801fde
|
||||
--- /dev/null
|
||||
+++ b/sandbox/linux/services/flatpak_sandbox.cc
|
||||
@@ -0,0 +1,576 @@
|
||||
|
|
@ -756,7 +756,7 @@ index 0000000000000..c854f32b185a3
|
|||
+ options.connection_type = dbus::Bus::PRIVATE;
|
||||
+ options.dbus_task_runner = base::SequencedTaskRunner::GetCurrentDefault();
|
||||
+
|
||||
+ return base::MakeRefCounted<dbus::Bus>(std::move(options));
|
||||
+ return base::MakeRefCounted<dbus::Bus>(options);
|
||||
+ }());
|
||||
+
|
||||
+ return bus->get();
|
||||
|
|
@ -1211,10 +1211,10 @@ index 0000000000000..167bbc85945ad
|
|||
+
|
||||
+#endif // SANDBOX_LINUX_SERVICES_FLATPAK_SANDBOX_H_
|
||||
diff --git a/sandbox/policy/BUILD.gn b/sandbox/policy/BUILD.gn
|
||||
index 1a3c7c6cf8b15..4c1b121160df6 100644
|
||||
index 793c68d50e59f..b44c986fd72ab 100644
|
||||
--- a/sandbox/policy/BUILD.gn
|
||||
+++ b/sandbox/policy/BUILD.gn
|
||||
@@ -118,6 +118,9 @@ component("policy") {
|
||||
@@ -114,6 +114,9 @@ component("policy") {
|
||||
"//sandbox/linux:suid_sandbox_client",
|
||||
]
|
||||
}
|
||||
|
|
@ -1225,10 +1225,10 @@ index 1a3c7c6cf8b15..4c1b121160df6 100644
|
|||
sources += [
|
||||
"linux/bpf_ime_policy_linux.cc",
|
||||
diff --git a/sandbox/policy/linux/sandbox_linux.cc b/sandbox/policy/linux/sandbox_linux.cc
|
||||
index 714cb2e115b84..e85a3fb68ee90 100644
|
||||
index 427604b2b8a00..7384c01cc9123 100644
|
||||
--- a/sandbox/policy/linux/sandbox_linux.cc
|
||||
+++ b/sandbox/policy/linux/sandbox_linux.cc
|
||||
@@ -35,6 +35,7 @@
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "sandbox/constants.h"
|
||||
#include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
|
||||
#include "sandbox/linux/services/credentials.h"
|
||||
|
|
@ -1236,7 +1236,7 @@ index 714cb2e115b84..e85a3fb68ee90 100644
|
|||
#include "sandbox/linux/services/libc_interceptor.h"
|
||||
#include "sandbox/linux/services/namespace_sandbox.h"
|
||||
#include "sandbox/linux/services/proc_util.h"
|
||||
@@ -220,6 +221,9 @@ void SandboxLinux::PreinitializeSandbox() {
|
||||
@@ -231,6 +232,9 @@ void SandboxLinux::PreinitializeSandbox() {
|
||||
const int yama_status = Yama::GetStatus();
|
||||
yama_is_enforcing_ = (yama_status & Yama::STATUS_PRESENT) &&
|
||||
(yama_status & Yama::STATUS_ENFORCING);
|
||||
|
|
@ -1246,7 +1246,7 @@ index 714cb2e115b84..e85a3fb68ee90 100644
|
|||
pre_initialized_ = true;
|
||||
}
|
||||
|
||||
@@ -258,6 +262,10 @@ int SandboxLinux::GetStatus() {
|
||||
@@ -269,6 +273,10 @@ int SandboxLinux::GetStatus() {
|
||||
sandbox_status_flags_ |= kPIDNS;
|
||||
if (NamespaceSandbox::InNewNetNamespace())
|
||||
sandbox_status_flags_ |= kNetNS;
|
||||
|
|
@ -1256,9 +1256,9 @@ index 714cb2e115b84..e85a3fb68ee90 100644
|
|||
+ sandbox_status_flags_ |= kFlatpak | kPIDNS | kNetNS;
|
||||
}
|
||||
|
||||
// We report whether the sandbox will be activated when renderers and
|
||||
// We report whether the sandbox will be activated when renderers, workers
|
||||
diff --git a/sandbox/policy/linux/sandbox_linux.h b/sandbox/policy/linux/sandbox_linux.h
|
||||
index 76e20d21b71d3..3339b852fc948 100644
|
||||
index 0e4f78b9e6cb7..91b638d8a96e0 100644
|
||||
--- a/sandbox/policy/linux/sandbox_linux.h
|
||||
+++ b/sandbox/policy/linux/sandbox_linux.h
|
||||
@@ -13,6 +13,7 @@
|
||||
|
|
@ -1279,7 +1279,7 @@ index 76e20d21b71d3..3339b852fc948 100644
|
|||
// A flag that denotes an invalid sandbox status.
|
||||
kInvalid = 1 << 31,
|
||||
};
|
||||
@@ -289,6 +293,10 @@ class SANDBOX_POLICY_EXPORT SandboxLinux {
|
||||
@@ -292,6 +296,10 @@ class SANDBOX_POLICY_EXPORT SandboxLinux {
|
||||
bool seccomp_bpf_with_tsync_supported_; // Accurate if pre_initialized_.
|
||||
bool yama_is_enforcing_; // Accurate if pre_initialized_.
|
||||
bool initialize_sandbox_ran_; // InitializeSandbox() was called.
|
||||
|
|
@ -1291,10 +1291,10 @@ index 76e20d21b71d3..3339b852fc948 100644
|
|||
#if BUILDFLAG(USING_SANITIZER)
|
||||
std::unique_ptr<__sanitizer_sandbox_arguments> sanitizer_args_;
|
||||
diff --git a/services/service_manager/service_process_launcher.cc b/services/service_manager/service_process_launcher.cc
|
||||
index 60484255e653b..797f3b9ad6cd8 100644
|
||||
index bb99780fb878d..4dcdee34d2338 100644
|
||||
--- a/services/service_manager/service_process_launcher.cc
|
||||
+++ b/services/service_manager/service_process_launcher.cc
|
||||
@@ -41,6 +41,7 @@
|
||||
@@ -40,6 +40,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
|
@ -1302,7 +1302,7 @@ index 60484255e653b..797f3b9ad6cd8 100644
|
|||
#include "sandbox/linux/services/namespace_sandbox.h"
|
||||
#endif
|
||||
|
||||
@@ -286,8 +287,15 @@ void ServiceProcessLauncher::ProcessState::StopInBackground() {
|
||||
@@ -285,8 +286,15 @@ void ServiceProcessLauncher::ProcessState::StopInBackground() {
|
||||
return;
|
||||
|
||||
int rv = -1;
|
||||
|
|
@ -1321,5 +1321,5 @@ index 60484255e653b..797f3b9ad6cd8 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.51.2
|
||||
2.47.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 4cf3b38a276a3963a356d22ffa01b1ca07c686ee Mon Sep 17 00:00:00 2001
|
||||
From e7fd5c3a43aed07cf0a1561c408b631090be8374 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Gonzalez <rymg19@gmail.com>
|
||||
Date: Tue, 25 Aug 2020 19:26:07 -0500
|
||||
Subject: [PATCH] flatpak: Adjust paths for the sandbox
|
||||
|
|
@ -9,10 +9,10 @@ Subject: [PATCH] flatpak: Adjust paths for the sandbox
|
|||
2 files changed, 29 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
|
||||
index 45a080086dfd8..ef631e6ad5f80 100644
|
||||
index 40e1d1c431dd0..e4a19c80e1afc 100644
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -614,6 +614,10 @@ static_library("constants") {
|
||||
@@ -621,6 +621,10 @@ static_library("constants") {
|
||||
"//third_party/widevine/cdm:headers",
|
||||
]
|
||||
}
|
||||
|
|
@ -24,10 +24,10 @@ index 45a080086dfd8..ef631e6ad5f80 100644
|
|||
|
||||
# Use a static library here because many test binaries depend on this but don't
|
||||
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
|
||||
index 9c4d73b730baa..318d3eef58979 100644
|
||||
index 6476c59ba6378..9f1b950b14adc 100644
|
||||
--- a/chrome/common/chrome_paths.cc
|
||||
+++ b/chrome/common/chrome_paths.cc
|
||||
@@ -39,6 +39,10 @@
|
||||
@@ -38,6 +38,10 @@
|
||||
#include "base/win/registry.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ index 9c4d73b730baa..318d3eef58979 100644
|
|||
#if BUILDFLAG(ENABLE_WIDEVINE)
|
||||
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
|
||||
#endif
|
||||
@@ -407,6 +411,14 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -502,6 +506,14 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
#endif
|
||||
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
|
||||
case chrome::DIR_POLICY_FILES: {
|
||||
|
|
@ -53,7 +53,7 @@ index 9c4d73b730baa..318d3eef58979 100644
|
|||
cur = base::FilePath(policy::kPolicyPath);
|
||||
break;
|
||||
}
|
||||
@@ -423,7 +435,13 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -518,7 +530,13 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
#endif
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
|
||||
|
|
@ -68,7 +68,7 @@ index 9c4d73b730baa..318d3eef58979 100644
|
|||
break;
|
||||
}
|
||||
#endif
|
||||
@@ -471,6 +489,12 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -565,6 +583,12 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
"/Library/Application Support/Chromium/NativeMessagingHosts"));
|
||||
#endif
|
||||
#else // BUILDFLAG(IS_MAC)
|
||||
|
|
@ -82,5 +82,5 @@ index 9c4d73b730baa..318d3eef58979 100644
|
|||
cur = base::FilePath(
|
||||
FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
|
||||
--
|
||||
2.51.2
|
||||
2.47.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 895ee4ca3d52eee03c9604465ad5e90591969d64 Mon Sep 17 00:00:00 2001
|
||||
From c5330fa947e1db2db4055994e0da993620f2b5ef Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Gonzalez <rymg19@gmail.com>
|
||||
Date: Tue, 17 Nov 2020 13:00:39 -0600
|
||||
Subject: [PATCH] flatpak: Expose Widevine into the sandbox
|
||||
|
|
@ -10,12 +10,12 @@ Subject: [PATCH] flatpak: Expose Widevine into the sandbox
|
|||
3 files changed, 131 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
||||
index c87e1248171cf..11f17a19ff949 100644
|
||||
index 595a469c765a6..56cbbb33addde 100644
|
||||
--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
|
||||
+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
|
||||
@@ -10,7 +10,10 @@
|
||||
@@ -14,7 +14,10 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/files/file_enumerator.h"
|
||||
+#include "base/files/file_util.h"
|
||||
#include "base/logging.h"
|
||||
|
|
@ -24,7 +24,7 @@ index c87e1248171cf..11f17a19ff949 100644
|
|||
#include "base/posix/unix_domain_socket.h"
|
||||
#include "base/process/kill.h"
|
||||
#include "base/process/launch.h"
|
||||
@@ -18,9 +21,12 @@
|
||||
@@ -22,9 +25,12 @@
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/types/fixed_array.h"
|
||||
#include "build/build_config.h"
|
||||
|
|
@ -37,7 +37,7 @@ index c87e1248171cf..11f17a19ff949 100644
|
|||
#include "content/public/common/zygote/zygote_handle.h"
|
||||
#include "sandbox/linux/services/credentials.h"
|
||||
#include "sandbox/linux/services/flatpak_sandbox.h"
|
||||
@@ -29,6 +35,7 @@
|
||||
@@ -33,6 +39,7 @@
|
||||
#include "sandbox/linux/suid/common/sandbox.h"
|
||||
#include "sandbox/policy/linux/sandbox_linux.h"
|
||||
#include "sandbox/policy/switches.h"
|
||||
|
|
@ -45,7 +45,7 @@ index c87e1248171cf..11f17a19ff949 100644
|
|||
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
#include "content/common/zygote/zygote_communication_linux.h"
|
||||
@@ -193,8 +200,51 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
@@ -197,8 +204,51 @@ pid_t ZygoteHostImpl::LaunchZygote(
|
||||
if (is_sandboxed_zygote && use_namespace_sandbox_) {
|
||||
process = sandbox::NamespaceSandbox::LaunchProcess(*cmd_line, options);
|
||||
} else if (is_sandboxed_zygote && use_flatpak_sandbox_) {
|
||||
|
|
@ -100,7 +100,7 @@ index c87e1248171cf..11f17a19ff949 100644
|
|||
process = base::LaunchProcess(*cmd_line, options);
|
||||
}
|
||||
diff --git a/sandbox/linux/services/flatpak_sandbox.cc b/sandbox/linux/services/flatpak_sandbox.cc
|
||||
index c854f32b185a3..bcfd8df2e3cb5 100644
|
||||
index b5da5a5801fde..7c9205e7bf602 100644
|
||||
--- a/sandbox/linux/services/flatpak_sandbox.cc
|
||||
+++ b/sandbox/linux/services/flatpak_sandbox.cc
|
||||
@@ -4,6 +4,7 @@
|
||||
|
|
@ -322,5 +322,5 @@ index 167bbc85945ad..de8e7165b4573 100644
|
|||
base::WaitableEvent* event,
|
||||
dbus::Response* response,
|
||||
--
|
||||
2.51.2
|
||||
2.47.1
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Index: chromium-127.0.6533.88/base/allocator/partition_allocator/src/partition_a
|
|||
partition_page_count <= kMaxPartitionPagesPerRegularSlotSpan;
|
||||
partition_page_count++) {
|
||||
size_t candidate_size = partition_page_count * PartitionPageSize();
|
||||
+ if (candidate_size > BucketIndexLookup::kMaxBucketSize) {
|
||||
+ if (candidate_size > kMaxBucketed) {
|
||||
+ break;
|
||||
+ }
|
||||
size_t waste = candidate_size % slot_size;
|
||||
|
|
@ -16,7 +16,7 @@ Index: chromium-127.0.6533.88/base/allocator/partition_allocator/src/partition_a
|
|||
size_t system_page_count =
|
||||
partition_page_count * NumSystemPagesPerPartitionPage() - slack;
|
||||
size_t candidate_size = system_page_count * SystemPageSize();
|
||||
+ if (candidate_size > BucketIndexLookup::kMaxBucketSize) {
|
||||
+ if (candidate_size > kMaxBucketed) {
|
||||
+ continue;
|
||||
+ }
|
||||
size_t waste = candidate_size % slot_size;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Index: chromium-144.0.7559.59/third_party/skia/BUILD.gn
|
||||
Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/skia/BUILD.gn
|
||||
@@ -199,6 +199,12 @@ opts("lasx") {
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/BUILD.gn
|
||||
+++ chromium-136.0.7103.48/third_party/skia/BUILD.gn
|
||||
@@ -193,6 +193,12 @@ opts("lasx") {
|
||||
cflags = [ "-mlasx" ]
|
||||
}
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ Index: chromium-144.0.7559.59/third_party/skia/BUILD.gn
|
|||
# Any feature of Skia that requires third-party code should be optional and use this template.
|
||||
template("optional") {
|
||||
if (invoker.enabled) {
|
||||
@@ -1700,6 +1706,7 @@ skia_component("skia") {
|
||||
@@ -1651,6 +1657,7 @@ skia_component("skia") {
|
||||
":skx",
|
||||
":typeface_fontations",
|
||||
":vello",
|
||||
|
|
@ -23,11 +23,23 @@ Index: chromium-144.0.7559.59/third_party/skia/BUILD.gn
|
|||
":webp_decode",
|
||||
":wuffs",
|
||||
":xml",
|
||||
Index: chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn
|
||||
@@ -1822,7 +1829,10 @@ skia_static_library("pathkit") {
|
||||
public_configs = [ ":skia_public" ]
|
||||
configs = skia_library_configs
|
||||
|
||||
- deps = [ ":hsw" ]
|
||||
+ deps = [
|
||||
+ ":hsw",
|
||||
+ ":vsx",
|
||||
+ ]
|
||||
|
||||
sources = []
|
||||
sources += skia_pathops_sources
|
||||
Index: chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/gn/skia/BUILD.gn
|
||||
+++ chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn
|
||||
@@ -142,6 +142,8 @@ config("default") {
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/gn/skia/BUILD.gn
|
||||
+++ chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
|
||||
@@ -175,6 +175,8 @@ config("default") {
|
||||
"-mfpmath=sse",
|
||||
]
|
||||
ldflags += [ "-m32" ]
|
||||
|
|
@ -36,11 +48,11 @@ Index: chromium-144.0.7559.59/third_party/skia/gn/skia/BUILD.gn
|
|||
} else if (current_cpu == "loong64") {
|
||||
cflags += [
|
||||
"-mlsx",
|
||||
Index: chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/include/core/SkTypes.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h
|
||||
@@ -198,4 +198,43 @@ static constexpr uint32_t SK_InvalidGenI
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/include/core/SkTypes.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
|
||||
@@ -188,4 +188,43 @@ static constexpr uint32_t SK_InvalidGenI
|
||||
*/
|
||||
static constexpr uint32_t SK_InvalidUniqueID = 0;
|
||||
|
||||
|
|
@ -84,10 +96,10 @@ Index: chromium-144.0.7559.59/third_party/skia/include/core/SkTypes.h
|
|||
+#endif
|
||||
+
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/base/SkSpinlock.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/base/SkSpinlock.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
|
||||
@@ -33,7 +33,8 @@
|
||||
#endif
|
||||
|
||||
|
|
@ -98,10 +110,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/base/SkSpinlock.cpp
|
|||
#include <emmintrin.h>
|
||||
static void do_pause() { _mm_pause(); }
|
||||
#else
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||
@@ -21,7 +21,13 @@
|
||||
// The rest are scattershot at the moment but I want to get them
|
||||
// all migrated to be normal code inside SkBitmapProcState.cpp.
|
||||
|
|
@ -117,10 +129,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
|||
#include <immintrin.h>
|
||||
#elif defined(SK_ARM_HAS_NEON)
|
||||
#include <arm_neon.h>
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||
@@ -69,7 +69,7 @@
|
||||
#endif
|
||||
|
||||
|
|
@ -130,10 +142,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkBlitRow_opts.h
|
|||
|
||||
static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
|
||||
__m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright 2018 Google Inc.
|
||||
|
|
@ -159,7 +171,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#elif defined(SKRP_CPU_LASX)
|
||||
#include <lasxintrin.h>
|
||||
#include <lsxintrin.h>
|
||||
@@ -202,6 +207,192 @@ namespace SK_OPTS_NS {
|
||||
@@ -200,6 +205,184 @@ namespace SK_OPTS_NS {
|
||||
ptr[3] = a;
|
||||
}
|
||||
|
||||
|
|
@ -226,14 +238,6 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
+ SI V<T> gather(const T* p, U32 ix) {
|
||||
+ return {p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]]};
|
||||
+ }
|
||||
+ template <typename T>
|
||||
+ SI V<T> gather_unaligned(const T* ptr, U32 ix) {
|
||||
+ // This tells the compiler ptr might not be aligned appropriately, so
|
||||
+ // it generates better assembly.
|
||||
+ typedef T __attribute__ ((aligned (1))) unaligned_ptr;
|
||||
+ const unaligned_ptr* uptr = static_cast<const unaligned_ptr*>(ptr);
|
||||
+ return V<T>{uptr[ix[0]], uptr[ix[1]], uptr[ix[2]], uptr[ix[3]]};
|
||||
+ }
|
||||
+ template <typename V, typename S>
|
||||
+ SI void scatter_masked(V src, S* dst, U32 ix, I32 mask) {
|
||||
+ V before = gather(dst, ix);
|
||||
|
|
@ -352,7 +356,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#elif defined(SKRP_CPU_NEON)
|
||||
template <typename T> using V = Vec<4, T>;
|
||||
using F = V<float >;
|
||||
@@ -1427,6 +1618,15 @@ SI F from_half(U16 h) {
|
||||
@@ -1389,6 +1572,15 @@ SI F from_half(U16 h) {
|
||||
#elif defined(SKRP_CPU_HSW)
|
||||
return _mm256_cvtph_ps((__m128i)h);
|
||||
|
||||
|
|
@ -368,7 +372,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#else
|
||||
// Remember, a half is 1-5-10 (sign-exponent-mantissa) with 15 exponent bias.
|
||||
U32 sem = expand(h),
|
||||
@@ -1450,6 +1650,16 @@ SI U16 to_half(F f) {
|
||||
@@ -1412,6 +1604,16 @@ SI U16 to_half(F f) {
|
||||
#elif defined(SKRP_CPU_HSW)
|
||||
return (U16)_mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
|
||||
|
||||
|
|
@ -385,7 +389,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#else
|
||||
// Remember, a float is 1-8-23 (sign-exponent-mantissa) with 127 exponent bias.
|
||||
U32 sem = sk_bit_cast<U32>(f),
|
||||
@@ -1530,7 +1740,7 @@ static constexpr size_t N = sizeof(F) /
|
||||
@@ -1492,7 +1694,7 @@ static constexpr size_t N = sizeof(F) /
|
||||
// instead of {b,a} on the stack. Narrow stages work best for __vectorcall.
|
||||
#define ABI __vectorcall
|
||||
#define SKRP_NARROW_STAGES 1
|
||||
|
|
@ -394,7 +398,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
// These platforms are ideal for wider stages, and their default ABI is ideal.
|
||||
#define ABI
|
||||
#define SKRP_NARROW_STAGES 0
|
||||
@@ -5600,6 +5810,10 @@ SI F sqrt_(F x) {
|
||||
@@ -5501,6 +5703,10 @@ SI F sqrt_(F x) {
|
||||
float32x4_t lo,hi;
|
||||
split(x, &lo,&hi);
|
||||
return join<F>(sqrt(lo), sqrt(hi));
|
||||
|
|
@ -405,7 +409,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#elif defined(SKRP_CPU_LASX)
|
||||
__m256 lo,hi;
|
||||
split(x, &lo,&hi);
|
||||
@@ -5631,6 +5845,10 @@ SI F floor_(F x) {
|
||||
@@ -5532,6 +5738,10 @@ SI F floor_(F x) {
|
||||
__m128 lo,hi;
|
||||
split(x, &lo,&hi);
|
||||
return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
|
||||
|
|
@ -416,7 +420,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#elif defined(SKRP_CPU_LASX)
|
||||
__m256 lo,hi;
|
||||
split(x, &lo,&hi);
|
||||
@@ -5650,6 +5868,7 @@ SI F floor_(F x) {
|
||||
@@ -5551,6 +5761,7 @@ SI F floor_(F x) {
|
||||
// (2 * a * b + (1 << 15)) >> 16
|
||||
// The result is a number on [-1, 1).
|
||||
// Note: on neon this is a saturating multiply while the others are not.
|
||||
|
|
@ -424,7 +428,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
SI I16 scaled_mult(I16 a, I16 b) {
|
||||
#if defined(SKRP_CPU_SKX)
|
||||
return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
|
||||
@@ -5661,6 +5880,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
|
||||
@@ -5562,6 +5773,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
|
||||
return vqrdmulhq_s16(a, b);
|
||||
#elif defined(SKRP_CPU_NEON)
|
||||
return vqrdmulhq_s16(a, b);
|
||||
|
|
@ -447,7 +451,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
#elif defined(SKRP_CPU_LASX)
|
||||
I16 res = __lasx_xvmuh_h(a, b);
|
||||
return __lasx_xvslli_h(res, 1);
|
||||
@@ -5688,7 +5923,26 @@ SI U16 constrained_add(I16 a, U16 b) {
|
||||
@@ -5589,7 +5816,26 @@ SI U16 constrained_add(I16 a, U16 b) {
|
||||
SkASSERT(-ib <= ia && ia <= 65535 - ib);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -474,7 +478,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
}
|
||||
|
||||
SI F fract(F x) { return x - floor_(x); }
|
||||
@@ -6744,8 +6998,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
|
||||
@@ -6606,8 +6852,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
|
||||
// 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
|
||||
// v = 1/2 * (tx*(R - L) + (R + L))
|
||||
auto lerpX = [&](U16 left, U16 right) -> U16 {
|
||||
|
|
@ -489,7 +493,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
// The constrained_add is the most subtle part of lerp. The first term is on the interval
|
||||
// [-1, 1), and the second term is on the interval is on the interval [0, 1) because
|
||||
// both terms are too high by a factor of 2 which will be handled below. (Both R and L are
|
||||
@@ -6757,7 +7017,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
|
||||
@@ -6619,7 +6871,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
|
||||
U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1;
|
||||
// Divide by 2 to calculate v and at the same time bring the intermediate value onto the
|
||||
// interval [0, 1/2] to set up for the lerpY.
|
||||
|
|
@ -502,7 +506,7 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
};
|
||||
|
||||
const uint32_t* ptr;
|
||||
@@ -6791,9 +7056,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
|
||||
@@ -6653,9 +6910,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
|
||||
I16 width = (I16)bottom - (I16)top;
|
||||
U16 middle = bottom + top;
|
||||
// Add + 0x80 for rounding.
|
||||
|
|
@ -519,10 +523,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
|||
};
|
||||
|
||||
r = lerpY(topR, bottomR);
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/base/SkVx.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/base/SkVx.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
|
||||
@@ -41,7 +41,12 @@
|
||||
#endif
|
||||
|
||||
|
|
@ -537,10 +541,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/base/SkVx.h
|
|||
#include <immintrin.h>
|
||||
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
|
||||
#include <smmintrin.h>
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "src/core/SkBlitMask.h"
|
||||
#include "src/core/SkOptsTargets.h"
|
||||
|
|
@ -550,10 +554,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp
|
|||
|
||||
// The order of these includes is important:
|
||||
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "src/core/SkOptsTargets.h"
|
||||
#include "src/core/SkSwizzlePriv.h"
|
||||
|
|
@ -563,10 +567,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp
|
|||
!defined(SK_ENABLE_OPTIMIZE_SIZE) && \
|
||||
SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
|
||||
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||
@@ -25,7 +25,7 @@ namespace SkOpts {
|
||||
static bool init() {
|
||||
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||
|
|
@ -576,10 +580,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitMask_opts.cpp
|
|||
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
|
||||
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); }
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||
@@ -27,7 +27,7 @@ namespace SkOpts {
|
||||
static bool init() {
|
||||
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||
|
|
@ -589,10 +593,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts.c
|
|||
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
|
||||
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkCpu.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkCpu.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
|
||||
@@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas
|
||||
|
||||
// If we mask in compile-time known lower limits, the compiler can
|
||||
|
|
@ -602,10 +606,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/core/SkCpu.h
|
|||
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
|
||||
features |= SSE1;
|
||||
#endif
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "include/private/base/SkFeatures.h"
|
||||
#include "src/core/SkOptsTargets.h"
|
||||
|
|
@ -615,10 +619,10 @@ Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBitmapProcState_opts_s
|
|||
|
||||
// The order of these includes is important:
|
||||
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
|
||||
Index: chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h
|
||||
Index: chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/include/private/base/SkFeatures.h
|
||||
+++ chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/include/private/base/SkFeatures.h
|
||||
+++ chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
|
||||
@@ -63,6 +63,8 @@
|
||||
|
||||
#if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
|
||||
|
|
@ -628,10 +632,10 @@ Index: chromium-144.0.7559.59/third_party/skia/include/private/base/SkFeatures.h
|
|||
#endif
|
||||
|
||||
#if defined(__loongarch__) || defined (__loongarch64)
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||
@@ -14,7 +14,10 @@
|
||||
#include <cmath>
|
||||
#include <utility>
|
||||
|
|
@ -678,11 +682,11 @@ Index: chromium-144.0.7559.59/third_party/skia/src/opts/SkSwizzler_opts.inc
|
|||
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
|
||||
// -- SSE -- Harden against timing attacks -- MSVC is not supported.
|
||||
using F4 = __m128;
|
||||
Index: chromium-144.0.7559.59/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||
Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||
===================================================================
|
||||
--- chromium-144.0.7559.59.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||
+++ chromium-144.0.7559.59/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||
@@ -129,6 +129,16 @@ static inline SkPMColor blend_lcd16_opaq
|
||||
--- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||
+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||
@@ -127,6 +127,16 @@ static inline SkPMColor blend_lcd16_opaq
|
||||
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
|
||||
#include <emmintrin.h>
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue