diff --git a/CVE-2023-44488-libvpx.patch b/CVE-2023-44488-libvpx.patch deleted file mode 100644 index 79e523565bb95525d890e4fed0c72def2cd4da06..0000000000000000000000000000000000000000 --- a/CVE-2023-44488-libvpx.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 263682c9a29395055f3b3afe2d97be1828a6223f Mon Sep 17 00:00:00 2001 -From: Jerome Jiang -Date: Thu, 30 Jun 2022 13:48:56 -0400 -Subject: [PATCH] Fix bug with smaller width bigger size - -Fixed previous patch that clusterfuzz failed on. - -Bug: webm:1642 -Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9 ---- - test/resize_test.cc | 11 +++-------- - vp9/common/vp9_alloccommon.c | 13 ++++++------- - vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++++++++++-- - 3 files changed, 34 insertions(+), 17 deletions(-) - -diff --git a/test/resize_test.cc b/test/resize_test.cc -index fd1c2a92de6..20ad2229b46 100644 ---- a/test/resize_test.cc -+++ b/test/resize_test.cc -@@ -102,11 +102,8 @@ void ScaleForFrameNumber(unsigned int frame, unsigned int initial_w, - if (frame < 30) { - return; - } -- if (frame < 100) { -- *w = initial_w * 7 / 10; -- *h = initial_h * 16 / 10; -- return; -- } -+ *w = initial_w * 7 / 10; -+ *h = initial_h * 16 / 10; - return; - } - if (frame < 10) { -@@ -559,9 +556,7 @@ TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) { - } - } - --// TODO(https://crbug.com/webm/1642): This causes a segfault in --// init_encode_frame_mb_context(). --TEST_P(ResizeRealtimeTest, DISABLED_TestExternalResizeSmallerWidthBiggerSize) { -+TEST_P(ResizeRealtimeTest, TestExternalResizeSmallerWidthBiggerSize) { - ResizingVideoSource video; - video.flag_codec_ = true; - video.smaller_width_larger_size_ = true; -diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c -index e53883f621d..9e73e40ea09 100644 ---- a/vp9/common/vp9_alloccommon.c -+++ b/vp9/common/vp9_alloccommon.c -@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { - cm->free_mi(cm); - if (cm->alloc_mi(cm, new_mi_size)) goto fail; - } -- -- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { -- // Create the segmentation map structure and set to 0. -- free_seg_map(cm); -- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; -- } -- - if (cm->above_context_alloc_cols < cm->mi_cols) { - vpx_free(cm->above_context); - cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc( -@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) { - cm->above_context_alloc_cols = cm->mi_cols; - } - -+ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { -+ // Create the segmentation map structure and set to 0. -+ free_seg_map(cm); -+ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; -+ } -+ - if (vp9_alloc_loop_filter(cm)) goto fail; - - return 0; -diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c -index 69a4e3c314f..e3ba294c32f 100644 ---- a/vp9/encoder/vp9_encoder.c -+++ b/vp9/encoder/vp9_encoder.c -@@ -2047,6 +2047,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) { - } - } - -+static void free_copy_partition_data(VP9_COMP *cpi) { -+ vpx_free(cpi->prev_partition); -+ cpi->prev_partition = NULL; -+ vpx_free(cpi->prev_segment_id); -+ cpi->prev_segment_id = NULL; -+ vpx_free(cpi->prev_variance_low); -+ cpi->prev_variance_low = NULL; -+ vpx_free(cpi->copied_frame_cnt); -+ cpi->copied_frame_cnt = NULL; -+} -+ - void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - VP9_COMMON *const cm = &cpi->common; - RATE_CONTROL *const rc = &cpi->rc; -@@ -2126,6 +2137,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows); - if (cm->mi_alloc_size < new_mi_size) { - vp9_free_context_buffers(cm); -+ vp9_free_pc_tree(&cpi->td); -+ vpx_free(cpi->mbmi_ext_base); - alloc_compressor_data(cpi); - realloc_segmentation_maps(cpi); - cpi->initial_width = cpi->initial_height = 0; -@@ -2144,8 +2157,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - update_frame_size(cpi); - - if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) { -- memset(cpi->consec_zero_mv, 0, -- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv)); -+ vpx_free(cpi->consec_zero_mv); -+ CHECK_MEM_ERROR( -+ &cm->error, cpi->consec_zero_mv, -+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv))); -+ -+ vpx_free(cpi->skin_map); -+ CHECK_MEM_ERROR( -+ &cm->error, cpi->skin_map, -+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0]))); -+ -+ free_copy_partition_data(cpi); -+ alloc_copy_partition_data(cpi); - if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) - vp9_cyclic_refresh_reset_resize(cpi); - rc->rc_1_frame = 0; diff --git a/CVE-2023-7104.patch b/CVE-2023-7104.patch deleted file mode 100644 index d26e0b728231e48fb046671a22f6c516e920b117..0000000000000000000000000000000000000000 --- a/CVE-2023-7104.patch +++ /dev/null @@ -1,38 +0,0 @@ -Origin: https://sqlite.org/src/info/0e4e7a05c4204b47 - -Index: third_party/sqlite3/src/sqlite3.c -================================================================== ---- a/third_party/sqlite3/src/sqlite3.c -+++ b/third_party/sqlite3/src/sqlite3.c -@@ -3234,19 +3234,23 @@ - pIn->iNext += nByte; - } - } - } - if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){ -- sqlite3_int64 v = sessionGetI64(aVal); -- if( eType==SQLITE_INTEGER ){ -- sqlite3VdbeMemSetInt64(apOut[i], v); -+ if( (pIn->nData-pIn->iNext)<8 ){ -+ rc = SQLITE_CORRUPT_BKPT; - }else{ -- double d; -- memcpy(&d, &v, 8); -- sqlite3VdbeMemSetDouble(apOut[i], d); -+ sqlite3_int64 v = sessionGetI64(aVal); -+ if( eType==SQLITE_INTEGER ){ -+ sqlite3VdbeMemSetInt64(apOut[i], v); -+ }else{ -+ double d; -+ memcpy(&d, &v, 8); -+ sqlite3VdbeMemSetDouble(apOut[i], d); -+ } -+ pIn->iNext += 8; - } -- pIn->iNext += 8; - } - } - } - - return rc; - diff --git a/D188068.diff b/D188068.diff deleted file mode 100644 index cccc8079d69da9e1286ed86f6097fd98b3350d54..0000000000000000000000000000000000000000 --- a/D188068.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/js/src/jit/riscv64/CodeGenerator-riscv64.cpp b/js/src/jit/riscv64/CodeGenerator-riscv64.cpp ---- a/js/src/jit/riscv64/CodeGenerator-riscv64.cpp -+++ b/js/src/jit/riscv64/CodeGenerator-riscv64.cpp -@@ -1103,22 +1103,29 @@ - masm.xor64(ToRegister64(lhs), ToRegister64(lhs)); - return; - case 1: - // nop - return; -+ case 2: -+ masm.add(output.reg, ToRegister64(lhs).reg, ToRegister64(lhs).reg); -+ return; - default: - if (constant > 0) { -- if (mozilla::IsPowerOfTwo(static_cast(constant + 1))) { -- masm.move64(ToRegister64(lhs), output); -- masm.lshift64(Imm32(FloorLog2(constant + 1)), output); -- masm.sub64(ToRegister64(lhs), output); -+ if (mozilla::IsPowerOfTwo(static_cast(constant + 1))) { -+ ScratchRegisterScope scratch(masm); -+ masm.movePtr(ToRegister64(lhs).reg, scratch); -+ masm.slli(output.reg, ToRegister64(lhs).reg, -+ FloorLog2(constant + 1)); -+ masm.sub64(scratch, output); - return; - } else if (mozilla::IsPowerOfTwo( -- static_cast(constant - 1))) { -- masm.move64(ToRegister64(lhs), output); -- masm.lshift64(Imm32(FloorLog2(constant - 1u)), output); -- masm.add64(ToRegister64(lhs), output); -+ static_cast(constant - 1))) { -+ int32_t shift = mozilla::FloorLog2(constant - 1); -+ ScratchRegisterScope scratch(masm); -+ masm.movePtr(ToRegister64(lhs).reg, scratch); -+ masm.slli(output.reg, ToRegister64(lhs).reg, shift); -+ masm.add64(scratch, output); - return; - } - // Use shift if constant is power of 2. - int32_t shift = mozilla::FloorLog2(constant); - if (int64_t(1) << shift == constant) { - diff --git a/add-loongarch64-support-for-authenticator.patch b/add-loongarch64-support-for-authenticator.patch deleted file mode 100644 index 3373c7039b5d44be9ed5a1a5dad9d196ca8e91b0..0000000000000000000000000000000000000000 --- a/add-loongarch64-support-for-authenticator.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4d690fe17e05098512a2d30634db73f495620599 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Thu, 14 Dec 2023 08:39:08 +0000 -Subject: [PATCH] add loongarch64 support for authenticator - ---- - third_party/rust/authenticator/.cargo-checksum.json | 2 +- - third_party/rust/authenticator/build.rs | 2 ++ - .../rust/authenticator/src/transport/linux/hidwrapper.rs | 3 +++ - .../authenticator/src/transport/linux/ioctl_loongarch64.rs | 5 +++++ - 4 files changed, 11 insertions(+), 1 deletion(-) - create mode 100644 third_party/rust/authenticator/src/transport/linux/ioctl_loongarch64.rs - -diff --git a/third_party/rust/authenticator/.cargo-checksum.json b/third_party/rust/authenticator/.cargo-checksum.json -index 080c46c4c0..98bec19e3a 100644 ---- a/third_party/rust/authenticator/.cargo-checksum.json -+++ b/third_party/rust/authenticator/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.lock":"803a1ca7735f93e1d952a07291a6976db787b6530bc67f9e3d2ae2dcaf8a90cc","Cargo.toml":"e8f07adde7f2c71a96cbe3809ab605a9082b8ccaf8d2a69aacb6d5db90fddcdc","Cross.toml":"8d132da818d48492aa9f4b78a348f0df3adfae45d988d42ebd6be8a5adadb6c3","LICENSE":"e866c8f5864d4cacfe403820e722e9dc03fe3c7565efa5e4dad9051d827bb92a","README.md":"c87d9c7cc44f1dd4ef861a3a9f8cd2eb68aedd3814768871f5fb63c2070806cd","build.rs":"01092254718e4cd5d6bffcd64d55cc3240dc00e79f3d7344a5dc4abf6c27bca6","examples/ctap2.rs":"51709e50dd23477f6f91225c09fca08824a00abdc851727b2f3bd9dcd746378e","examples/ctap2_discoverable_creds.rs":"952207c39bad1995998c686f99fbca39268e930099b0086a09adeb5d12931df6","examples/interactive_management.rs":"27d2578fca7672477584bb3a74db182295c85e4aa6ae2d8edfd849fc0018c413","examples/reset.rs":"b13d3a2ed3544018ede8660ec0cc79732139e792d4e55c2c6fb517ad376b36ad","examples/set_pin.rs":"991d9bd66fd6bdd9dd8627ed710fe100a3dfb65b968031f768ee9a28e1e995d7","examples/test_exclude_list.rs":"20577d6887b00c99d2ae404e1b1f64c746ecc774bd2f9f0f8d1c5bb6a6f30292","rustfmt.toml":"ceb6615363d6fff16426eb56f5727f98a7f7ed459ba9af735b1d8b672e2c3b9b","src/authenticatorservice.rs":"dc756ae9d420dac187b04afbb4831527c12fa307ef072f1c1cb4480df9cbda5f","src/consts.rs":"44fb7c396dc87d1657d1feed08e956fc70608c0b06a034716b626419b442bcfe","src/crypto/dummy.rs":"9cc6be0dc1e28c7328121e7a4bf435211ae8b1455784472b24993571c4009579","src/crypto/mod.rs":"e4342dd93fd41bf48fa26386188ed92db5f908ad4d69f32f080a65228c6d5390","src/crypto/nss.rs":"2bf33898728760f194f204876450d0906b47907d259270f6e3d43c62a709c99a","src/crypto/openssl.rs":"ef6e4dbcc7230137e505e3fc4ad37e102e6b26b37470afd0f4709a297b3aa546","src/ctap2/attestation.rs":"e3c581154fb6bd4e4d8bd2326515864849b21766f5344e2d955d607b360fc930","src/ctap2/client_data.rs":"04ee84b34e91c988183871b4975fc08e12234965187c793ad26d0d82ed44642f","src/ctap2/commands/client_pin.rs":"7f3a49b23592e985b8f32d43688593ff7411a05cb594444e24851c13f093cdef","src/ctap2/commands/get_assertion.rs":"e9cd68cff2ee54156af6e3e424691a06354aafffcc374a40ccc9622f030c4999","src/ctap2/commands/get_info.rs":"79117c39d280445fb17be057af2f45ec1d80651ea1c8b478e07118ade808291b","src/ctap2/commands/get_next_assertion.rs":"8a8fa69cb4079a21ff4734067e74784b2bfee3c20ddcc0b35675ce77a3d83ae9","src/ctap2/commands/get_version.rs":"958c273c6156af102bba515de42e4a5ae43f36b4d2d1814d922c269c500f6ce2","src/ctap2/commands/make_credentials.rs":"524cb3378fcc2b08696ab25bf5473e149af307d18ef503a4ee971b4b7e087ff3","src/ctap2/commands/mod.rs":"916eb63b3e46968a9e79d088dd217c2b80dc1c4d14beaf12803e91b7987b6c32","src/ctap2/commands/reset.rs":"45500500c900124f96269679862ceeb18e87111096d322c87c766f2694e576fc","src/ctap2/commands/selection.rs":"7832d62bf37ddbbaf996d84f905c2cdca7dceb529c8f9f1fe82eb288da886068","src/ctap2/mod.rs":"5953ee33ee5930437f9d91299f8a6fdbc21bc62297ae4194901893ef0a5ac82a","src/ctap2/preflight.rs":"1cd41e948955a8bcb22a2e55e254dad1be74590b6016437914e93a2639222aef","src/ctap2/server.rs":"61e2afa1bc3ce1d61743073f14c1a385d064e5deed2b8a194e32e0ccbd4243ad","src/ctap2/utils.rs":"ad0aa36a0dbeb510b7f37789329f1957eab206eb529dc083e6176b142984e26e","src/errors.rs":"a99e5fbdad315ba1589b116fc227310996ef900498b595545228be35744b2038","src/lib.rs":"d42fc78ab81b6fdd66ebe35951a4395a3656f557795cff4c8bfcc54199cabfcd","src/manager.rs":"d72f8523d0a549487504ef6d370aee9132ad7436aaae777e6d65a0a03f3c0c27","src/statecallback.rs":"6b16f97176db1ae3fc3851fe8394e4ffc324bc6fe59313845ac3a88132fd52f1","src/statemachine.rs":"3b1b08efda156bc8c00bad27096a95177217ad77cb041530a03b8903ba51d7e0","src/status_update.rs":"d032524f2c36c5a32db9dd424decf4577cea65adceca91bb1dfcdc07c58289cb","src/transport/device_selector.rs":"c703aa8e59b0b7ac9d11be0aac434dffda8b0c91e1a84298c48e598978e1576e","src/transport/errors.rs":"5af7cb8d22ffa63bf4264d182a0f54b9b3a2cc9d19d832b3495857229f9a2875","src/transport/freebsd/device.rs":"f41c7cf29c48bf2b403cf460e6387864372a134d6daeefc5c3afc3f40d0d4575","src/transport/freebsd/mod.rs":"42dcb57fbeb00140003a8ad39acac9b547062b8f281a3fa5deb5f92a6169dde6","src/transport/freebsd/monitor.rs":"a6b34af4dd2e357a5775b1f3a723766107c11ef98dba859b1188ed08e0e450a2","src/transport/freebsd/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/freebsd/uhid.rs":"a194416a8bc5d428c337f8d96a2248769ca190810852bbe5ee686ab595d8eb4c","src/transport/hid.rs":"033e0f1bf6428a1d4077e5abb53dbfa193ef72dd8a98b7666d7b5fb45a6570f0","src/transport/hidproto.rs":"9d490f161807b75f4d7d5096355006627c1f47c0d90fca53bade3692efc92a2d","src/transport/linux/device.rs":"e79bd06d98723a0d7e4f25b7cf2ac3e0260b10e52d2b0695909d2932288e10a4","src/transport/linux/hidraw.rs":"c7a0df9b4e51cb2736218ffffa02b2b2547b7c515d69f9bae2c9a8c8f1cb547b","src/transport/linux/hidwrapper.h":"72785db3a9b27ea72b6cf13a958fee032af54304522d002f56322473978a20f9","src/transport/linux/hidwrapper.rs":"753c7459dbb73befdd186b6269ac33f7a4537b4c935928f50f2b2131756e787d","src/transport/linux/ioctl_aarch64le.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_armle.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_mips64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsle.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64be.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpcbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_riscv64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_s390xbe.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86_64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/mod.rs":"446e435126d2a58f167f648dd95cba28e8ac9c17f1f799e1eaeab80ea800fc57","src/transport/linux/monitor.rs":"5e3ec2618dd74027ae6ca1527991254e3271cce59106d4920ce0414094e22f64","src/transport/linux/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/macos/device.rs":"f508d0585079ecf87a73d6135c52e8b5a887fbf16e241676d51a8099a8001a81","src/transport/macos/iokit.rs":"7dc4e7bbf8e42e2fcde0cee8e48d14d6234a5a910bd5d3c4e966d8ba6b73992f","src/transport/macos/mod.rs":"333e561554fc901d4f6092f6e4c85823e2b0c4ff31c9188d0e6d542b71a0a07c","src/transport/macos/monitor.rs":"e02288454bb4010e06b705d82646abddb3799f0cd655f574aa19f9d91485a4a2","src/transport/macos/transaction.rs":"9dcdebd13d5fd5a185b5ad777a80c825a6ba5e76b141c238aa115b451b9a72fa","src/transport/mock/device.rs":"582b2b55f13d95dd9f1127e3dde49d2137a5ca020f9c1fa1ffa5c4083d05c0e7","src/transport/mock/mod.rs":"9c4c87efd19adddc1a91c699a6c328063cfbac5531b76346a5ff92e986aded8f","src/transport/mock/transaction.rs":"be3ed8c389dfa04122364b82515edd76fad6f5d5f72d15cacd45a84fb8397292","src/transport/mod.rs":"e28d72b6f3fdaff21f940c4db213067cd94f5832f864ecaad1c9901d5aea9b79","src/transport/netbsd/device.rs":"a7dec83b5040faf1a8ddb37e9fc2b45b9b12814be4802b3b351eff081d1b80c3","src/transport/netbsd/fd.rs":"5464019025d03ea2a39c82f76b238bbbdb0ea63f5a5fc7c9d974e235139cd53b","src/transport/netbsd/mod.rs":"b1c52aa29537330cebe67427062d6c94871cab2a9b0c04b2305d686f07e88fd5","src/transport/netbsd/monitor.rs":"fb2917e4ba53cc9867987a539061f82d011f4c6e478df1157d965d32df2eb922","src/transport/netbsd/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/netbsd/uhid.rs":"d15be35e2413240066a8f086bb8846b08a6a92bf6a1941c3eec1329dd3a4f9ce","src/transport/openbsd/device.rs":"47d8dfeb12c33e6cada2b2cd76476827059c797d8a16f2c4aea6e78d32ebab46","src/transport/openbsd/mod.rs":"514274d414042ff84b3667a41a736e78581e22fda87ccc97c2bc05617e381a30","src/transport/openbsd/monitor.rs":"2e0ba6ecc69b450be9cbfd21a7c65036ed2ce593b12363596d3eae0b5bfb79e8","src/transport/openbsd/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/stub/device.rs":"aa21711d6690ed68bd878b28463172ba69c6324be7afabeccb1f07b4831cb020","src/transport/stub/mod.rs":"6a7fec504a52d403b0241b18cd8b95088a31807571f4c0a67e4055afc74f4453","src/transport/stub/transaction.rs":"c9a3ade9562468163f28fd51e7ff3e0bf5854b7edade9e987000d11c5d0e62d2","src/transport/windows/device.rs":"148b1572ed5fa8d476efbdb2a3a35608ec23012d6a805129f3c25c453bab4b7a","src/transport/windows/mod.rs":"218e7f2fe91ecb390c12bba5a5ffdad2c1f0b22861c937f4d386262e5b3dd617","src/transport/windows/monitor.rs":"95913d49e7d83482e420493d89b53ffceb6a49e646a87de934dff507b3092b4c","src/transport/windows/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/windows/winapi.rs":"b2a4cc85f14e39cadfbf068ee001c9d776f028d3cf09cb926d4364c5b437c112","src/u2fprotocol.rs":"e61ac223aab79ae82383cd32a23213d18461e229c448373bf2483357a9eae69e","src/u2ftypes.rs":"8511c6f04f69670ddd403178a46060644a27128ca4077a9a3e00bc6671e3864b","src/util.rs":"cf37c4c3caf6dde4fc3cf6f5f297ed3c0f13bcb50fb0e8955899fc837483ef31","src/virtualdevices/mod.rs":"2c7df7691d5c150757304241351612aed4260d65b70ab0f483edbc1a5cfb5674","src/virtualdevices/software_u2f.rs":"83e63c0c4a597e71d87b5cd1f33a49646d00b3062edbdd05c51623b80fb60168","src/virtualdevices/webdriver/mod.rs":"4a36e6dfa9f45f941d863b4039bfbcfa8eaca660bd6ed78aeb1a2962db64be5a","src/virtualdevices/webdriver/testtoken.rs":"7146e02f1a5dad2c8827dd11c12ee408c0e42a0706ac65f139998feffd42570f","src/virtualdevices/webdriver/virtualmanager.rs":"7205a0397833628fc0847aa942a6a314dc1e23306858b546053e0de6a360ebe1","src/virtualdevices/webdriver/web_api.rs":"9032525af458b6fe9a3274c36b6ef8c791ecc4ec46d38ae36583fc9a4535b59d","testing/cross/powerpc64le-unknown-linux-gnu.Dockerfile":"d7463ff4376e3e0ca3fed879fab4aa975c4c0a3e7924c5b88aef9381a5d013de","testing/cross/x86_64-unknown-linux-gnu.Dockerfile":"11c79c04b07a171b0c9b63ef75fa75f33263ce76e3c1eda0879a3e723ebd0c24","testing/run_cross.sh":"cc2a7e0359f210eba2e7121f81eb8ab0125cea6e0d0f2698177b0fe2ad0c33d8","webdriver-tools/requirements.txt":"8236aa3dedad886f213c9b778fec80b037212d30e640b458984110211d546005","webdriver-tools/webdriver-driver.py":"82327c26ba271d1689acc87b612ab8436cb5475f0a3c0dba7baa06e7f6f5e19c"},"package":"aa0e182b77b6b19eaf9c7b69fddf3be970169ec6d34eca3f5d682ab948727e57"} -\ No newline at end of file -+{"files":{"Cargo.lock":"803a1ca7735f93e1d952a07291a6976db787b6530bc67f9e3d2ae2dcaf8a90cc","Cargo.toml":"e8f07adde7f2c71a96cbe3809ab605a9082b8ccaf8d2a69aacb6d5db90fddcdc","Cross.toml":"8d132da818d48492aa9f4b78a348f0df3adfae45d988d42ebd6be8a5adadb6c3","LICENSE":"e866c8f5864d4cacfe403820e722e9dc03fe3c7565efa5e4dad9051d827bb92a","README.md":"c87d9c7cc44f1dd4ef861a3a9f8cd2eb68aedd3814768871f5fb63c2070806cd","build.rs":"5b909f42e52ed2056afa3693544ef1c1dc5e90d00e7d8730175a228bd0233b43","examples/ctap2.rs":"51709e50dd23477f6f91225c09fca08824a00abdc851727b2f3bd9dcd746378e","examples/ctap2_discoverable_creds.rs":"952207c39bad1995998c686f99fbca39268e930099b0086a09adeb5d12931df6","examples/interactive_management.rs":"27d2578fca7672477584bb3a74db182295c85e4aa6ae2d8edfd849fc0018c413","examples/reset.rs":"b13d3a2ed3544018ede8660ec0cc79732139e792d4e55c2c6fb517ad376b36ad","examples/set_pin.rs":"991d9bd66fd6bdd9dd8627ed710fe100a3dfb65b968031f768ee9a28e1e995d7","examples/test_exclude_list.rs":"20577d6887b00c99d2ae404e1b1f64c746ecc774bd2f9f0f8d1c5bb6a6f30292","rustfmt.toml":"ceb6615363d6fff16426eb56f5727f98a7f7ed459ba9af735b1d8b672e2c3b9b","src/authenticatorservice.rs":"dc756ae9d420dac187b04afbb4831527c12fa307ef072f1c1cb4480df9cbda5f","src/consts.rs":"44fb7c396dc87d1657d1feed08e956fc70608c0b06a034716b626419b442bcfe","src/crypto/dummy.rs":"9cc6be0dc1e28c7328121e7a4bf435211ae8b1455784472b24993571c4009579","src/crypto/mod.rs":"e4342dd93fd41bf48fa26386188ed92db5f908ad4d69f32f080a65228c6d5390","src/crypto/nss.rs":"2bf33898728760f194f204876450d0906b47907d259270f6e3d43c62a709c99a","src/crypto/openssl.rs":"ef6e4dbcc7230137e505e3fc4ad37e102e6b26b37470afd0f4709a297b3aa546","src/ctap2/attestation.rs":"e3c581154fb6bd4e4d8bd2326515864849b21766f5344e2d955d607b360fc930","src/ctap2/client_data.rs":"04ee84b34e91c988183871b4975fc08e12234965187c793ad26d0d82ed44642f","src/ctap2/commands/client_pin.rs":"7f3a49b23592e985b8f32d43688593ff7411a05cb594444e24851c13f093cdef","src/ctap2/commands/get_assertion.rs":"e9cd68cff2ee54156af6e3e424691a06354aafffcc374a40ccc9622f030c4999","src/ctap2/commands/get_info.rs":"79117c39d280445fb17be057af2f45ec1d80651ea1c8b478e07118ade808291b","src/ctap2/commands/get_next_assertion.rs":"8a8fa69cb4079a21ff4734067e74784b2bfee3c20ddcc0b35675ce77a3d83ae9","src/ctap2/commands/get_version.rs":"958c273c6156af102bba515de42e4a5ae43f36b4d2d1814d922c269c500f6ce2","src/ctap2/commands/make_credentials.rs":"524cb3378fcc2b08696ab25bf5473e149af307d18ef503a4ee971b4b7e087ff3","src/ctap2/commands/mod.rs":"916eb63b3e46968a9e79d088dd217c2b80dc1c4d14beaf12803e91b7987b6c32","src/ctap2/commands/reset.rs":"45500500c900124f96269679862ceeb18e87111096d322c87c766f2694e576fc","src/ctap2/commands/selection.rs":"7832d62bf37ddbbaf996d84f905c2cdca7dceb529c8f9f1fe82eb288da886068","src/ctap2/mod.rs":"5953ee33ee5930437f9d91299f8a6fdbc21bc62297ae4194901893ef0a5ac82a","src/ctap2/preflight.rs":"1cd41e948955a8bcb22a2e55e254dad1be74590b6016437914e93a2639222aef","src/ctap2/server.rs":"61e2afa1bc3ce1d61743073f14c1a385d064e5deed2b8a194e32e0ccbd4243ad","src/ctap2/utils.rs":"ad0aa36a0dbeb510b7f37789329f1957eab206eb529dc083e6176b142984e26e","src/errors.rs":"a99e5fbdad315ba1589b116fc227310996ef900498b595545228be35744b2038","src/lib.rs":"d42fc78ab81b6fdd66ebe35951a4395a3656f557795cff4c8bfcc54199cabfcd","src/manager.rs":"d72f8523d0a549487504ef6d370aee9132ad7436aaae777e6d65a0a03f3c0c27","src/statecallback.rs":"6b16f97176db1ae3fc3851fe8394e4ffc324bc6fe59313845ac3a88132fd52f1","src/statemachine.rs":"3b1b08efda156bc8c00bad27096a95177217ad77cb041530a03b8903ba51d7e0","src/status_update.rs":"d032524f2c36c5a32db9dd424decf4577cea65adceca91bb1dfcdc07c58289cb","src/transport/device_selector.rs":"c703aa8e59b0b7ac9d11be0aac434dffda8b0c91e1a84298c48e598978e1576e","src/transport/errors.rs":"5af7cb8d22ffa63bf4264d182a0f54b9b3a2cc9d19d832b3495857229f9a2875","src/transport/freebsd/device.rs":"f41c7cf29c48bf2b403cf460e6387864372a134d6daeefc5c3afc3f40d0d4575","src/transport/freebsd/mod.rs":"42dcb57fbeb00140003a8ad39acac9b547062b8f281a3fa5deb5f92a6169dde6","src/transport/freebsd/monitor.rs":"a6b34af4dd2e357a5775b1f3a723766107c11ef98dba859b1188ed08e0e450a2","src/transport/freebsd/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/freebsd/uhid.rs":"a194416a8bc5d428c337f8d96a2248769ca190810852bbe5ee686ab595d8eb4c","src/transport/hid.rs":"033e0f1bf6428a1d4077e5abb53dbfa193ef72dd8a98b7666d7b5fb45a6570f0","src/transport/hidproto.rs":"9d490f161807b75f4d7d5096355006627c1f47c0d90fca53bade3692efc92a2d","src/transport/linux/device.rs":"e79bd06d98723a0d7e4f25b7cf2ac3e0260b10e52d2b0695909d2932288e10a4","src/transport/linux/hidraw.rs":"c7a0df9b4e51cb2736218ffffa02b2b2547b7c515d69f9bae2c9a8c8f1cb547b","src/transport/linux/hidwrapper.h":"72785db3a9b27ea72b6cf13a958fee032af54304522d002f56322473978a20f9","src/transport/linux/hidwrapper.rs":"d203e8804e7632b8d47a224c186d1f431800f04ddc43360d5c086f71e9b0f674","src/transport/linux/ioctl_aarch64le.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_armle.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_mips64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsle.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64be.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpcbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_riscv64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_s390xbe.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86_64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/mod.rs":"446e435126d2a58f167f648dd95cba28e8ac9c17f1f799e1eaeab80ea800fc57","src/transport/linux/monitor.rs":"5e3ec2618dd74027ae6ca1527991254e3271cce59106d4920ce0414094e22f64","src/transport/linux/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/macos/device.rs":"f508d0585079ecf87a73d6135c52e8b5a887fbf16e241676d51a8099a8001a81","src/transport/macos/iokit.rs":"7dc4e7bbf8e42e2fcde0cee8e48d14d6234a5a910bd5d3c4e966d8ba6b73992f","src/transport/macos/mod.rs":"333e561554fc901d4f6092f6e4c85823e2b0c4ff31c9188d0e6d542b71a0a07c","src/transport/macos/monitor.rs":"e02288454bb4010e06b705d82646abddb3799f0cd655f574aa19f9d91485a4a2","src/transport/macos/transaction.rs":"9dcdebd13d5fd5a185b5ad777a80c825a6ba5e76b141c238aa115b451b9a72fa","src/transport/mock/device.rs":"582b2b55f13d95dd9f1127e3dde49d2137a5ca020f9c1fa1ffa5c4083d05c0e7","src/transport/mock/mod.rs":"9c4c87efd19adddc1a91c699a6c328063cfbac5531b76346a5ff92e986aded8f","src/transport/mock/transaction.rs":"be3ed8c389dfa04122364b82515edd76fad6f5d5f72d15cacd45a84fb8397292","src/transport/mod.rs":"e28d72b6f3fdaff21f940c4db213067cd94f5832f864ecaad1c9901d5aea9b79","src/transport/netbsd/device.rs":"a7dec83b5040faf1a8ddb37e9fc2b45b9b12814be4802b3b351eff081d1b80c3","src/transport/netbsd/fd.rs":"5464019025d03ea2a39c82f76b238bbbdb0ea63f5a5fc7c9d974e235139cd53b","src/transport/netbsd/mod.rs":"b1c52aa29537330cebe67427062d6c94871cab2a9b0c04b2305d686f07e88fd5","src/transport/netbsd/monitor.rs":"fb2917e4ba53cc9867987a539061f82d011f4c6e478df1157d965d32df2eb922","src/transport/netbsd/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/netbsd/uhid.rs":"d15be35e2413240066a8f086bb8846b08a6a92bf6a1941c3eec1329dd3a4f9ce","src/transport/openbsd/device.rs":"47d8dfeb12c33e6cada2b2cd76476827059c797d8a16f2c4aea6e78d32ebab46","src/transport/openbsd/mod.rs":"514274d414042ff84b3667a41a736e78581e22fda87ccc97c2bc05617e381a30","src/transport/openbsd/monitor.rs":"2e0ba6ecc69b450be9cbfd21a7c65036ed2ce593b12363596d3eae0b5bfb79e8","src/transport/openbsd/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/stub/device.rs":"aa21711d6690ed68bd878b28463172ba69c6324be7afabeccb1f07b4831cb020","src/transport/stub/mod.rs":"6a7fec504a52d403b0241b18cd8b95088a31807571f4c0a67e4055afc74f4453","src/transport/stub/transaction.rs":"c9a3ade9562468163f28fd51e7ff3e0bf5854b7edade9e987000d11c5d0e62d2","src/transport/windows/device.rs":"148b1572ed5fa8d476efbdb2a3a35608ec23012d6a805129f3c25c453bab4b7a","src/transport/windows/mod.rs":"218e7f2fe91ecb390c12bba5a5ffdad2c1f0b22861c937f4d386262e5b3dd617","src/transport/windows/monitor.rs":"95913d49e7d83482e420493d89b53ffceb6a49e646a87de934dff507b3092b4c","src/transport/windows/transaction.rs":"ec28475a70dded260f9a7908c7f88dd3771f5d64b9a5dda835411d13b713c39a","src/transport/windows/winapi.rs":"b2a4cc85f14e39cadfbf068ee001c9d776f028d3cf09cb926d4364c5b437c112","src/u2fprotocol.rs":"e61ac223aab79ae82383cd32a23213d18461e229c448373bf2483357a9eae69e","src/u2ftypes.rs":"8511c6f04f69670ddd403178a46060644a27128ca4077a9a3e00bc6671e3864b","src/util.rs":"cf37c4c3caf6dde4fc3cf6f5f297ed3c0f13bcb50fb0e8955899fc837483ef31","src/virtualdevices/mod.rs":"2c7df7691d5c150757304241351612aed4260d65b70ab0f483edbc1a5cfb5674","src/virtualdevices/software_u2f.rs":"83e63c0c4a597e71d87b5cd1f33a49646d00b3062edbdd05c51623b80fb60168","src/virtualdevices/webdriver/mod.rs":"4a36e6dfa9f45f941d863b4039bfbcfa8eaca660bd6ed78aeb1a2962db64be5a","src/virtualdevices/webdriver/testtoken.rs":"7146e02f1a5dad2c8827dd11c12ee408c0e42a0706ac65f139998feffd42570f","src/virtualdevices/webdriver/virtualmanager.rs":"7205a0397833628fc0847aa942a6a314dc1e23306858b546053e0de6a360ebe1","src/virtualdevices/webdriver/web_api.rs":"9032525af458b6fe9a3274c36b6ef8c791ecc4ec46d38ae36583fc9a4535b59d","testing/cross/powerpc64le-unknown-linux-gnu.Dockerfile":"d7463ff4376e3e0ca3fed879fab4aa975c4c0a3e7924c5b88aef9381a5d013de","testing/cross/x86_64-unknown-linux-gnu.Dockerfile":"11c79c04b07a171b0c9b63ef75fa75f33263ce76e3c1eda0879a3e723ebd0c24","testing/run_cross.sh":"cc2a7e0359f210eba2e7121f81eb8ab0125cea6e0d0f2698177b0fe2ad0c33d8","webdriver-tools/requirements.txt":"8236aa3dedad886f213c9b778fec80b037212d30e640b458984110211d546005","webdriver-tools/webdriver-driver.py":"82327c26ba271d1689acc87b612ab8436cb5475f0a3c0dba7baa06e7f6f5e19c"},"package":"aa0e182b77b6b19eaf9c7b69fddf3be970169ec6d34eca3f5d682ab948727e57"} -diff --git a/third_party/rust/authenticator/build.rs b/third_party/rust/authenticator/build.rs -index 58f6cfa393..acc4f09466 100644 ---- a/third_party/rust/authenticator/build.rs -+++ b/third_party/rust/authenticator/build.rs -@@ -47,6 +47,8 @@ fn main() { - "ioctl_s390xbe.rs" - } else if cfg!(all(target_arch = "riscv64", target_endian = "little")) { - "ioctl_riscv64.rs" -+ } else if cfg!(all(target_arch = "loongarch64", target_endian = "little")) { -+ "ioctl_loongarch64.rs" - } else { - panic!("architecture not supported"); - }; -diff --git a/third_party/rust/authenticator/src/transport/linux/hidwrapper.rs b/third_party/rust/authenticator/src/transport/linux/hidwrapper.rs -index 82aabc6301..bc8582c5b1 100644 ---- a/third_party/rust/authenticator/src/transport/linux/hidwrapper.rs -+++ b/third_party/rust/authenticator/src/transport/linux/hidwrapper.rs -@@ -49,3 +49,6 @@ include!("ioctl_s390xbe.rs"); - - #[cfg(all(target_arch = "riscv64", target_endian = "little"))] - include!("ioctl_riscv64.rs"); -+ -+#[cfg(all(target_arch = "loongarch64", target_endian = "little"))] -+include!("ioctl_loongarch64.rs"); -diff --git a/third_party/rust/authenticator/src/transport/linux/ioctl_loongarch64.rs b/third_party/rust/authenticator/src/transport/linux/ioctl_loongarch64.rs -new file mode 100644 -index 0000000000..a784e9bf46 ---- /dev/null -+++ b/third_party/rust/authenticator/src/transport/linux/ioctl_loongarch64.rs -@@ -0,0 +1,5 @@ -+/* automatically generated by rust-bindgen */ -+ -+pub type __u32 = ::std::os::raw::c_uint; -+pub const _HIDIOCGRDESCSIZE: __u32 = 2147764225; -+pub const _HIDIOCGRDESC: __u32 = 2416199682; --- -2.41.0 - - diff --git a/add-loongarch64-support-for-cty.patch b/add-loongarch64-support-for-cty.patch deleted file mode 100644 index 116e3634bff4904a1e96b6644af78225d48cf7a3..0000000000000000000000000000000000000000 --- a/add-loongarch64-support-for-cty.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2dbfb2757ec5c45b7d1f0082031f27378c147c2 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Thu, 14 Dec 2023 07:50:41 +0000 -Subject: [PATCH 2/6] add loongarch64 support for cty - ---- - third_party/rust/cty/.cargo-checksum.json | 2 +- - third_party/rust/cty/src/lib.rs | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/third_party/rust/cty/.cargo-checksum.json b/third_party/rust/cty/.cargo-checksum.json -index 902714f58a..3e65dbf70a 100644 ---- a/third_party/rust/cty/.cargo-checksum.json -+++ b/third_party/rust/cty/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"077c738b5f2c05d66a12209edaabca887091db727d61164a7a414da23d8bf08f","Cargo.toml":"94a517ea6c7dad4634a9a2bd356f3a8035927e7ff8367bd5a975b4db4ccf8e6e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"035e70219855119df4273b3c5b97543ae82e0dd60c520416e759107c602f651b","README.md":"19687c50697e6abc991e4c35e6d674db56bd5e5ae0d5b833440718f8f154a74d","ci/install.sh":"9b34273d9e79ec59f63d5e3e7aea27b0db66194667f9730a21158740fa1b99f1","ci/script.sh":"54962430ca4d3528e5c0d44ff590b1504be13147db5cbe8bb82f1358528ef5f3","src/lib.rs":"33a38ce6df718fb0191f34ff2cefdcbd3ad9d93f0c4073b78eaf937c07fb7614"},"package":"b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"077c738b5f2c05d66a12209edaabca887091db727d61164a7a414da23d8bf08f","Cargo.toml":"94a517ea6c7dad4634a9a2bd356f3a8035927e7ff8367bd5a975b4db4ccf8e6e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"035e70219855119df4273b3c5b97543ae82e0dd60c520416e759107c602f651b","README.md":"19687c50697e6abc991e4c35e6d674db56bd5e5ae0d5b833440718f8f154a74d","ci/install.sh":"9b34273d9e79ec59f63d5e3e7aea27b0db66194667f9730a21158740fa1b99f1","ci/script.sh":"54962430ca4d3528e5c0d44ff590b1504be13147db5cbe8bb82f1358528ef5f3","src/lib.rs":"3e9ec28a0d13cfb47546e044b8fc3a32007f7c76994704c4164c4430a7167e39"},"package":"b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"} -diff --git a/third_party/rust/cty/src/lib.rs b/third_party/rust/cty/src/lib.rs -index 971c9cb3a9..80b8f3f291 100644 ---- a/third_party/rust/cty/src/lib.rs -+++ b/third_party/rust/cty/src/lib.rs -@@ -24,6 +24,7 @@ pub use pwd::*; - target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "s390x", -+ target_arch = "loongarch64", - target_arch = "riscv32", - target_arch = "riscv64"))] - mod ad { --- -2.41.0 - - diff --git a/add-loongarch64-support-for-ipc.patch b/add-loongarch64-support-for-ipc.patch deleted file mode 100644 index ec42e60bbf9af7ed692b8788e644f1168ec158b0..0000000000000000000000000000000000000000 --- a/add-loongarch64-support-for-ipc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4f9ab53eeabdc5966156601bda09f77fce057ba6 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Thu, 14 Dec 2023 09:47:06 +0000 -Subject: [PATCH] add loongarch64 support for ipc - ---- - ipc/chromium/src/build/build_config.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h -index 511f36858c..f3a96feaf7 100644 ---- a/ipc/chromium/src/build/build_config.h -+++ b/ipc/chromium/src/build/build_config.h -@@ -129,6 +129,9 @@ - #elif defined(__riscv) && __riscv_xlen == 64 - # define ARCH_CPU_RISCV64 1 - # define ARCH_CPU_64_BITS 1 -+#elif defined(__loongarch64) -+# define ARCH_CPU_LOONGARCH64 1 -+# define ARCH_CPU_64_BITS 1 - #else - # error Please add support for your architecture in build/build_config.h - #endif --- -2.41.0 - - diff --git a/add-loongarch64-support-for-nix.patch b/add-loongarch64-support-for-nix.patch deleted file mode 100644 index acb56d681703a508d29f0885ce80c36797e94197..0000000000000000000000000000000000000000 --- a/add-loongarch64-support-for-nix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 17ce6bde2be0e3d4fcd3fad4c85dcd4e610930c9 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Thu, 14 Dec 2023 07:29:18 +0000 -Subject: [PATCH] add loongarch64 support for nix - ---- - third_party/rust/nix/.cargo-checksum.json | 2 +- - third_party/rust/nix/src/sys/ioctl/linux.rs | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/third_party/rust/nix/.cargo-checksum.json b/third_party/rust/nix/.cargo-checksum.json -index f4c932b889..b7b9c9f3c9 100644 ---- a/third_party/rust/nix/.cargo-checksum.json -+++ b/third_party/rust/nix/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"8ee4e556e53d1b39400a48675d3ecff0bf27e419accab7ca3be76ab934289548","Cargo.toml":"2e6eff9170182f107188b8bc9802efd044ef47178afc7f138950ecff1c1ceb96","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"1ed9a0e26ae6e575b3262ae734dd02889455593b761ee62403ea5a64104f3c9c","src/dir.rs":"0280a2dc480bd913f24ed84fbe26569fa2e8eefa660e5ad7c21e05fc34c14d16","src/env.rs":"028bc5e20139ebba418a655a2978a53335dc7680bf1de43d2c8333dd72cfa5c4","src/errno.rs":"e55d075858e349d9afea9ce0480f7fb7ba4dccccf0694fd7b3280b918836203c","src/fcntl.rs":"ea8f43d8fec0b6c3b7d903333e4c1ce85611684a4afd561c55cfe4b61a979e94","src/features.rs":"5b4a0831e5f4b79a6f0e42ed052fd66c875da18959750be51e41fb59ac19feed","src/ifaddrs.rs":"377865eb48040d28c392a1aec0221320108e3392ea285d23405ae2cfa5c54b20","src/kmod.rs":"c818ced08d55ae36fdf82fa914ba856b688e37234d574d3faa37128211d512fb","src/lib.rs":"a62fac2ba7111157c5b64251f67f8a189f04bd587d5c80703454a596ea7ae5d9","src/macros.rs":"e23d7d8be22ef0bf9febaaf2739585453103607c0139bd3995a324e4a16d011e","src/mount/bsd.rs":"4cf35606a63d7ca41caac3b38f01e2b70c63e71978c0529f19fc79182629dbe0","src/mount/linux.rs":"6e5d61788dedf1ca4416c6c6a3a9c6c747f9352c26d863f4a1d4142e288584d6","src/mount/mod.rs":"ba9f60eb831224ab73bdd87e00e15d13b9ce9efb70b18bf8f3fe60406d522b3e","src/mqueue.rs":"ed0a189036b2437b5f7f7f1312fa545540b06ca72171b451d8bce42cc3627534","src/net/if_.rs":"b32a8a1f952de60d95e549779a5c673fd72aa665e86bfdfc8ec6badf3016b9b1","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"2fc1d144fb40db51811c6357b520ab7993529702d8f0d8060c903118ff4f7259","src/pty.rs":"27b4f76c23acf02542674017067fee74cdcac907338458700a1aa4d6f6a62e27","src/sched.rs":"403aa5ebed81910263d42a94717612b737550bf053227b7d90f1c8949188d919","src/sys/aio.rs":"ae091de8540c97da374a39e7d154c1b3ce50f41e6fc20a45c6b06eb838e74366","src/sys/epoll.rs":"28e22debf474d1b047e8044a00b354c25dab2fa125960f9f2f14cc34289fd5c9","src/sys/event.rs":"dbd8e84bccb813839295b0a336485783ef19548d2317931f0ceb5ee62f839a40","src/sys/eventfd.rs":"c8db8f5874726fdad289ad5e2603a7d71a1ae5a899dcde3a35d3edff8b498b7e","src/sys/inotify.rs":"5b4da774313afa9c28c3f92f9d07dce9bf4c8d044fd6a16f19480e79a19e808b","src/sys/ioctl/bsd.rs":"bbd02e30b0a78c1cb22777d9b00cfcbba9c68505cffc06118ac68474cf6fea39","src/sys/ioctl/linux.rs":"028181834d119b834bf399f2b8a6176cc57e75144693f28f32059d087d8c8018","src/sys/ioctl/mod.rs":"89b20579476b2e0254e0ecb1b41830cccd7027a22cbdb816a9d4ec3924842ac1","src/sys/memfd.rs":"f58d7fbe67c4b994832d72f5fbd59c136c8f1ae88ea8b0bc1c099db2d847ee6c","src/sys/mman.rs":"17df1bc34ba92bdd6bad1e11e4ef139998117f6c468c8f560421858f3cc899a5","src/sys/mod.rs":"baabf649f758ad4acce849ec1795dd4e4f9c6539e677bad5fa777300a4871dcb","src/sys/personality.rs":"aa89760c023bfec3fca5d8636f9eac9d337f5547933793ce6df7a0de97ae6ee1","src/sys/pthread.rs":"258cdf7ff0b61a4afa6d228109e4cb4fb88d859bb8dfe6c959d95130fb010906","src/sys/ptrace/bsd.rs":"4c590d8f023ff52f396f8b6f2150c08e5c9486d3088d9c173db33a70d616b800","src/sys/ptrace/linux.rs":"c82db3fb18aa97755f9ccb440a957cd46d664968a94045830c5d74d2d53bc19f","src/sys/ptrace/mod.rs":"e9e5d970097f5eafffba900959d4fdbf233bff9ed7f599fc9896bb44d86a57a4","src/sys/quota.rs":"02e698a25f0986fb43aa88689f3d3d8b9edc6ae48496ad02f7214fccaa493e00","src/sys/reboot.rs":"eacdf57694a6629fb05787e16450446102a62818274495f2ad4e445807d09221","src/sys/resource.rs":"d498d0c00fd30e35e1269a8902cb812014d813f63ec95364f8f59f1912ba5657","src/sys/select.rs":"65c39b129d3cc85b8ca026ff26dcf80c5639824f43715881c3c1bbb6bf0c8a60","src/sys/sendfile.rs":"7a62099f9771fecff49b9c11210341e3c1a4acf22f8dfb96d395e29421648676","src/sys/signal.rs":"c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939","src/sys/signalfd.rs":"583524434fd37143be3db37fa6f6cbd339f7946416f05b58a95e246947e5cc9d","src/sys/socket/addr.rs":"84df895052f59ec84774b189ffb285d2a37a9703af6c8310ae5040cca1a2583e","src/sys/socket/mod.rs":"6deb55438cad3606385303f036b0efd842dfd759fba93611911f5a4f2613c9dc","src/sys/socket/sockopt.rs":"ed1f920364bfe88bbe6eaeeefb27a63bfcdd7d67604aca2f03e22f2b502df55a","src/sys/stat.rs":"337dea8d55d6177dc85b3235b40b8a3e81af7f4a6e2806a0b2f730bec5424350","src/sys/statfs.rs":"17103659a85279bac046c69cb3b22bf2c11c2492cffb0edfa4c3b233d161a2f2","src/sys/statvfs.rs":"f81e3900ef90d62e7eceaf1b6ff8dcfd965466714c033eb4717687f692171f48","src/sys/sysinfo.rs":"b4519b1ca091c9dbe94d2a6fd6304944bf3df5626973d2c6884022559706f0d9","src/sys/termios.rs":"7923f9846a8122096b6b1cd240d3618b876ce500a751ac434954d172e2e85745","src/sys/time.rs":"9026033b60a5ccc95b70424aef043c8c748722e2ea8c7c86366ecd4585b651a0","src/sys/timer.rs":"8c10f0e7cfac857ad00460be30bc68b957909cc9296e70718d3b5d4a0babafde","src/sys/timerfd.rs":"ef7c48aefdcfac13316eeddbef5da04cf12e9f574b8d9f43402c02b6b8db86b3","src/sys/uio.rs":"e1d59ccbee9d46c65d3aa8c36aa3a3222539beea0d20163a8b707d08fca14e09","src/sys/utsname.rs":"0cdda0cc111caaa0e4ebe2d4588bdc825d878e5bcb7a9136073b15f87a20e11f","src/sys/wait.rs":"cc70d2d9b880ff6c48577a479c209af6127067bc013a90ee22538e4dfad7d2b4","src/time.rs":"d4e0872361a57810837f5bd790cbca3a2b9db1ac4694a3c52d1564ad3532d3be","src/ucontext.rs":"b8f2e04757a9c2bc38c3b1e259d3a013da8a730fe9bfbe5487637395681b43d3","src/unistd.rs":"e19be456124731c5b93aef92ed72a7c4c9092e28db0649814ba3fcc1f0d620fa","test/common/mod.rs":"1d7e28e3635754664cd056f3a1079232ff5c118df619e1d0551a9972eb0b3cd6","test/sys/mod.rs":"87b2891d83067ff21f72b8ff7fde3019dc45b6877282ac278b6da151de45c7a7","test/sys/test_aio.rs":"4dac9f716f852f1f438f78d6e64bf041e6fd316bf15dcb27afffaf0894bdefa6","test/sys/test_aio_drop.rs":"614070155fa16a979b7341d001639c5ce24a1d6f632c3abce45a5a6d49c4039b","test/sys/test_epoll.rs":"ffe95e36c79e37426ef8e8ca3b137b7f35ea0333ce666a20a4b7878db17680e9","test/sys/test_inotify.rs":"a141b9a995892547b51ceeb6761a70a6b86d37e8f38d13ea2c497b81b4b0f49f","test/sys/test_ioctl.rs":"00ccc5afb665e533a0a4b6d6a6be438bcaea19fce335390feef4e91d17b3036c","test/sys/test_mman.rs":"2b4161964c9204b74659028b0f89a88f4e3bcc9886137a3039737cd91d2698cb","test/sys/test_pthread.rs":"ace36a2f5587f1874854281b4fd84e4e4d892a1e3c5cc38ced57975739522ad6","test/sys/test_ptrace.rs":"0385eebc8b1b8c72f655b745769decd9143ad83018198375982da0896310456b","test/sys/test_select.rs":"54cea1c34ad28d5770a613c1c3cbc3b1064b22037ec2b9d3fcd422d3be9e60a7","test/sys/test_signal.rs":"acc9941227bd3e2afad323613c2b8c83902ed0486d3745fd72704f395924f1e4","test/sys/test_signalfd.rs":"0e1060143e2612c490bc3d0168d0bbb042ef55e3f1d91d2578b9e42e4310a14d","test/sys/test_socket.rs":"d2df1001f9a0b2dac0b88051a67c3868bb216e72e4da4eecd11c4448b9fa4b40","test/sys/test_sockopt.rs":"4465f22f718442f3f7b502e052dad02b93cebfa3b71fa55ff4f25fb02534acab","test/sys/test_stat.rs":"6630a28217fd708bb84cd4f7e7101836b74f2420f9888923fdab664ccc331c1d","test/sys/test_sysinfo.rs":"ffd49bc96375914a2c4a4a59730cae8072f85771e2c4a80d3403df38d967e272","test/sys/test_termios.rs":"e5bcef10c84bd7583d600d5601835bcb3cfc88781cb283ab0185bbef5faf4327","test/sys/test_timerfd.rs":"cfed3abf58118611d08f6985251a7739cff67108e11214222a1d2394a3a026ce","test/sys/test_uio.rs":"32656bd0a5699e4d019aa928edf104637937179782914a82d50d37226e84c421","test/sys/test_wait.rs":"6fd59fffeeb09ff620c359baefd062ba777598982b6cb001ccc07b6bc7605493","test/test.rs":"11f40b0718ddd1a150cb9e703d56d0b2a9462306505a2245ddf273a2011f48b5","test/test_clearenv.rs":"45ca548035b3c20ec87314715feaba2be973709a635d85b8cde46fd1d9f1ecd4","test/test_dir.rs":"ae3c11c58cb06da6557aa2a839c6653c54cd7724283fffe9df5a5d3feabdd89a","test/test_fcntl.rs":"71dcb87f7b04d78fc62937ba46cb7f0f1f2dbb330b63a996ea2e8ec9056b98a9","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"b4ae25841c2f06f32de9f1acd8230eeccd7095721302ebe78ad454e4e4f9c783","test/test_mount.rs":"6dd242b6e23c9c39e1a75612bbea62573898818ab374c3c032c2cdb97033554d","test/test_mq.rs":"136071f24131aac0e65d5f29ac18e3806641dfae1164813f5570c0e3a6f70553","test/test_net.rs":"f2912327ebb2a3d37e6cff02a5ac3106cf889cc5c74404db4ef0034059ba26f1","test/test_nix_path.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","test/test_nmount.rs":"d6c112547bb80968170b5497cda4b6cbf69dabec6f51d494bd52298995ceff18","test/test_poll.rs":"3e0b8f0397ba080785c61a3bfc3d637bc87f324bc4e52b5f1bf3ca0d32dbc9fe","test/test_pty.rs":"b26238a0783746cb31880e11eebc1913149be999ce75fbc2d6677bdd1e2731b2","test/test_ptymaster_drop.rs":"ae63c815f5028ddc67d194e86559483018ab1816316bdb917f40cee9364fd8a5","test/test_resource.rs":"40aef790ab745cec31a4b333d2ca406b462aa9bdf4a6d3756371e498b8d51e9a","test/test_sched.rs":"c4579bd376fab8816e63b07fa9ace31dc08e63ebb7c855a2c450698090d1d1e8","test/test_sendfile.rs":"bb41b4f3621b518e397d3a5b5ad3c5dcef3fe506afe516eab7572fbab92b77e3","test/test_stat.rs":"c407ca47a5258750076d041afad2f6add4c3563be36628bde1c5b314f5d0765d","test/test_time.rs":"f7a21b1e279e60e84909d5dadda97ded66d3326b131fe317badf9af0a1b50335","test/test_timer.rs":"3ae20d364f075d2811f3ff94eda9886682cc21d8807656007d2464fe36d1e361","test/test_unistd.rs":"20a00be4fbe26302ea5fe50ce25b99265dc763db138663d6aa1d7ac729a1d292"},"package":"bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"8ee4e556e53d1b39400a48675d3ecff0bf27e419accab7ca3be76ab934289548","Cargo.toml":"2e6eff9170182f107188b8bc9802efd044ef47178afc7f138950ecff1c1ceb96","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"1ed9a0e26ae6e575b3262ae734dd02889455593b761ee62403ea5a64104f3c9c","src/dir.rs":"0280a2dc480bd913f24ed84fbe26569fa2e8eefa660e5ad7c21e05fc34c14d16","src/env.rs":"028bc5e20139ebba418a655a2978a53335dc7680bf1de43d2c8333dd72cfa5c4","src/errno.rs":"e55d075858e349d9afea9ce0480f7fb7ba4dccccf0694fd7b3280b918836203c","src/fcntl.rs":"ea8f43d8fec0b6c3b7d903333e4c1ce85611684a4afd561c55cfe4b61a979e94","src/features.rs":"5b4a0831e5f4b79a6f0e42ed052fd66c875da18959750be51e41fb59ac19feed","src/ifaddrs.rs":"377865eb48040d28c392a1aec0221320108e3392ea285d23405ae2cfa5c54b20","src/kmod.rs":"c818ced08d55ae36fdf82fa914ba856b688e37234d574d3faa37128211d512fb","src/lib.rs":"a62fac2ba7111157c5b64251f67f8a189f04bd587d5c80703454a596ea7ae5d9","src/macros.rs":"e23d7d8be22ef0bf9febaaf2739585453103607c0139bd3995a324e4a16d011e","src/mount/bsd.rs":"4cf35606a63d7ca41caac3b38f01e2b70c63e71978c0529f19fc79182629dbe0","src/mount/linux.rs":"6e5d61788dedf1ca4416c6c6a3a9c6c747f9352c26d863f4a1d4142e288584d6","src/mount/mod.rs":"ba9f60eb831224ab73bdd87e00e15d13b9ce9efb70b18bf8f3fe60406d522b3e","src/mqueue.rs":"ed0a189036b2437b5f7f7f1312fa545540b06ca72171b451d8bce42cc3627534","src/net/if_.rs":"b32a8a1f952de60d95e549779a5c673fd72aa665e86bfdfc8ec6badf3016b9b1","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"2fc1d144fb40db51811c6357b520ab7993529702d8f0d8060c903118ff4f7259","src/pty.rs":"27b4f76c23acf02542674017067fee74cdcac907338458700a1aa4d6f6a62e27","src/sched.rs":"403aa5ebed81910263d42a94717612b737550bf053227b7d90f1c8949188d919","src/sys/aio.rs":"ae091de8540c97da374a39e7d154c1b3ce50f41e6fc20a45c6b06eb838e74366","src/sys/epoll.rs":"28e22debf474d1b047e8044a00b354c25dab2fa125960f9f2f14cc34289fd5c9","src/sys/event.rs":"dbd8e84bccb813839295b0a336485783ef19548d2317931f0ceb5ee62f839a40","src/sys/eventfd.rs":"c8db8f5874726fdad289ad5e2603a7d71a1ae5a899dcde3a35d3edff8b498b7e","src/sys/inotify.rs":"5b4da774313afa9c28c3f92f9d07dce9bf4c8d044fd6a16f19480e79a19e808b","src/sys/ioctl/bsd.rs":"bbd02e30b0a78c1cb22777d9b00cfcbba9c68505cffc06118ac68474cf6fea39","src/sys/ioctl/linux.rs":"54bad026ee637b73b95dad8135b6db61cae855670fd9323e7bf21acaff0827f4","src/sys/ioctl/mod.rs":"89b20579476b2e0254e0ecb1b41830cccd7027a22cbdb816a9d4ec3924842ac1","src/sys/memfd.rs":"f58d7fbe67c4b994832d72f5fbd59c136c8f1ae88ea8b0bc1c099db2d847ee6c","src/sys/mman.rs":"17df1bc34ba92bdd6bad1e11e4ef139998117f6c468c8f560421858f3cc899a5","src/sys/mod.rs":"baabf649f758ad4acce849ec1795dd4e4f9c6539e677bad5fa777300a4871dcb","src/sys/personality.rs":"aa89760c023bfec3fca5d8636f9eac9d337f5547933793ce6df7a0de97ae6ee1","src/sys/pthread.rs":"258cdf7ff0b61a4afa6d228109e4cb4fb88d859bb8dfe6c959d95130fb010906","src/sys/ptrace/bsd.rs":"4c590d8f023ff52f396f8b6f2150c08e5c9486d3088d9c173db33a70d616b800","src/sys/ptrace/linux.rs":"c82db3fb18aa97755f9ccb440a957cd46d664968a94045830c5d74d2d53bc19f","src/sys/ptrace/mod.rs":"e9e5d970097f5eafffba900959d4fdbf233bff9ed7f599fc9896bb44d86a57a4","src/sys/quota.rs":"02e698a25f0986fb43aa88689f3d3d8b9edc6ae48496ad02f7214fccaa493e00","src/sys/reboot.rs":"eacdf57694a6629fb05787e16450446102a62818274495f2ad4e445807d09221","src/sys/resource.rs":"d498d0c00fd30e35e1269a8902cb812014d813f63ec95364f8f59f1912ba5657","src/sys/select.rs":"65c39b129d3cc85b8ca026ff26dcf80c5639824f43715881c3c1bbb6bf0c8a60","src/sys/sendfile.rs":"7a62099f9771fecff49b9c11210341e3c1a4acf22f8dfb96d395e29421648676","src/sys/signal.rs":"c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939","src/sys/signalfd.rs":"583524434fd37143be3db37fa6f6cbd339f7946416f05b58a95e246947e5cc9d","src/sys/socket/addr.rs":"84df895052f59ec84774b189ffb285d2a37a9703af6c8310ae5040cca1a2583e","src/sys/socket/mod.rs":"6deb55438cad3606385303f036b0efd842dfd759fba93611911f5a4f2613c9dc","src/sys/socket/sockopt.rs":"ed1f920364bfe88bbe6eaeeefb27a63bfcdd7d67604aca2f03e22f2b502df55a","src/sys/stat.rs":"337dea8d55d6177dc85b3235b40b8a3e81af7f4a6e2806a0b2f730bec5424350","src/sys/statfs.rs":"17103659a85279bac046c69cb3b22bf2c11c2492cffb0edfa4c3b233d161a2f2","src/sys/statvfs.rs":"f81e3900ef90d62e7eceaf1b6ff8dcfd965466714c033eb4717687f692171f48","src/sys/sysinfo.rs":"b4519b1ca091c9dbe94d2a6fd6304944bf3df5626973d2c6884022559706f0d9","src/sys/termios.rs":"7923f9846a8122096b6b1cd240d3618b876ce500a751ac434954d172e2e85745","src/sys/time.rs":"9026033b60a5ccc95b70424aef043c8c748722e2ea8c7c86366ecd4585b651a0","src/sys/timer.rs":"8c10f0e7cfac857ad00460be30bc68b957909cc9296e70718d3b5d4a0babafde","src/sys/timerfd.rs":"ef7c48aefdcfac13316eeddbef5da04cf12e9f574b8d9f43402c02b6b8db86b3","src/sys/uio.rs":"e1d59ccbee9d46c65d3aa8c36aa3a3222539beea0d20163a8b707d08fca14e09","src/sys/utsname.rs":"0cdda0cc111caaa0e4ebe2d4588bdc825d878e5bcb7a9136073b15f87a20e11f","src/sys/wait.rs":"cc70d2d9b880ff6c48577a479c209af6127067bc013a90ee22538e4dfad7d2b4","src/time.rs":"d4e0872361a57810837f5bd790cbca3a2b9db1ac4694a3c52d1564ad3532d3be","src/ucontext.rs":"b8f2e04757a9c2bc38c3b1e259d3a013da8a730fe9bfbe5487637395681b43d3","src/unistd.rs":"e19be456124731c5b93aef92ed72a7c4c9092e28db0649814ba3fcc1f0d620fa","test/common/mod.rs":"1d7e28e3635754664cd056f3a1079232ff5c118df619e1d0551a9972eb0b3cd6","test/sys/mod.rs":"87b2891d83067ff21f72b8ff7fde3019dc45b6877282ac278b6da151de45c7a7","test/sys/test_aio.rs":"4dac9f716f852f1f438f78d6e64bf041e6fd316bf15dcb27afffaf0894bdefa6","test/sys/test_aio_drop.rs":"614070155fa16a979b7341d001639c5ce24a1d6f632c3abce45a5a6d49c4039b","test/sys/test_epoll.rs":"ffe95e36c79e37426ef8e8ca3b137b7f35ea0333ce666a20a4b7878db17680e9","test/sys/test_inotify.rs":"a141b9a995892547b51ceeb6761a70a6b86d37e8f38d13ea2c497b81b4b0f49f","test/sys/test_ioctl.rs":"00ccc5afb665e533a0a4b6d6a6be438bcaea19fce335390feef4e91d17b3036c","test/sys/test_mman.rs":"2b4161964c9204b74659028b0f89a88f4e3bcc9886137a3039737cd91d2698cb","test/sys/test_pthread.rs":"ace36a2f5587f1874854281b4fd84e4e4d892a1e3c5cc38ced57975739522ad6","test/sys/test_ptrace.rs":"0385eebc8b1b8c72f655b745769decd9143ad83018198375982da0896310456b","test/sys/test_select.rs":"54cea1c34ad28d5770a613c1c3cbc3b1064b22037ec2b9d3fcd422d3be9e60a7","test/sys/test_signal.rs":"acc9941227bd3e2afad323613c2b8c83902ed0486d3745fd72704f395924f1e4","test/sys/test_signalfd.rs":"0e1060143e2612c490bc3d0168d0bbb042ef55e3f1d91d2578b9e42e4310a14d","test/sys/test_socket.rs":"d2df1001f9a0b2dac0b88051a67c3868bb216e72e4da4eecd11c4448b9fa4b40","test/sys/test_sockopt.rs":"4465f22f718442f3f7b502e052dad02b93cebfa3b71fa55ff4f25fb02534acab","test/sys/test_stat.rs":"6630a28217fd708bb84cd4f7e7101836b74f2420f9888923fdab664ccc331c1d","test/sys/test_sysinfo.rs":"ffd49bc96375914a2c4a4a59730cae8072f85771e2c4a80d3403df38d967e272","test/sys/test_termios.rs":"e5bcef10c84bd7583d600d5601835bcb3cfc88781cb283ab0185bbef5faf4327","test/sys/test_timerfd.rs":"cfed3abf58118611d08f6985251a7739cff67108e11214222a1d2394a3a026ce","test/sys/test_uio.rs":"32656bd0a5699e4d019aa928edf104637937179782914a82d50d37226e84c421","test/sys/test_wait.rs":"6fd59fffeeb09ff620c359baefd062ba777598982b6cb001ccc07b6bc7605493","test/test.rs":"11f40b0718ddd1a150cb9e703d56d0b2a9462306505a2245ddf273a2011f48b5","test/test_clearenv.rs":"45ca548035b3c20ec87314715feaba2be973709a635d85b8cde46fd1d9f1ecd4","test/test_dir.rs":"ae3c11c58cb06da6557aa2a839c6653c54cd7724283fffe9df5a5d3feabdd89a","test/test_fcntl.rs":"71dcb87f7b04d78fc62937ba46cb7f0f1f2dbb330b63a996ea2e8ec9056b98a9","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"b4ae25841c2f06f32de9f1acd8230eeccd7095721302ebe78ad454e4e4f9c783","test/test_mount.rs":"6dd242b6e23c9c39e1a75612bbea62573898818ab374c3c032c2cdb97033554d","test/test_mq.rs":"136071f24131aac0e65d5f29ac18e3806641dfae1164813f5570c0e3a6f70553","test/test_net.rs":"f2912327ebb2a3d37e6cff02a5ac3106cf889cc5c74404db4ef0034059ba26f1","test/test_nix_path.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","test/test_nmount.rs":"d6c112547bb80968170b5497cda4b6cbf69dabec6f51d494bd52298995ceff18","test/test_poll.rs":"3e0b8f0397ba080785c61a3bfc3d637bc87f324bc4e52b5f1bf3ca0d32dbc9fe","test/test_pty.rs":"b26238a0783746cb31880e11eebc1913149be999ce75fbc2d6677bdd1e2731b2","test/test_ptymaster_drop.rs":"ae63c815f5028ddc67d194e86559483018ab1816316bdb917f40cee9364fd8a5","test/test_resource.rs":"40aef790ab745cec31a4b333d2ca406b462aa9bdf4a6d3756371e498b8d51e9a","test/test_sched.rs":"c4579bd376fab8816e63b07fa9ace31dc08e63ebb7c855a2c450698090d1d1e8","test/test_sendfile.rs":"bb41b4f3621b518e397d3a5b5ad3c5dcef3fe506afe516eab7572fbab92b77e3","test/test_stat.rs":"c407ca47a5258750076d041afad2f6add4c3563be36628bde1c5b314f5d0765d","test/test_time.rs":"f7a21b1e279e60e84909d5dadda97ded66d3326b131fe317badf9af0a1b50335","test/test_timer.rs":"3ae20d364f075d2811f3ff94eda9886682cc21d8807656007d2464fe36d1e361","test/test_unistd.rs":"20a00be4fbe26302ea5fe50ce25b99265dc763db138663d6aa1d7ac729a1d292"},"package":"bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"} -diff --git a/third_party/rust/nix/src/sys/ioctl/linux.rs b/third_party/rust/nix/src/sys/ioctl/linux.rs -index 0c0a209053..214d9e8c60 100644 ---- a/third_party/rust/nix/src/sys/ioctl/linux.rs -+++ b/third_party/rust/nix/src/sys/ioctl/linux.rs -@@ -41,6 +41,7 @@ mod consts { - target_arch = "s390x", - target_arch = "x86_64", - target_arch = "aarch64", -+ target_arch = "loongarch64", - target_arch = "riscv32", - target_arch = "riscv64" - ))] --- -2.41.0 - - diff --git a/backport-Bug-1782159-to-support-loongarch64.patch b/backport-Bug-1782159-to-support-loongarch64.patch deleted file mode 100644 index 2a951da51ba50e984acab277666f1bddee5c9c43..0000000000000000000000000000000000000000 --- a/backport-Bug-1782159-to-support-loongarch64.patch +++ /dev/null @@ -1,469 +0,0 @@ -From 01ea3f7cf670d9e1f62a8f97474c84831d2e0e18 Mon Sep 17 00:00:00 2001 -From: wujiahuan -Date: Thu, 14 Dec 2023 12:40:12 +0000 -Subject: [PATCH] backport Bug 1782159 to support loongarch64 -https://hg.mozilla.org/mozilla-central/rev/f01044248c8595683ca1f625080c9aee51655966 - ---- - xpcom/reflect/xptcall/md/unix/moz.build | 8 + - .../md/unix/xptcinvoke_asm_loongarch64.S | 91 ++++++++++ - .../md/unix/xptcinvoke_loongarch64.cpp | 100 +++++++++++ - .../md/unix/xptcstubs_asm_loongarch64.S | 53 ++++++ - .../xptcall/md/unix/xptcstubs_loongarch64.cpp | 160 ++++++++++++++++++ - 5 files changed, 412 insertions(+) - create mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_loongarch64.S - create mode 100644 xpcom/reflect/xptcall/md/unix/xptcinvoke_loongarch64.cpp - create mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_asm_loongarch64.S - create mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_loongarch64.cpp - -diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build -index 1779c148cb..e74c936c38 100644 ---- a/xpcom/reflect/xptcall/md/unix/moz.build -+++ b/xpcom/reflect/xptcall/md/unix/moz.build -@@ -271,6 +271,14 @@ if CONFIG["OS_ARCH"] == "Linux" and CONFIG["CPU_ARCH"] == "riscv64": - "xptcstubs_riscv64.cpp", - ] - -+if CONFIG["OS_ARCH"] == "Linux" and CONFIG["CPU_ARCH"] == "loongarch64": -+ SOURCES += [ -+ "xptcinvoke_asm_loongarch64.S", -+ "xptcinvoke_loongarch64.cpp", -+ "xptcstubs_asm_loongarch64.S", -+ "xptcstubs_loongarch64.cpp", -+ ] -+ - FINAL_LIBRARY = "xul" - - LOCAL_INCLUDES += [ -diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_loongarch64.S b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_loongarch64.S -new file mode 100644 -index 0000000000..8769060aed ---- /dev/null -+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_loongarch64.S -@@ -0,0 +1,91 @@ -+/* This Source Code Form subject to the terms of Mozilla Public -+ * License, v. 2.0 If a copy of the MPL was not distributed with -+ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ */ -+ -+ .set NGPREGS, 8 -+ .set NFPREGS, 8 -+ -+ .text -+ .globl _NS_InvokeByIndex -+ .type _NS_InvokeByIndex, @function -+/* -+ * _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, -+ * uint32_t paramCount, nsXPTCVariant* params) -+ */ -+_NS_InvokeByIndex: -+ .cfi_startproc -+ addi.d $sp, $sp, -32 -+ .cfi_def_cfa_offset 32 -+ st.d $s0, $sp, 16 -+ .cfi_offset 23, -16 -+ st.d $s1, $sp, 8 -+ .cfi_offset 24, -24 -+ st.d $s2, $sp, 0 -+ .cfi_offset 25, -32 -+ st.d $ra, $sp, 24 -+ .cfi_offset 1, -8 -+ -+ move $s2, $a0 -+ move $s1, $a1 -+ move $s0, $sp -+ .cfi_def_cfa_register 23 -+ -+ /* 16-bytes alignment */ -+ addi.d $a0, $a2, 1 -+ li.d $t4, 0xfffffffffffffffe -+ and $a0, $a0, $t4 -+ slli.d $a0, $a0, 3 -+ sub.d $sp, $sp, $a0 -+ move $a4, $sp -+ -+ addi.d $sp, $sp, -8*(NFPREGS+NGPREGS) -+ move $a0, $sp -+ addi.d $a1, $sp, 8*NGPREGS -+ -+ bl invoke_copy_to_stack -+ -+ /* 1st argument is this */ -+ move $a0, $s2 -+ -+ ld.d $a1, $sp, 8 -+ ld.d $a2, $sp, 16 -+ ld.d $a3, $sp, 24 -+ ld.d $a4, $sp, 32 -+ ld.d $a5, $sp, 40 -+ ld.d $a6, $sp, 48 -+ ld.d $a7, $sp, 56 -+ -+ fld.d $fa0, $sp, 64 -+ fld.d $fa1, $sp, 72 -+ fld.d $fa2, $sp, 80 -+ fld.d $fa3, $sp, 88 -+ fld.d $fa4, $sp, 96 -+ fld.d $fa5, $sp, 104 -+ fld.d $fa6, $sp, 112 -+ fld.d $fa7, $sp, 120 -+ -+ addi.d $sp, $sp, 8*(NGPREGS+NFPREGS) -+ -+ ld.d $s2, $s2, 0 -+ slli.w $s1, $s1, 3 -+ add.d $s2, $s2, $s1 -+ ld.d $t3, $s2, 0 -+ jirl $ra, $t3, 0 -+ -+ move $sp, $s0 -+ .cfi_def_cfa_register 3 -+ ld.d $s0, $sp, 16 -+ .cfi_restore 23 -+ ld.d $s1, $sp, 8 -+ .cfi_restore 24 -+ ld.d $s2, $sp, 0 -+ .cfi_restore 25 -+ ld.d $ra, $sp, 24 -+ .cfi_restore 1 -+ addi.d $sp, $sp, 32 -+ .cfi_def_cfa_offset -32 -+ jirl $zero, $ra, 0 -+ .cfi_endproc -+ .size _NS_InvokeByIndex, .-_NS_InvokeByIndex -+ .section .note.GNU-stack, "", @progbits -diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_loongarch64.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_loongarch64.cpp -new file mode 100644 -index 0000000000..61bb7b2efd ---- /dev/null -+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_loongarch64.cpp -@@ -0,0 +1,100 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+extern "C" void invoke_copy_to_stack(uint64_t* gpregs, double* fpregs, -+ uint32_t paramCount, nsXPTCVariant* s, -+ uint64_t* d) { -+ static const uint32_t GPR_COUNT = 8; -+ static const uint32_t FPR_COUNT = 8; -+ -+ uint32_t nr_gpr = 1; // skip one GPR register for "this" -+ uint32_t nr_fpr = 0; -+ uint64_t value = 0; -+ -+ for (uint32_t i = 0; i < paramCount; i++, s++) { -+ if (s->IsIndirect()) { -+ value = (uint64_t)&s->val; -+ } else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: -+ break; -+ case nsXPTType::T_DOUBLE: -+ break; -+ case nsXPTType::T_I8: -+ value = s->val.i8; -+ break; -+ case nsXPTType::T_I16: -+ value = s->val.i16; -+ break; -+ case nsXPTType::T_I32: -+ value = s->val.i32; -+ break; -+ case nsXPTType::T_I64: -+ value = s->val.i64; -+ break; -+ case nsXPTType::T_U8: -+ value = s->val.u8; -+ break; -+ case nsXPTType::T_U16: -+ value = s->val.u16; -+ break; -+ case nsXPTType::T_U32: -+ value = s->val.u32; -+ break; -+ case nsXPTType::T_U64: -+ value = s->val.u64; -+ break; -+ case nsXPTType::T_BOOL: -+ value = s->val.b; -+ break; -+ case nsXPTType::T_CHAR: -+ value = s->val.c; -+ break; -+ case nsXPTType::T_WCHAR: -+ value = s->val.wc; -+ break; -+ default: -+ value = (uint64_t)s->val.p; -+ break; -+ } -+ } -+ -+ if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) { -+ fpregs[nr_fpr++] = s->val.d; -+ } else if (nr_gpr < GPR_COUNT) { -+ memcpy(&gpregs[nr_gpr++], &(s->val.d), sizeof(s->val.d)); -+ } else { -+ memcpy(d++, &(s->val.d), sizeof(s->val.d)); -+ } -+ } else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) { -+ memcpy(&fpregs[nr_fpr++], &(s->val.f), sizeof(s->val.f)); -+ } else if (nr_gpr < GPR_COUNT) { -+ memcpy(&gpregs[nr_gpr++], &(s->val.f), sizeof(s->val.f)); -+ } else { -+ memcpy(d++, &(s->val.f), sizeof(s->val.f)); -+ } -+ } else { -+ if (nr_gpr < GPR_COUNT) { -+ gpregs[nr_gpr++] = value; -+ } else { -+ *d++ = value; -+ } -+ } -+ } -+} -+ -+extern "C" nsresult _NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, -+ uint32_t paramCount, -+ nsXPTCVariant* params); -+EXPORT_XPCOM_API(nsresult) -+NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, uint32_t paramCount, -+ nsXPTCVariant* params) { -+ return _NS_InvokeByIndex(that, methodIndex, paramCount, params); -+} -diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_loongarch64.S b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_loongarch64.S -new file mode 100644 -index 0000000000..5041de962c ---- /dev/null -+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_loongarch64.S -@@ -0,0 +1,53 @@ -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+ -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ -+ .set NGPRGES, 8 -+ .set NFPREGS, 8 -+ -+ .text -+ .globl SharedStub -+ .hidden SharedStub -+ .type SharedStub,@function -+ -+SharedStub: -+ .cfi_startproc -+ move $t0, $sp -+ addi.d $sp, $sp, -8*(NGPRGES+NFPREGS)-16 -+ .cfi_def_cfa_offset 8*(NGPRGES+NFPREGS)+16 -+ st.d $a0, $sp, 0 -+ st.d $a1, $sp, 8 -+ st.d $a2, $sp, 16 -+ st.d $a3, $sp, 24 -+ st.d $a4, $sp, 32 -+ st.d $a5, $sp, 40 -+ st.d $a6, $sp, 48 -+ st.d $a7, $sp, 56 -+ fst.d $fa0, $sp, 64 -+ fst.d $fa1, $sp, 72 -+ fst.d $fa2, $sp, 80 -+ fst.d $fa3, $sp, 88 -+ fst.d $fa4, $sp, 96 -+ fst.d $fa5, $sp, 104 -+ fst.d $fa6, $sp, 112 -+ fst.d $fa7, $sp, 120 -+ st.d $ra, $sp, 136 -+ .cfi_offset 1, 136 -+ -+ /* methodIndex is passed from stub */ -+ move $a1, $t6 -+ move $a2, $t0 -+ move $a3, $sp -+ addi.d $a4, $sp, 8*NGPRGES -+ -+ bl PrepareAndDispatch -+ -+ ld.d $ra, $sp, 136 -+ .cfi_restore 1 -+ addi.d $sp, $sp, 8*(NGPRGES+NFPREGS)+16 -+ .cfi_def_cfa_offset -8*(NGPRGES+NFPREGS)-16 -+ jirl $zero, $ra, 0 -+ .cfi_endproc -+ -+ .size SharedStub, .-SharedStub -+ .section .note.GNU-stack, "", @progbits -diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_loongarch64.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_loongarch64.cpp -new file mode 100644 -index 0000000000..1ea4289045 ---- /dev/null -+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_loongarch64.cpp -@@ -0,0 +1,160 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, V. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "xptcprivate.h" -+ -+extern "C" nsresult ATTRIBUTE_USED PrepareAndDispatch(nsXPTCStubBase* self, -+ uint32_t methodIndex, -+ uint64_t* args, -+ uint64_t* gpregs, -+ double* fpregs) { -+ static const uint32_t GPR_COUNT = 8; -+ static const uint32_t FPR_COUNT = 8; -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ const nsXPTMethodInfo* info; -+ -+ self->mEntry->GetMethodInfo(uint16_t(methodIndex), &info); -+ -+ uint32_t paramCount = info->GetParamCount(); -+ const uint8_t indexOfJSContext = info->IndexOfJSContext(); -+ -+ uint64_t* ap = args; -+ uint32_t nr_gpr = 1; // skip the arg which is 'self' -+ uint32_t nr_fpr = 0; -+ uint64_t value; -+ -+ for (uint32_t i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = ¶mBuffer[i]; -+ -+ if (i == indexOfJSContext) { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ ap++; -+ } -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) { -+ dp->val.d = fpregs[nr_fpr++]; -+ } else if (nr_gpr < GPR_COUNT) { -+ memcpy(&dp->val.d, &gpregs[nr_gpr++], sizeof(dp->val.d)); -+ } else { -+ memcpy(&dp->val.d, ap++, sizeof(dp->val.d)); -+ } -+ continue; -+ } -+ -+ if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) { -+ memcpy(&dp->val.f, &fpregs[nr_fpr++], sizeof(dp->val.f)); -+ } else if (nr_gpr < GPR_COUNT) { -+ memcpy(&dp->val.f, &gpregs[nr_gpr++], sizeof(dp->val.f)); -+ } else { -+ memcpy(&dp->val.f, ap++, sizeof(dp->val.f)); -+ } -+ continue; -+ } -+ -+ if (nr_gpr < GPR_COUNT) { -+ value = gpregs[nr_gpr++]; -+ } else { -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*)value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: -+ dp->val.i8 = (int8_t)value; -+ break; -+ case nsXPTType::T_I16: -+ dp->val.i16 = (int16_t)value; -+ break; -+ case nsXPTType::T_I32: -+ dp->val.i32 = (int32_t)value; -+ break; -+ case nsXPTType::T_I64: -+ dp->val.i64 = (int64_t)value; -+ break; -+ case nsXPTType::T_U8: -+ dp->val.u8 = (uint8_t)value; -+ break; -+ case nsXPTType::T_U16: -+ dp->val.u16 = (uint16_t)value; -+ break; -+ case nsXPTType::T_U32: -+ dp->val.u32 = (uint32_t)value; -+ break; -+ case nsXPTType::T_U64: -+ dp->val.u64 = (uint64_t)value; -+ break; -+ case nsXPTType::T_BOOL: -+ dp->val.b = (bool)(uint8_t)value; -+ break; -+ case nsXPTType::T_CHAR: -+ dp->val.c = (char)value; -+ break; -+ case nsXPTType::T_WCHAR: -+ dp->val.wc = (wchar_t)value; -+ break; -+ default: -+ NS_ERROR("bad type"); -+ break; -+ } -+ } -+ -+ nsresult result = self->mOuter->CallMethod((uint16_t)methodIndex, info, -+ paramBuffer); -+ return result; -+} -+ -+// Load $t6 with the constant 'n' and branch to SharedStub(). -+// clang-format off -+#define STUB_ENTRY(n) \ -+ __asm__( \ -+ ".text\n\t" \ -+ ".if "#n" < 10 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ -+ ".hidden _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ -+ "_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ -+ ".elseif "#n" < 100 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ -+ ".hidden _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ -+ "_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ -+ ".elseif "#n" < 1000 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ -+ ".hidden _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ -+ "_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ -+ ".else \n\t" \ -+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ -+ ".endif \n\t" \ -+ "li.d $t6, "#n" \n\t" \ -+ "b SharedStub \n" \ -+ ".if "#n" < 10 \n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub"#n"Ev,.-_ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".elseif "#n" < 100 \n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub"#n"Ev,.-_ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".else \n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub"#n"Ev,.-_ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".endif" \ -+); -+// clang-format on -+ -+#define SENTINEL_ENTRY(n) \ -+ nsresult nsXPTCStubBase::Sentinel##n() { \ -+ NS_ERROR("nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+ } -+ -+#include "xptcstubsdef.inc" --- -2.41.0 - - diff --git a/cbindgen-vendor.tar.xz b/cbindgen-vendor.tar.xz index 0315d8fd84339ec5926e9ae89dc075edada30e1f..72da8a1da05d57a7e5c27c56b897d5637a5d590a 100644 Binary files a/cbindgen-vendor.tar.xz and b/cbindgen-vendor.tar.xz differ diff --git a/disable-glean-sdk,psutil,zstandard.patch b/disable-glean-sdk,psutil,zstandard.patch deleted file mode 100644 index 39580dadf6e3eb044d98e0f956fe8d23f2bc52ac..0000000000000000000000000000000000000000 --- a/disable-glean-sdk,psutil,zstandard.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- firefox-115.4.0/python/sites/mach.txt 2023-10-17 10:48:58.000000000 +0800 -+++ firefox-115.4.0/python/sites/mach.txt 2023-11-15 11:10:22.840955542 +0800 -@@ -135,11 +135,3 @@ - pth:xpcom/ds/tools - pth:xpcom/geckoprocesstypes_generator - pth:xpcom/idl-parser --# glean-sdk may not be installable if a wheel isn't available --# and it has to be built from source. --pypi-optional:glean-sdk==52.7.0:telemetry will not be collected --# Mach gracefully handles the case where `psutil` is unavailable. --# We aren't (yet) able to pin packages in automation, so we have to --# support down to the oldest locally-installed version (5.4.2). --pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data --pypi-optional:zstandard>=0.11.1,<=0.22.0:zstd archives will not be possible to extract diff --git a/fedora-shebang-build.patch b/fedora-shebang-build.patch deleted file mode 100644 index 9ade86c309334fabd6fe4771209f54e1f0493d06..0000000000000000000000000000000000000000 --- a/fedora-shebang-build.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh ---- firefox-73.0/build/unix/run-mozilla.sh.old 2020-02-12 09:58:00.150895904 +0100 -+++ firefox-73.0/build/unix/run-mozilla.sh 2020-02-12 09:58:06.505860696 +0100 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/usr/bin/sh - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/firefox-115.15.0esr.source.tar.xz.asc b/firefox-115.15.0esr.source.tar.xz.asc deleted file mode 100644 index 93cf1110e4afb40db7ac6291ce89b22944215211..0000000000000000000000000000000000000000 --- a/firefox-115.15.0esr.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmbMkacACgkQ4207E/PZ -MnQIMRAApCTh0QtB534WKg8rOh4EXq1JPVq0geZeYod/7ogTcf0ePybfrO2dGeIv -vbzfm4NZsIkcznLvYj/0LpkiA3WRXNwO0Rlxrh2CcnwjAFpLMhSs7iIXFy+sPv3u -Pn3v0rZiHwvunA8dyLtQjOYgRTeJ+FCorD6lowhM722uMjUEp2vYocgztDeDY8tS -ZHdud1FLBybC3eT0DB/KfCCcNmIETk1NVm3MoyKz7+2AcMMEXKbP/mIWHKPh82wn -w0m+hjdfEYzWIQZqQwuypil4dfQ59hxZfU+/L5MFrLV5iBDS8gexjZKzUYQjHi2E -ismmfZdscqFsTzDhXdKhi5d5aFIJ65T+7ZVXK00lBzCBnWGMXTdBNEweXAeqseaX -yDyLKouaO5HnptTH88zrSEoKpAYpAVwgKxNUM+HjolqagHPBnRZENfZZ+272m7YI -NmwFBBE/gonJbOaNbkmdpPPlCrLuyXozMo5alRRAsOLDn9eHsVosg/PpYzXcs1z3 -BB60WU+/DNtQ36Oe/enMO5KhY/mHneoxk7VRIyaixyQoJuLv8/NYRB2YT92EWDut -Nhd6pdsMVD313F5d59NwdUOmGpW7SfmDcgJnHgLdFHddAhTk+4291eGxgSJP/g5m -9z5aUbuNlPlyAXVNUiPFkiSoOvFXtMRDDrDHomyCl7MVSEHDHxc= -=9hCE ------END PGP SIGNATURE----- diff --git a/firefox-115.15.0esr.source.tar.xz b/firefox-128.3.0esr.source.tar.xz similarity index 100% rename from firefox-115.15.0esr.source.tar.xz rename to firefox-128.3.0esr.source.tar.xz diff --git a/firefox-128.3.0esr.source.tar.xz.asc b/firefox-128.3.0esr.source.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..6d0f5358a7fb0a22e6e945f999e07aff89c0caea --- /dev/null +++ b/firefox-128.3.0esr.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmbxkrMACgkQ4207E/PZ +MnQ8khAA0WUg/6Ykv2Mbxq1840nUwoTqBy2OMyqCR4kuqHVJlKIbTn8U1Fqde4RS +qwgqkQ+eJUk6IAG/32KBZWJHsTFTUs+D0GYB+xqJnFGHDBcaK9IdvQz7SIIqzJUu +MlAqqbQm/vXfrVqjyIEvvG9dIaYVe85L3/KKGDcHQOSMGZxsTX/MvqOMMjGH7J6w +/kTFVjMcbrpjs1w1ovDtanNe66JNvuEnR5mdLvXa9o7Dg90ujJxq1jC/Z6h7A17f +lsey0v+7nbUBINhdiFNgg3HBlm6aj4axghd4SkEKB1Vb4eCZmlzqY0JgKY6Xw8FM +w9kKPAntGMaUXlSn0yR+XFlrwngTpi48+Ljgi/SxnKEGGOnWOj8XPpx0uxiRrIfp +xNpK/rDUT+5EEFkap7Prr0huIBzYE50H/JKx8hVIwHQFbPe/oLZE1IAwepG8wcxv +HQuYcYh+L+LG1uKqdLSlMi5EmLizobU0JWw+t989eR6wEPAyp5w+FZmYdNt9dgrk +33nc72RdaCFmkDOpF++uLf8I/s4hrpIEQ4DU5XHnaHdUFg0W7B6/BR7d1YACljHs +CkNm3XKcgYJJBeKHEskU5NozMpBbDC0OoXNzgGwpT1z2AmvsCI7JdAHTgSflTXe7 +wX/7t30hbGGzFdC9fJ6ZqUsC7EmZzPtpDmY5XI50yx9uZL32rhk= +=1kCT +-----END PGP SIGNATURE----- diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch index 15d0707cf01087cdee72c53a637c950f11c1d45b..75e14034050bf0d54ce84660d91e6727d5c850a3 100644 --- a/firefox-enable-addons.patch +++ b/firefox-enable-addons.patch @@ -1,10 +1,10 @@ -diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js ---- firefox-55.0/browser/app/profile/firefox.js.addons 2017-08-02 10:58:30.566363833 +0200 -+++ firefox-55.0/browser/app/profile/firefox.js 2017-08-02 10:59:15.377216959 +0200 -@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url" +diff -up firefox-125.0/browser/app/profile/firefox.js.addons firefox-125.0/browser/app/profile/firefox.js +--- firefox-125.0/browser/app/profile/firefox.js.addons 2024-04-09 10:34:30.728405003 +0200 ++++ firefox-125.0/browser/app/profile/firefox.js 2024-04-09 10:36:01.444584632 +0200 +@@ -58,7 +58,8 @@ pref("extensions.systemAddon.update.enab // Disable add-ons that are not installed by the user in all scopes by default. - // See the SCOPE constants in AddonManager.jsm for values to use here. + // See the SCOPE constants in AddonManager.sys.mjs for values to use here. -pref("extensions.autoDisableScopes", 15); +pref("extensions.autoDisableScopes", 0); +pref("extensions.showMismatchUI", false); diff --git a/firefox-langpacks-115.15.0esr.tar.xz b/firefox-langpacks-128.3.0esr.tar.xz similarity index 78% rename from firefox-langpacks-115.15.0esr.tar.xz rename to firefox-langpacks-128.3.0esr.tar.xz index ec39b748d0dab90ba64a4425731382be888b4eae..b38dca3244799e93131ee90d56b0ca06bc0473d7 100644 Binary files a/firefox-langpacks-115.15.0esr.tar.xz and b/firefox-langpacks-128.3.0esr.tar.xz differ diff --git a/firefox-tests-xpcshell-freeze.patch b/firefox-tests-xpcshell-freeze.patch deleted file mode 100644 index 111541797028ec20465fa0d2876dca70ee5db6cf..0000000000000000000000000000000000000000 --- a/firefox-tests-xpcshell-freeze.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up firefox-88.0/testing/xpcshell/runxpcshelltests.py.old firefox-88.0/testing/xpcshell/runxpcshelltests.py ---- firefox-88.0/testing/xpcshell/runxpcshelltests.py.old 2021-04-30 10:45:14.466616224 +0200 -+++ firefox-88.0/testing/xpcshell/runxpcshelltests.py 2021-04-30 10:45:21.339525085 +0200 -@@ -1382,8 +1382,8 @@ class XPCShellTests(object): - self.log.info("Process %s" % label) - self.log.info(msg) - -- dumpOutput(proc.stdout, "stdout") -- dumpOutput(proc.stderr, "stderr") -+ #dumpOutput(proc.stdout, "stdout") -+ #dumpOutput(proc.stderr, "stderr") - self.nodeProc = {} - - def startHttp3Server(self): diff --git a/firefox.sh.in b/firefox.sh.in index 9437266f75ef09460712a47b2c175341466c5c98..f8ad0fb45924c15e9fce8e206632d96124313e64 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -64,25 +64,8 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox" MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks" MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE" -MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh" GETENFORCE_FILE="/usr/sbin/getenforce" -## -## Enable Wayland backend? -## -%DISABLE_WAYLAND_PLACEHOLDER% - -if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then - if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then - export MOZ_ENABLE_WAYLAND=1 - fi -## Enable Wayland on KDE/Sway -## - if [ "$XDG_SESSION_TYPE" == "wayland" ]; then - export MOZ_ENABLE_WAYLAND=1 - fi -fi - ## ## Use D-Bus remote exclusively when there's Wayland display. ## diff --git a/firefox.spec b/firefox.spec index 362aa18145e6909f4ec1bc05bf16eac367c81271..103d2632dfdaef231958f2667908e603281de3d8 100644 --- a/firefox.spec +++ b/firefox.spec @@ -15,9 +15,10 @@ %global build_tests 1 %endif -%global system_nss 1 +# TODO: Revert this after SM2 & SM3 issue is fixed +%global system_nss 0 %global llvm_version 7.0 -%global rust_version 1.66 +%global rust_version 1.77 %global wayland_backend_default 0 %global system_av1 0 @@ -27,8 +28,7 @@ %if %{?system_nss} %global nspr_version 4.35 %global nspr_version_max 4.36 -%global nss_version 3.90 -%global nss_version_max 3.95 +%global nss_version 3.101 %endif %global mozappdir %{_libdir}/firefox @@ -44,7 +44,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.15.0 +Version: 128.3.0 Release: 1 URL: https://www.mozilla.org/firefox/ License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later @@ -77,69 +77,43 @@ Source36: testing.sh Source37: mochitest-python.tar.gz # Build patches -Patch01: disable-glean-sdk,psutil,zstandard.patch -Patch02: firefox-gcc-build.patch - +Patch01: firefox-gcc-build.patch # -- Upstreamed patches -- -Patch51: mozilla-bmo1170092.patch -Patch52: CVE-2023-7104.patch # -- Submitted upstream, not merged -- -Patch101: mozilla-bmo1636168-fscreen.patch -Patch102: mozilla-bmo1670333.patch -# Big endian fix -Patch103: mozilla-bmo1504834-part1.patch -Patch104: mozilla-bmo1504834-part3.patch -# Big endian fix -Patch105: mozilla-bmo849632.patch -# Big endian fix -Patch106: mozilla-bmo998749.patch -# Big endian fix -Patch107: mozilla-bmo1716707-swizzle.patch -Patch108: mozilla-bmo1716707-svg.patch - -# ---- Fedora specific patches ---- + + +# Enable user addons Patch151: firefox-enable-addons.patch Patch152: rhbz-1173156.patch -Patch153: fedora-shebang-build.patch -Patch154: firefox-nss-addon-hack.patch -# ARM run-time patch -Patch155: rhbz-1354671.patch +Patch153: firefox-nss-addon-hack.patch +# Specific ARM run-time patch below +Patch154: rhbz-1354671.patch # ---- Test patches ---- # Generate without context by # GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-xpcshell # GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-reftest -Patch201: firefox-tests-xpcshell-freeze.patch # ---- Security patches ---- -Patch301: CVE-2023-44488-libvpx.patch # system AV1 patches (from Gentoo) Patch800: bmo-1559213-Support-system-av1.patch Patch801: bmo-1559213-fix-system-av1-libs.patch +# Arch specific patches # ---- RISCV64 patches ---- -# Fix register conflict in MulI64.r=jseward -# https://phabricator.services.mozilla.com/D188068 -Patch1001: D188068.diff -Patch1002: add-loongarch64-support-for-nix.patch -Patch1003: add-loongarch64-support-for-cty.patch -Patch1004: add-loongarch64-support-for-authenticator.patch -Patch1005: add-loongarch64-support-for-ipc.patch -Patch1006: add-loongarch64-support-for-libwebrtc.patch -Patch1007: backport-Bug-1782159-to-support-loongarch64.patch +# ---- LOONGARCH patches ---- +Patch1002: add-loongarch64-support-for-libwebrtc.patch # BUILD REQURES/REQUIRES %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} BuildRequires: pkgconfig(nspr) < %{nspr_version_max} BuildRequires: pkgconfig(nss) >= %{nss_version} -BuildRequires: pkgconfig(nss) < %{nss_version_max} BuildRequires: nss-static >= %{nss_version} -BuildRequires: nss-static < %{nss_version_max} %endif BuildRequires: bzip2-devel @@ -401,40 +375,24 @@ rm -vf ./*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvali rm -vf ./*/layout/inspector/tests/chrome/test_fontVariationsAPI.css # Build patches -%patch -P1 -p1 -%patch -P2 -p1 -b .firefox-gcc-build +%patch -P1 -p1 -b .firefox-gcc-build # -- Upstreamed patches -- -%patch -P51 -p1 -b .mozilla-bmo1170092 -%patch -P52 -p1 # -- Submitted upstream, not merged -- -%patch -P101 -p1 -b .mozilla-bmo1636168-fscreen -%patch -P102 -p1 -b .mozilla-bmo1670333 -%patch -P103 -p1 -b .mozilla-bmo1504834-part1 -%patch -P104 -p1 -b .mozilla-bmo1504834-part3 -%patch -P105 -p1 -b .mozilla-bmo849632 -%patch -P106 -p1 -b .mozilla-bmo998749 -%patch -P107 -p1 -b .mozilla-bmo1716707-swizzle -%patch -P108 -p1 -b .mozilla-bmo1716707-svg - -# ---- Fedora specific patches ---- + +# ---- Specific patches ---- %patch -P151 -p1 -b .addons %patch -P152 -p1 -b .rhbz-1173156 -%patch -P153 -p1 -b .fedora-shebang -%patch -P154 -p1 -b .addons-nss-hack +%patch -P153 -p1 -b .addons-nss-hack # ARM run-time patch %ifarch aarch64 -%patch -P155 -p1 -b .rhbz-1354671 +%patch -P154 -p1 -b .rhbz-1354671 %endif # ---- Test patches ---- -%patch -P201 -p1 -b .firefox-tests-xpcshell-freeze # ---- Security patches ---- -cd media/libvpx/libvpx -%patch -P301 -p1 -b .CVE-2023-44488-libvpx -cd - # system AV1 patches %if %{system_av1} @@ -443,15 +401,11 @@ cd - %endif # RISCV64 patches -%patch -P1001 -p1 -b .D188068 #LoongArch64 patches +%ifarch loongarch64 %patch -P1002 -p1 -%patch -P1003 -p1 -%patch -P1004 -p1 -%patch -P1005 -p1 -%patch -P1006 -p1 -%patch -P1007 -p1 +%endif %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -606,6 +560,7 @@ chmod a+x %{_buildrootdir}/bin find ./ -path ./third_party/rust -prune -o -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';' MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//') +MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-fexceptions//') MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//') MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" @@ -856,9 +811,6 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries %{__cp} failures-* %{buildroot}/%{version}-%{release}/ || true %endif -# Copy over run-mozilla.sh -%{__cp} build/unix/run-mozilla.sh %{buildroot}%{mozappdir} - # Add distribution.ini %{__mkdir_p} %{buildroot}%{mozappdir}/distribution %{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution @@ -938,7 +890,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{langpackdir} %endif %{mozappdir}/browser/omni.ja -%{mozappdir}/run-mozilla.sh %{mozappdir}/application.ini %{mozappdir}/pingsender %exclude %{mozappdir}/removed-files @@ -959,17 +910,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/dictionaries %{mozappdir}/omni.ja %{mozappdir}/platform.ini -%{mozappdir}/plugin-container %{mozappdir}/gmp-clearkey %{mozappdir}/fonts/TwemojiMozilla.ttf %{mozappdir}/glxtest %{mozappdir}/vaapitest +%ifarch aarch64 riscv64 +%{mozappdir}/v4l2test +%endif %if !%{?system_nss} %exclude %{mozappdir}/libnssckbi.so %endif %changelog +* Tue Oct 08 2024 wangkai <13474090681@163.com> - 128.3.0-1 +- Update to 128.3.0 +- Fix CVE-2024-9392 CVE-2024-9393 CVE-2024-9394 CVE-2024-9396 + CVE-2024-9397 CVE-2024-9398 CVE-2024-9399 CVE-2024-9400 CVE-2024-9401 + CVE-2024-9402 + +* Thu Sep 05 2024 misaka00251 - 128.2.0-1 +- Upgrade to 128.2.0 +- Fix CVE-2024-8385 CVE-2024-8386 CVE-2024-8387 + * Wed Sep 04 2024 wangkai <13474090681@163.com> - 115.15.0-1 - Update to 115.15.0 - Fix CVE-2024-8381 CVE-2024-8382 CVE-2024-8383 CVE-2024-8384 diff --git a/mozilla-bmo1170092.patch b/mozilla-bmo1170092.patch deleted file mode 100644 index 36d2b00f4ec5758ea8a01b10ff2f104132eda238..0000000000000000000000000000000000000000 --- a/mozilla-bmo1170092.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp ---- firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2023-07-10 21:08:53.000000000 +0200 -+++ firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp 2023-07-17 10:33:23.443355156 +0200 -@@ -263,8 +263,20 @@ nsresult nsReadConfig::openAndEvaluateJS - if (NS_FAILED(rv)) return rv; - - rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile); -- if (NS_FAILED(rv)) return rv; -+ if (NS_FAILED(rv)) { -+ // Look for cfg file in /etc//pref -+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR, -+ getter_AddRefs(jsFile)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = jsFile->AppendNative(nsLiteralCString("pref")); -+ NS_ENSURE_SUCCESS(rv, rv); -+ rv = jsFile->AppendNative(nsDependentCString(aFileName)); -+ NS_ENSURE_SUCCESS(rv, rv); - -+ rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } - } else { - nsAutoCString location("resource://gre/defaults/autoconfig/"); - location += aFileName; -diff -up firefox-115.0.2/modules/libpref/Preferences.cpp.1170092 firefox-115.0.2/modules/libpref/Preferences.cpp ---- firefox-115.0.2/modules/libpref/Preferences.cpp.1170092 2023-07-10 21:09:00.000000000 +0200 -+++ firefox-115.0.2/modules/libpref/Preferences.cpp 2023-07-17 10:33:23.444355156 +0200 -@@ -4825,6 +4825,9 @@ nsresult Preferences::InitInitialObjects - // - // Thus, in the omni.jar case, we always load app-specific default - // preferences from omni.jar, whether or not `$app == $gre`. -+ // -+ // At very end load configuration from system config location: -+ // - /etc/firefox/pref/*.js - - nsresult rv = NS_ERROR_FAILURE; - UniquePtr find; -diff -up firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp ---- firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092 2023-07-10 22:57:20.000000000 +0200 -+++ firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp 2023-07-17 10:56:25.309692121 +0200 -@@ -72,6 +72,7 @@ - #endif - #ifdef XP_UNIX - # include -+# include "nsIXULAppInfo.h" - #endif - #ifdef XP_IOS - # include "UIKitDirProvider.h" -@@ -478,6 +479,17 @@ nsXREDirProvider::GetFile(const char* aP - rv = file->AppendNative(nsLiteralCString(PREF_OVERRIDE_DIRNAME)); - NS_ENSURE_SUCCESS(rv, rv); - rv = EnsureDirectoryExists(file); -+ } else if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) { -+ nsCString sysConfigDir = nsLiteralCString("/etc/"); -+ nsCOMPtr appInfo = do_GetService("@mozilla.org/xre/app-info;1"); -+ if (!appInfo) -+ return NS_ERROR_NOT_AVAILABLE; -+ nsCString appName; -+ appInfo->GetName(appName); -+ ToLowerCase(appName); -+ sysConfigDir.Append(appName); -+ NS_NewNativeLocalFile(sysConfigDir, false, getter_AddRefs(file)); -+ rv = EnsureDirectoryExists(file); - } else { - // We don't know anything about this property. Fail without warning, because - // otherwise we'll get too much warning spam due to -@@ -694,6 +706,16 @@ nsXREDirProvider::GetFiles(const char* a - } - #endif - -+ // Add /etc//pref/ directory if it exists -+ nsCOMPtr systemPrefDir; -+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR, -+ getter_AddRefs(systemPrefDir)); -+ if (NS_SUCCEEDED(rv)) { -+ rv = systemPrefDir->AppendNative(nsLiteralCString("pref")); -+ if (NS_SUCCEEDED(rv)) -+ directories.AppendObject(systemPrefDir); -+ } -+ - rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile)); - } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) { - // NS_APP_CHROME_DIR_LIST is only used to get default (native) icons -diff -up firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h ---- firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2023-07-10 21:09:13.000000000 +0200 -+++ firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h 2023-07-17 10:33:23.444355156 +0200 -@@ -58,6 +58,7 @@ - #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL" - #define NS_APP_PREFS_OVERRIDE_DIR \ - "PrefDOverride" // Directory for per-profile defaults -+#define NS_APP_PREFS_SYSTEM_CONFIG_DIR "PrefSysConf" // Directory with system-wide configuration - - #define NS_APP_USER_PROFILE_50_DIR "ProfD" - #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD" diff --git a/mozilla-bmo1504834-part1.patch b/mozilla-bmo1504834-part1.patch deleted file mode 100644 index 5246c5a03faf9c1f91c61b7908f3814ba594f197..0000000000000000000000000000000000000000 --- a/mozilla-bmo1504834-part1.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp ---- firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 2023-09-20 22:15:11.850172571 +0200 -+++ firefox-115.2.0/gfx/2d/DrawTargetSkia.cpp 2023-09-20 22:16:10.446147737 +0200 -@@ -156,8 +156,8 @@ static IntRect CalculateSurfaceBounds(co - } - - static const int kARGBAlphaOffset = -- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; -- -+ 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == -+ // SurfaceFormat::B8G8R8A8 ? 3 : 0; - static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, - const int32_t aStride, SurfaceFormat aFormat) { - if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) { -diff -up firefox-115.2.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-115.2.0/gfx/2d/Types.h ---- firefox-115.2.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 2023-08-21 15:43:23.000000000 +0200 -+++ firefox-115.2.0/gfx/2d/Types.h 2023-09-20 22:15:11.850172571 +0200 -@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t { - // This represents the unknown format. - UNKNOWN, // TODO: Replace uses with Maybe. - --// The following values are endian-independent synonyms. The _UINT32 suffix --// indicates that the name reflects the layout when viewed as a uint32_t --// value. --#if MOZ_LITTLE_ENDIAN() -+ // The following values are endian-independent synonyms. The _UINT32 suffix -+ // indicates that the name reflects the layout when viewed as a uint32_t -+ // value. - A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB - X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB --#elif MOZ_BIG_ENDIAN() -- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB -- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB --#else --# error "bad endianness" --#endif - - // The following values are OS and endian-independent synonyms. - // -diff -up firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc ---- firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc.mozilla-bmo1504834-part1 2023-08-21 15:43:23.000000000 +0200 -+++ firefox-115.2.0/gfx/skia/skia/modules/skcms/skcms.cc 2023-09-20 22:15:11.851172570 +0200 -@@ -30,6 +30,8 @@ - #include - #include - #endif -+#else -+ #define SKCMS_PORTABLE - #endif - - static bool runtime_cpu_detection = true; -@@ -324,20 +326,28 @@ enum { - static uint16_t read_big_u16(const uint8_t* ptr) { - uint16_t be; - memcpy(&be, ptr, sizeof(be)); --#if defined(_MSC_VER) -- return _byteswap_ushort(be); -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+ return be; - #else -- return __builtin_bswap16(be); -+ #if defined(_MSC_VER) -+ return _byteswap_ushort(be); -+ #else -+ return __builtin_bswap16(be); -+ #endif - #endif - } - - static uint32_t read_big_u32(const uint8_t* ptr) { - uint32_t be; - memcpy(&be, ptr, sizeof(be)); --#if defined(_MSC_VER) -- return _byteswap_ulong(be); -+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__ -+ return be; - #else -- return __builtin_bswap32(be); -+ #if defined(_MSC_VER) -+ return _byteswap_ulong(be); -+ #else -+ return __builtin_bswap32(be); -+ #endif - #endif - } - diff --git a/mozilla-bmo1504834-part3.patch b/mozilla-bmo1504834-part3.patch deleted file mode 100644 index 9c2ece0d8983f026a2951817da278b24996ce29a..0000000000000000000000000000000000000000 --- a/mozilla-bmo1504834-part3.patch +++ /dev/null @@ -1,17 +0,0 @@ -# HG changeset patch -# Parent 09cd4ac2cc607e85aa572425b824fbab386af607 -For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the -right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). - -diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h ---- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h -+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h -@@ -210,6 +210,8 @@ namespace SK_OPTS_NS { - // ~~~> - // a = 1*aa + d(1-1*aa) = aa + d(1-aa) - // c = 0*aa + d(1-1*aa) = d(1-aa) -+ // TODO: Check this for endian-issues! -+ // Do we need to switch 255 to the front for all of those tuples? - return (aa & Sk4px(skvx::byte16{0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255})) - + d.approxMulDiv255(aa.inv()); - }; diff --git a/mozilla-bmo1636168-fscreen.patch b/mozilla-bmo1636168-fscreen.patch deleted file mode 100644 index e8bb3103395d93b08e517830b11f73d9de2c7d1f..0000000000000000000000000000000000000000 --- a/mozilla-bmo1636168-fscreen.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -up firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-114.0/widget/gtk/nsWindow.cpp ---- firefox-114.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2023-05-17 10:43:02.000000000 +0200 -+++ firefox-114.0/widget/gtk/nsWindow.cpp 2023-05-17 13:53:54.000443278 +0200 -@@ -100,6 +100,7 @@ - #include "ScreenHelperGTK.h" - #include "SystemTimeConverter.h" - #include "WidgetUtilsGtk.h" -+#include "nsIBrowserHandler.h" - - #ifdef ACCESSIBILITY - # include "mozilla/a11y/LocalAccessible.h" -@@ -173,7 +174,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR - GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK | -- GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK; -+ GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK | -+ GDK_FOCUS_CHANGE_MASK; - - /* utility functions */ - static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX, -@@ -433,7 +435,8 @@ nsWindow::nsWindow() - mResizedAfterMoveToRect(false), - mConfiguredClearColor(false), - mGotNonBlankPaint(false), -- mNeedsToRetryCapturingMouse(false) { -+ mNeedsToRetryCapturingMouse(false), -+ mPendingFullscreen(false) { - mWindowType = WindowType::Child; - mSizeConstraints.mMaxSize = GetSafeWindowSize(mSizeConstraints.mMaxSize); - -@@ -5263,6 +5266,19 @@ void nsWindow::OnWindowStateEvent(GtkWid - ClearTransparencyBitmap(); - } - } -+ -+ // Hack to ensure window switched to fullscreen - avoid to fail when starting -+ // in kiosk mode -+ if (mPendingFullscreen && -+ !(aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) { -+ LOG( -+ " Window should be fullscreen, but it's not, retrying set to " -+ "fullscreen.\n"); -+ MakeFullScreen(true); -+ } else { -+ LOG(" Window successfully switched to fullscreen, happy now\n"); -+ mPendingFullscreen = false; -+ } - } - - void nsWindow::OnDPIChanged() { -@@ -7409,6 +7425,19 @@ nsresult nsWindow::MakeFullScreen(bool a - } - } - -+ // if in kiosk, ensure the fullscreen is called -+ nsCOMPtr browserHandler = -+ do_GetService("@mozilla.org/browser/clh;1"); -+ if (browserHandler) { -+ bool isKiosk; -+ browserHandler->GetKiosk(&isKiosk); -+ if (isKiosk) { -+ LOG(" is kiosk, ensure the window switch to fullscreen\n"); -+ mPendingFullscreen = true; -+ } -+ } else { -+ LOG(" Cannot find the browserHandler service.\n"); -+ } - gtk_window_fullscreen(GTK_WINDOW(mShell)); - } else { - gtk_window_unfullscreen(GTK_WINDOW(mShell)); -diff -up firefox-114.0/widget/gtk/nsWindow.h.D110204-fscreen.diff firefox-114.0/widget/gtk/nsWindow.h ---- firefox-114.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2023-05-17 08:46:16.000000000 +0200 -+++ firefox-114.0/widget/gtk/nsWindow.h 2023-05-17 13:51:29.502159247 +0200 -@@ -752,6 +752,7 @@ class nsWindow final : public nsBaseWidg - * move-to-rect callback we set mMovedAfterMoveToRect/mResizedAfterMoveToRect. - */ - bool mWaitingForMoveToRectCallback : 1; -+ bool mPendingFullscreen : 1; - bool mMovedAfterMoveToRect : 1; - bool mResizedAfterMoveToRect : 1; - diff --git a/mozilla-bmo1670333.patch b/mozilla-bmo1670333.patch deleted file mode 100644 index 7126d433733bea0c5876251879c94c9a119539f3..0000000000000000000000000000000000000000 --- a/mozilla-bmo1670333.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/media/mp4/MP4Demuxer.cpp ---- firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2023-06-06 23:14:43.000000000 +0200 -+++ firefox-115.0/dom/media/mp4/MP4Demuxer.cpp 2023-06-08 08:15:48.214109403 +0200 -@@ -32,6 +32,8 @@ mozilla::LogModule* GetDemuxerLog() { re - DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \ - __func__, ##__VA_ARGS__) - -+extern bool gUseKeyframeFromContainer; -+ - namespace mozilla { - - using TimeUnit = media::TimeUnit; -@@ -404,6 +406,12 @@ already_AddRefed MP4TrackD - [[fallthrough]]; - case H264::FrameType::OTHER: { - bool keyframe = type == H264::FrameType::I_FRAME; -+ if (gUseKeyframeFromContainer) { -+ if (sample->mKeyframe && sample->mKeyframe != keyframe) { -+ sample->mKeyframe = keyframe; -+ } -+ break; -+ } - if (sample->mKeyframe != keyframe) { - NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe " - "@ pts:%" PRId64 " dur:%" PRId64 -diff -up firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-115.0/dom/media/platforms/PDMFactory.cpp ---- firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 2023-06-06 23:14:44.000000000 +0200 -+++ firefox-115.0/dom/media/platforms/PDMFactory.cpp 2023-06-08 08:09:33.145289602 +0200 -@@ -67,6 +67,8 @@ - - #include - -+bool gUseKeyframeFromContainer = false; -+ - using DecodeSupport = mozilla::media::DecodeSupport; - using DecodeSupportSet = mozilla::media::DecodeSupportSet; - using MediaCodec = mozilla::media::MediaCodec; -@@ -562,7 +564,7 @@ void PDMFactory::CreateRddPDMs() { - #ifdef MOZ_FFMPEG - if (StaticPrefs::media_ffmpeg_enabled() && - StaticPrefs::media_rdd_ffmpeg_enabled() && -- !CreateAndStartupPDM()) { -+ !(mFFmpegUsed = CreateAndStartupPDM())) { - mFailureFlags += GetFailureFlagBasedOnFFmpegStatus( - FFmpegRuntimeLinker::LinkStatusCode()); - } -@@ -738,9 +740,10 @@ void PDMFactory::CreateDefaultPDMs() { - - CreateAndStartupPDM(); - -- if (StaticPrefs::media_gmp_decoder_enabled() && -+ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed && - !StartupPDM(GMPDecoderModule::Create(), - StaticPrefs::media_gmp_decoder_preferred())) { -+ gUseKeyframeFromContainer = true; - mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup; - } - } -diff -up firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 firefox-115.0/dom/media/platforms/PDMFactory.h ---- firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 2023-06-06 23:14:42.000000000 +0200 -+++ firefox-115.0/dom/media/platforms/PDMFactory.h 2023-06-08 08:09:33.145289602 +0200 -@@ -103,6 +103,7 @@ class PDMFactory final { - RefPtr mNullPDM; - - DecoderDoctorDiagnostics::FlagsSet mFailureFlags; -+ bool mFFmpegUsed = false; - - friend class RemoteVideoDecoderParent; - static void EnsureInit(); diff --git a/mozilla-bmo1716707-svg.patch b/mozilla-bmo1716707-svg.patch deleted file mode 100644 index 9c0559caa0d814d9a4966c05ebfe105a1036fe89..0000000000000000000000000000000000000000 --- a/mozilla-bmo1716707-svg.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User M. Sirringhaus -# Date 1645518286 -3600 -# Tue Feb 22 09:24:46 2022 +0100 -# Node ID 81832d035e101471dcf52dd91de287268add7a91 -# Parent 66f7ce16eb4965108687280e5443edd610631efb -imported patch svg-rendering.patch - -diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp ---- a/image/imgFrame.cpp -+++ b/image/imgFrame.cpp -@@ -372,6 +372,17 @@ nsresult imgFrame::InitWithDrawable(gfxD - return NS_ERROR_OUT_OF_MEMORY; - } - -+#if MOZ_BIG_ENDIAN() -+ if (aBackend == gfx::BackendType::SKIA && canUseDataSurface) { -+ // SKIA is lying about what format it returns on big endian -+ for (int ii=0; ii < mRawSurface->GetSize().Height()*mRawSurface->Stride() / 4; ++ii) { -+ uint32_t *vals = (uint32_t*)(mRawSurface->GetData()); -+ uint32_t val = ((vals[ii] << 8) & 0xFF00FF00 ) | ((vals[ii] >> 8) & 0xFF00FF ); -+ vals[ii] = (val << 16) | (val >> 16); -+ } -+ } -+#endif -+ - if (!canUseDataSurface) { - // We used an offscreen surface, which is an "optimized" surface from - // imgFrame's perspective. diff --git a/mozilla-bmo1716707-swizzle.patch b/mozilla-bmo1716707-swizzle.patch deleted file mode 100644 index bb375602ee6bbee92af32401a963ebd354488daa..0000000000000000000000000000000000000000 --- a/mozilla-bmo1716707-swizzle.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User M. Sirringhaus -# Date 1645518286 -3600 -# Tue Feb 22 09:24:46 2022 +0100 -# Node ID 494640792b4677f6462e95b90a54a4e22aeb738b -# Parent 81832d035e101471dcf52dd91de287268add7a91 -imported patch one_swizzle_to_rule_them_all.patch - -Index: firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp -=================================================================== ---- firefox-102.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp -+++ firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp -@@ -7,6 +7,7 @@ - #include "RenderCompositorSWGL.h" - - #include "mozilla/gfx/Logging.h" -+#include "mozilla/gfx/Swizzle.h" - #include "mozilla/widget/CompositorWidget.h" - - #ifdef MOZ_WIDGET_GTK -@@ -235,6 +237,13 @@ void RenderCompositorSWGL::CommitMappedB - } - mDT->Flush(); - -+#if MOZ_BIG_ENDIAN() -+ // One swizzle to rule them all. -+ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8, -+ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8, -+ mDT->GetSize()); -+#endif -+ - // Done with the DT. Hand it back to the widget and clear out any trace of it. - mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); - mDirtyRegion.SetEmpty(); diff --git a/mozilla-bmo849632.patch b/mozilla-bmo849632.patch deleted file mode 100644 index 913d6bcdd9a061dde2e70f3cb775844b8370fc16..0000000000000000000000000000000000000000 --- a/mozilla-bmo849632.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent 3de59fe1b8708c01e134ce698c4232b8a854f617 -Problem: webGL sites are displayed in the wrong color (usually blue-ish) -Solution: Problem is with skia once again. Output of webgl seems endian-correct, but skia only - knows how to deal with little endian. - So we swizzle the output of webgl after reading it from readpixels() -Note: This does not fix all webGL sites, but is a step in the right direction - -Index: firefox-115.0/gfx/gl/GLContext.h -=================================================================== ---- firefox-115.0.orig/gfx/gl/GLContext.h -+++ firefox-115.0/gfx/gl/GLContext.h -@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe - BEFORE_GL_CALL; - mSymbols.fReadPixels(x, y, width, height, format, type, pixels); - OnSyncCall(); -+#if MOZ_BIG_ENDIAN() -+ uint8_t* itr = (uint8_t*)pixels; -+ for (GLsizei i = 0; i < width * height; i++) { -+ NativeEndian::swapToLittleEndianInPlace((uint32_t*)itr, 1); -+ itr += 4; -+ } -+#endif - AFTER_GL_CALL; - mHeavyGLCallsSinceLastFlush = true; - } diff --git a/mozilla-bmo998749.patch b/mozilla-bmo998749.patch deleted file mode 100644 index 50e22b56946ea07de821e7827a61bd4701c54f14..0000000000000000000000000000000000000000 --- a/mozilla-bmo998749.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User msirringhaus@suse.de -# Date 1583738770 -3600 -# Mon Mar 09 08:26:10 2020 +0100 -# Node ID 34676feac1a542e409e22acf5b98735f8313b1ce -# Parent 506857dace0a08d1c9685e3ac264646590b3e27f -[mq]: mozilla-bmo998749.patch - -diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h ---- a/gfx/2d/FilterProcessing.h Fri Feb 28 12:31:51 2020 +0100 -+++ b/gfx/2d/FilterProcessing.h Mon Mar 09 08:26:10 2020 +0100 -@@ -13,10 +13,17 @@ - namespace mozilla { - namespace gfx { - -+#if MOZ_BIG_ENDIAN() -+const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 3; -+const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 2; -+const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 1; -+const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 0; -+#else - const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 0; - const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 1; - const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 2; - const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 3; -+#endif - - class FilterProcessing { - public: