diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index 987768fdd..cc764e6cd 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -35,7 +35,6 @@ SRC_URI += "\ file://fix-SYS_SECCOMP-redefinition.patch \ file://use-adler2.patch \ file://chromium-145-zip_ffi_glue-use-edition2024.patch \ - file://chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch \ " # ARM/AArch64-specific patches. diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_146.0.7680.177.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_147.0.7727.55.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_146.0.7680.177.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_147.0.7727.55.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_146.0.7680.177.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_147.0.7727.55.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_146.0.7680.177.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_147.0.7727.55.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index 7a66de662..af1a83d1c 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home" CVE_PRODUCT = "chromium:chromium google:chrome" SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz" -SRC_URI[sha256sum] = "32e3a58aa7c3963f4c835cecf77762478dd04152f1d0b578440fd00152f13b29" +SRC_URI[sha256sum] = "b259ece316d73053a3d62ecc20326b6d12f1aa520ce60aaedcdc89d318fa32b7" S = "${UNPACKDIR}/chromium-${PV}" # GCC is not tested or officially supported upstream, and supporting it here @@ -96,7 +96,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_fido/LICENSE;md5=0b31499076a79957f503e7861250586c \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_flags/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_gcm/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_identity_credentials/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_identity_credentials/LICENSE;md5=848796728ffbc490ef5ab42e20b7cb4f \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_iid/LICENSE;md5=05fc50851d6d550ef2bb400b326353f0 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_instantapps/LICENSE;md5=44b3e1cb996ad75b025cf78e53ba7d42 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_location/LICENSE;md5=18ad89b4a01838496ae844c2b9bd2a7f \ @@ -152,7 +152,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_hprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_log/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_okio_okio_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_wire_wire_runtime_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_binder/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_context/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -228,6 +227,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_core_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_core_core_animation/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_core_core_ktx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_core_core_pip/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_core_core_viewtree/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_credentials_credentials/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_credentials_credentials_play_services_auth/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -253,9 +253,17 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_fragment_fragment/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_fragment_fragment_compose/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_fragment_fragment_ktx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_graphics_graphics_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_graphics_graphics_path/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_graphics_graphics_shapes_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_gridlayout_gridlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_ink_ink_authoring_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_ink_ink_brush_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_ink_ink_geometry_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_ink_ink_nativeloader_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_ink_ink_rendering_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_ink_ink_strokes_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_input_input_motionprediction/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_interpolator_interpolator/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_leanback_leanback/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_leanback_leanback_grid/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -303,6 +311,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_paging_paging_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_palette_palette/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_document_service/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_viewer/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_viewer_fragment/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_preference_preference/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -322,9 +331,9 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_sqlite_sqlite_framework_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_startup_startup_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_swiperefreshlayout_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_test_espresso_espresso_idling_resource/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_ktx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_wire_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_transition_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_tvprovider_tvprovider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_vectordrawable_vectordrawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -347,7 +356,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_xr_scenecore_scenecore_spatial_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_xr_scenecore_scenecore_spatial_rendering/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \ - file://${S}/third_party/angle/src/common/third_party/xxhash/LICENSE;md5=cb91c07001f1ca6fd50b6bd4f042946a \ + file://${S}/third_party/angle/src/common/third_party/xxhash/LICENSE;md5=13be6b481ff5616f77dda971191bb29b \ file://${S}/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/LICENSE;md5=100356b560682b0ae7739e09db42f319 \ file://${S}/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE;md5=64356ee6f79c94525e102a3264a62653 \ file://${S}/third_party/angle/src/third_party/libXNVCtrl/LICENSE;md5=9e6c209899aa4986d090320bbca2fc76 \ @@ -675,6 +684,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/num-rational-v0_4/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/num-traits-v0_2/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/once_cell-v1/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ + file://${S}/third_party/rust/chromium_crates_io/vendor/opusic-sys-v0_5/LICENSE;md5=4b365c2155d66e550e1447075d6744a5 \ file://${S}/third_party/rust/chromium_crates_io/vendor/ordered-float-v5/LICENSE-MIT;md5=23536a298d2ea9574cce356b6926b0d7 \ file://${S}/third_party/rust/chromium_crates_io/vendor/parking_lot-v0_12/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/parking_lot_core-v0_9/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ @@ -707,21 +717,23 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/strum-v0_27/LICENSE;md5=b73288c747267992cc39afc7bde8af66 \ file://${S}/third_party/rust/chromium_crates_io/vendor/strum_macros-v0_27/LICENSE;md5=b73288c747267992cc39afc7bde8af66 \ file://${S}/third_party/rust/chromium_crates_io/vendor/subtle-v2/LICENSE;md5=cff47234d8cf608834b44ad9405e5493 \ + file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-adapter-libopus-v0_2/LICENSE-APACHE;md5=86d3f3a95c324c9479bd8986968f4327 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-bundle-flac-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-bundle-mp3-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-codec-pcm-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ + file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-codec-vorbis-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-core-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-metadata-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-utils-xiph-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-v0_5/LICENSE;md5=9741c346eef56131163e13b9db1241b3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/syn-v2/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ file://${S}/third_party/rust/chromium_crates_io/vendor/synstructure-v0_13/LICENSE;md5=cc272e9322fe8cb3e01e1e22bca8fef9 \ - file://${S}/third_party/rust/chromium_crates_io/vendor/temporal_capi-v0_1/LICENSE-Apache;md5=da9ee15fd7b479b549e9986774e40c2f \ - file://${S}/third_party/rust/chromium_crates_io/vendor/temporal_rs-v0_1/LICENSE-Apache;md5=da9ee15fd7b479b549e9986774e40c2f \ + file://${S}/third_party/rust/chromium_crates_io/vendor/temporal_capi-v0_2/LICENSE-Apache;md5=da9ee15fd7b479b549e9986774e40c2f \ + file://${S}/third_party/rust/chromium_crates_io/vendor/temporal_rs-v0_2/LICENSE-Apache;md5=da9ee15fd7b479b549e9986774e40c2f \ file://${S}/third_party/rust/chromium_crates_io/vendor/termcolor-v1/LICENSE-MIT;md5=8d0d0aa488af0ab9aafa3b85a7fc8e12 \ file://${S}/third_party/rust/chromium_crates_io/vendor/thiserror-impl-v2/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ file://${S}/third_party/rust/chromium_crates_io/vendor/thiserror-v2/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ - file://${S}/third_party/rust/chromium_crates_io/vendor/timezone_provider-v0_1/LICENSE-Apache;md5=da9ee15fd7b479b549e9986774e40c2f \ + file://${S}/third_party/rust/chromium_crates_io/vendor/timezone_provider-v0_2/LICENSE-Apache;md5=da9ee15fd7b479b549e9986774e40c2f \ file://${S}/third_party/rust/chromium_crates_io/vendor/tinystr-v0_8/LICENSE;md5=9541a35d720222b4579e8c8fb11a95ef \ file://${S}/third_party/rust/chromium_crates_io/vendor/toktrie-v1/LICENSE;md5=d4a904ca135bb7bc912156fee12726f0 \ file://${S}/third_party/rust/chromium_crates_io/vendor/typed-arena-v2/LICENSE;md5=b5222a75d2ea0e6c555495cc042da92c \ @@ -750,7 +762,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/zmij-v1/LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ file://${S}/third_party/rust/chromium_crates_io/vendor/zoneinfo64-v0_2/LICENSE;md5=9541a35d720222b4579e8c8fb11a95ef \ file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=689b32daee61ad2ea2bcfece639f550d \ + file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=addb96827a7759d35fc3abae34830fb3 \ file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \ file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \ @@ -805,7 +817,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/x11proto/LICENSE;md5=f242876648161c7208413d60498dc20d \ file://${S}/third_party/xdg-utils/LICENSE;md5=a5367a90934098d6b05af3b746405014 \ file://${S}/third_party/xnnpack/src/LICENSE;md5=afa8f8a91390ab659c837da57124977c \ - file://${S}/third_party/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \ + file://${S}/third_party/zlib/LICENSE;md5=66e4e749bb11d80fc7ba510a9ce99534 \ file://${S}/third_party/zstd/src/LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ file://${S}/third_party/zxcvbn-cpp/LICENSE.txt;md5=50f9303d0b3adb4952217b0d8c00d83f \ file://${S}/tools/mac/power/protos/third_party/pprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ diff --git a/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch b/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch index a9d2485c8..a122802bd 100644 --- a/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch +++ b/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch @@ -22,7 +22,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 59942a3..cf5e62e 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1306,25 +1306,6 @@ +@@ -1338,25 +1338,6 @@ "-mfpmath=sse", "-msse3", ] @@ -41,14 +41,14 @@ index 59942a3..cf5e62e 100644 - ldflags += [ "--target=aarch64-linux-gnu" ] - } - if (target_os == "chromeos" && cros_target_cpu_arch != "" && -- current_cpu == target_cpu) { +- is_a_target_toolchain) { - cflags += [ "-march=$cros_target_cpu_arch" ] - ldflags += [ "-march=$cros_target_cpu_arch" ] - } } else if (current_cpu == "mipsel") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { -@@ -1332,9 +1313,6 @@ +@@ -1364,9 +1345,6 @@ if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -58,7 +58,7 @@ index 59942a3..cf5e62e 100644 } } else { cflags += [ "-EL" ] -@@ -1414,8 +1392,6 @@ +@@ -1446,8 +1424,6 @@ ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -67,7 +67,7 @@ index 59942a3..cf5e62e 100644 } else { cflags += [ "-EB" ] ldflags += [ "-EB" ] -@@ -1464,8 +1440,6 @@ +@@ -1496,8 +1472,6 @@ cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] } else { @@ -76,7 +76,7 @@ index 59942a3..cf5e62e 100644 } } else { cflags += [ -@@ -1523,8 +1497,6 @@ +@@ -1555,8 +1529,6 @@ ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -85,7 +85,7 @@ index 59942a3..cf5e62e 100644 } else { cflags += [ "-EB", -@@ -1695,23 +1667,6 @@ +@@ -1727,23 +1699,6 @@ } } @@ -109,7 +109,7 @@ index 59942a3..cf5e62e 100644 if (use_clang_modules) { cflags += [ # This removes absolute paths from .pcm files. -@@ -1849,12 +1804,6 @@ +@@ -1881,12 +1836,6 @@ "-fsanitize=array-bounds", "-fsanitize-trap=array-bounds", diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch index ee15a6bf5..29b389c3c 100644 --- a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch +++ b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch @@ -1,4 +1,4 @@ -From 37ddd6076f4b5886dc528e7f094e9e5ee0862244 Mon Sep 17 00:00:00 2001 +From de30d6c72fafbbbb80c694e8c1447d482b8ecc80 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Dec 2019 19:06:54 -0800 Subject: [PATCH] Delete compiler options not available in release versions of @@ -11,19 +11,40 @@ Subject: [PATCH] Delete compiler options not available in release versions of | clang++: error: unsupported argument '--allow-experimental-crel' to option '-Wa,' +* the GCC command line option -fno-lifetime-dse (to disable the + lifetime dead store elimination optimization) is not supported on + the current clang toolchain version, which causes build to fail with + the following error: + +| clang++: error: unknown argument: '-fno-lifetime-dse' + Upstream-Status: Inappropriate [ clang/master already supports them ] Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod Signed-off-by: Ariel D'Alessandro --- - build/config/compiler/BUILD.gn | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) + build/config/compiler/BUILD.gn | 19 +++++-------------- + 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index cf5e62e..58e0fd0 100644 +index c092446fa0..ce6d73d30c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -703,13 +703,6 @@ +@@ -613,13 +613,6 @@ config("compiler") { + ] + } + +- # The performance improvement does not seem worth the risk. See +- # https://crbug.com/484082200 for background and https://crrev.com/c/7593035 +- # for discussion. +- if (!is_wasm) { +- cflags += [ "-fno-lifetime-dse" ] +- } +- + # TODO(hans): Remove this once Clang generates better optimized debug info + # by default. https://crbug.com/765793 + cflags += [ +@@ -657,13 +650,6 @@ config("compiler") { cflags += [ "-ffp-contract=off" ] } @@ -37,7 +58,7 @@ index cf5e62e..58e0fd0 100644 } # C11/C++11 compiler flags setup. -@@ -2113,6 +2106,11 @@ +@@ -2209,6 +2195,11 @@ config("default_warnings") { if (is_clang) { cflags += [ @@ -49,3 +70,6 @@ index cf5e62e..58e0fd0 100644 "-Wloop-analysis", # TODO(thakis): This used to be implied by -Wno-unused-function, +-- +2.53.0 + diff --git a/meta-chromium/recipes-browser/chromium/files/chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch b/meta-chromium/recipes-browser/chromium/files/chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch deleted file mode 100644 index 5e87c6064..000000000 --- a/meta-chromium/recipes-browser/chromium/files/chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch +++ /dev/null @@ -1,74 +0,0 @@ -Taken from http://www.slackware.com/~alien/slackbuilds/chromium/build/patches/chromium146_backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch - -Upstream-Status: Inappropriate [rust version specific] - -diff --git a/third_party/rust/chromium_crates_io/patches/bytemuck-v1/0101-Ad-hoc-bytemuck-fix-for-https-crbug.com-480176523.patch b/third_party/rust/chromium_crates_io/patches/bytemuck-v1/0101-Ad-hoc-bytemuck-fix-for-https-crbug.com-480176523.patch -deleted file mode 100644 -index d5df20dd..0000000 ---- a/third_party/rust/chromium_crates_io/patches/bytemuck-v1/0101-Ad-hoc-bytemuck-fix-for-https-crbug.com-480176523.patch -+++ /dev/null -@@ -1,40 +0,0 @@ --From 98355e3039f4677b19d1358a207f5ae646b935bb Mon Sep 17 00:00:00 2001 --From: Lukasz Anforowicz --Date: Fri, 30 Jan 2026 23:30:50 +0000 --Subject: [PATCH] Ad-hoc `bytemuck` fix for https://crbug.com/480176523. -- --TODO: Remove this patch from `chromium_crates_io/patches` after --rolling `bytemuck` past the actual fix from --https://github.com/Lokathor/bytemuck/pull/344 ----- -- .../rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs | 1 - -- .../rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs | 1 - -- 2 files changed, 2 deletions(-) -- --diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs --index 846f281d975c7..3aaee72a26e85 100644 ----- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs --+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs --@@ -151,7 +151,6 @@ impl_unsafe_marker_for_simd!( -- unsafe impl Pod for core::simd::Simd -- where -- T: core::simd::SimdElement + Pod, --- core::simd::LaneCount: core::simd::SupportedLaneCount, -- { -- } -- --diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs --index d88ba0f6636d0..b0f3b8aca0b08 100644 ----- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs --+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs --@@ -230,7 +230,6 @@ impl_unsafe_marker_for_simd!( -- unsafe impl Zeroable for core::simd::Simd -- where -- T: core::simd::SimdElement + Zeroable, --- core::simd::LaneCount: core::simd::SupportedLaneCount, -- { -- } -- ---- --2.53.0.rc1.225.gd81095ad13-goog -- -diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs -index b039792..330f722 100644 ---- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs -+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs -@@ -152,6 +152,7 @@ - unsafe impl Pod for core::simd::Simd - where - T: core::simd::SimdElement + Pod, -+ core::simd::LaneCount: core::simd::SupportedLaneCount, - { - } - -diff --git a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs -index 397ddde..186c567 100644 ---- a/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs -+++ b/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs -@@ -231,6 +231,7 @@ - unsafe impl Zeroable for core::simd::Simd - where - T: core::simd::SimdElement + Zeroable, -+ core::simd::LaneCount: core::simd::SupportedLaneCount, - { - } -