MSVSphere Packaging Team
8 months ago
parent
f34bdf8397
commit
acf9046042
@ -1,3 +1,3 @@
|
||||
dee35ab79e03a40ffe4c1e2ab94ddd70de6dd05e SOURCES/chromium-124.0.6367.91-clean.tar.xz
|
||||
bd2f4ca77e26dc46897577cc3293c32fa689496a SOURCES/chromium-124.0.6367.118-clean.tar.xz
|
||||
7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz
|
||||
dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
SOURCES/chromium-124.0.6367.91-clean.tar.xz
|
||||
SOURCES/chromium-124.0.6367.118-clean.tar.xz
|
||||
SOURCES/linux-arm64-0.19.2.tgz
|
||||
SOURCES/linux-x64-0.19.2.tgz
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
Index: chromium-120.0.6099.71/third_party/highway/BUILD.gn
|
||||
===================================================================
|
||||
--- chromium-120.0.6099.71.orig/third_party/highway/BUILD.gn
|
||||
+++ chromium-120.0.6099.71/third_party/highway/BUILD.gn
|
||||
@@ -13,6 +13,9 @@ config("libhwy_external_config") {
|
||||
# explicitly disabling AVX2 and AVX3 targets.
|
||||
defines += [ "HWY_BROKEN_TARGETS=(HWY_AVX2|HWY_AVX3)" ]
|
||||
}
|
||||
+ if (target_cpu == "ppc64") {
|
||||
+ defines += [ "TOOLCHAIN_MISS_ASM_HWCAP_H" ]
|
||||
+ }
|
||||
}
|
||||
|
||||
source_set("libhwy") {
|
||||
@ -1,101 +0,0 @@
|
||||
Index: chromium-120.0.6099.71/third_party/highway/src/hwy/ops/ppc_vsx-inl.h
|
||||
===================================================================
|
||||
--- chromium-120.0.6099.71.orig/third_party/highway/src/hwy/ops/ppc_vsx-inl.h
|
||||
+++ chromium-120.0.6099.71/third_party/highway/src/hwy/ops/ppc_vsx-inl.h
|
||||
@@ -36,6 +36,8 @@
|
||||
|
||||
#include "hwy/ops/shared-inl.h"
|
||||
|
||||
+#undef __SIZEOF_INT128__
|
||||
+
|
||||
HWY_BEFORE_NAMESPACE();
|
||||
namespace hwy {
|
||||
namespace HWY_NAMESPACE {
|
||||
@@ -2844,7 +2846,6 @@ struct CompressIsPartition {
|
||||
|
||||
namespace detail {
|
||||
|
||||
-#if HWY_TARGET > HWY_PPC10 || __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
|
||||
// fallback for missing vec_extractm
|
||||
template <size_t N>
|
||||
HWY_INLINE uint64_t ExtractSignBits(Vec128<uint8_t, N> sign_bits,
|
||||
@@ -2857,22 +2858,16 @@ HWY_INLINE uint64_t ExtractSignBits(Vec1
|
||||
return extracted.raw[__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__];
|
||||
}
|
||||
|
||||
-#endif // HWY_TARGET > HWY_PPC10
|
||||
-
|
||||
template <typename T, size_t N>
|
||||
HWY_INLINE uint64_t BitsFromMask(hwy::SizeTag<1> /*tag*/,
|
||||
Mask128<T, N> mask) {
|
||||
const DFromM<decltype(mask)> d;
|
||||
const Repartition<uint8_t, decltype(d)> du8;
|
||||
const VFromD<decltype(du8)> sign_bits = BitCast(du8, VecFromMask(d, mask));
|
||||
-#if HWY_TARGET <= HWY_PPC10 && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
- return static_cast<uint64_t>(vec_extractm(sign_bits.raw));
|
||||
-#else
|
||||
const __vector unsigned char kBitShuffle = {
|
||||
120, 112, 104, 96, 88, 80, 72, 64, 56, 48, 40, 32, 24, 16, 8, 0
|
||||
};
|
||||
return ExtractSignBits(sign_bits, kBitShuffle);
|
||||
-#endif // HWY_TARGET <= HWY_PPC10
|
||||
}
|
||||
|
||||
template <typename T, size_t N>
|
||||
@@ -2882,10 +2877,6 @@ HWY_INLINE uint64_t BitsFromMask(hwy::Si
|
||||
const Repartition<uint8_t, decltype(d)> du8;
|
||||
const VFromD<decltype(du8)> sign_bits = BitCast(du8, VecFromMask(d, mask));
|
||||
|
||||
-#if HWY_TARGET <= HWY_PPC10 && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
- const RebindToUnsigned<decltype(d)> du;
|
||||
- return static_cast<uint64_t>(vec_extractm(BitCast(du, sign_bits).raw));
|
||||
-#else
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
const __vector unsigned char kBitShuffle = {
|
||||
112, 96, 80, 64, 48, 32, 16, 0, 128, 128, 128, 128, 128, 128, 128, 128};
|
||||
@@ -2894,7 +2885,6 @@ HWY_INLINE uint64_t BitsFromMask(hwy::Si
|
||||
128, 128, 128, 128, 128, 128, 128, 128, 112, 96, 80, 64, 48, 32, 16, 0};
|
||||
#endif
|
||||
return ExtractSignBits(sign_bits, kBitShuffle);
|
||||
-#endif // HWY_TARGET <= HWY_PPC10
|
||||
}
|
||||
|
||||
template <typename T, size_t N>
|
||||
@@ -2903,10 +2893,6 @@ HWY_INLINE uint64_t BitsFromMask(hwy::Si
|
||||
const DFromM<decltype(mask)> d;
|
||||
const Repartition<uint8_t, decltype(d)> du8;
|
||||
const VFromD<decltype(du8)> sign_bits = BitCast(du8, VecFromMask(d, mask));
|
||||
-#if HWY_TARGET <= HWY_PPC10 && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
- const RebindToUnsigned<decltype(d)> du;
|
||||
- return static_cast<uint64_t>(vec_extractm(BitCast(du, sign_bits).raw));
|
||||
-#else
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
const __vector unsigned char kBitShuffle = {
|
||||
96, 64, 32, 0, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128};
|
||||
@@ -2915,7 +2901,6 @@ HWY_INLINE uint64_t BitsFromMask(hwy::Si
|
||||
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 96, 64, 32, 0};
|
||||
#endif
|
||||
return ExtractSignBits(sign_bits, kBitShuffle);
|
||||
-#endif // HWY_TARGET <= HWY_PPC10
|
||||
}
|
||||
|
||||
template <typename T, size_t N>
|
||||
@@ -2924,10 +2909,6 @@ HWY_INLINE uint64_t BitsFromMask(hwy::Si
|
||||
const DFromM<decltype(mask)> d;
|
||||
const Repartition<uint8_t, decltype(d)> du8;
|
||||
const VFromD<decltype(du8)> sign_bits = BitCast(du8, VecFromMask(d, mask));
|
||||
-#if HWY_TARGET <= HWY_PPC10 && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
- const RebindToUnsigned<decltype(d)> du;
|
||||
- return static_cast<uint64_t>(vec_extractm(BitCast(du, sign_bits).raw));
|
||||
-#else
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
const __vector unsigned char kBitShuffle = {64, 0, 128, 128, 128, 128,
|
||||
128, 128, 128, 128, 128, 128,
|
||||
@@ -2938,7 +2919,6 @@ HWY_INLINE uint64_t BitsFromMask(hwy::Si
|
||||
128, 128, 64, 0};
|
||||
#endif
|
||||
return ExtractSignBits(sign_bits, kBitShuffle);
|
||||
-#endif // HWY_TARGET <= HWY_PPC10
|
||||
}
|
||||
|
||||
// Returns the lowest N of the mask bits.
|
||||
@ -1,88 +0,0 @@
|
||||
commit c7f4c58f896a651eba80ad805ebdb49d19ebdbd4
|
||||
Author: Tom Anderson <thomasanderson@chromium.org>
|
||||
Date: Wed Mar 20 00:00:12 2024 +0000
|
||||
|
||||
Fix --ozone-platform-hint
|
||||
|
||||
This fixes a regression after r1269993 which moved ozone platform
|
||||
early initialization before the ozone platform hint flag was
|
||||
processed. This CL ensures the flag processing happens even earlier.
|
||||
|
||||
R=sky
|
||||
|
||||
Change-Id: Icc9649beb0b86753265be2b6cdf3059611eb410f
|
||||
Bug: None
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5375669
|
||||
Reviewed-by: Scott Violet <sky@chromium.org>
|
||||
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1275306}
|
||||
|
||||
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
|
||||
index 73b6ab0934b14..0b4c44be679d0 100644
|
||||
--- a/chrome/app/chrome_main_delegate.cc
|
||||
+++ b/chrome/app/chrome_main_delegate.cc
|
||||
@@ -249,6 +249,9 @@
|
||||
#include "base/scoped_add_feature_flags.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/ozone/public/ozone_platform.h"
|
||||
+#if BUILDFLAG(IS_LINUX)
|
||||
+#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
|
||||
+#endif
|
||||
#endif // BUILDFLAG(IS_OZONE)
|
||||
|
||||
base::LazyInstance<ChromeContentGpuClient>::DestructorAtExit
|
||||
@@ -959,6 +962,9 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
||||
// Initialize Ozone platform and add required feature flags as per platform's
|
||||
// properties. Must be added before feature list is created otherwise the
|
||||
// added flag won't be picked up.
|
||||
+#if BUILDFLAG(IS_LINUX)
|
||||
+ ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint();
|
||||
+#endif
|
||||
ui::OzonePlatform::PreEarlyInitialization();
|
||||
AddFeatureFlagsToCommandLine();
|
||||
#endif // BUILDFLAG(IS_OZONE)
|
||||
diff --git a/chrome/browser/chrome_browser_main_extra_parts_linux.cc b/chrome/browser/chrome_browser_main_extra_parts_linux.cc
|
||||
index dba7b116ecaa0..ea0487022dcdc 100644
|
||||
--- a/chrome/browser/chrome_browser_main_extra_parts_linux.cc
|
||||
+++ b/chrome/browser/chrome_browser_main_extra_parts_linux.cc
|
||||
@@ -168,7 +168,13 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExtraPartsLinux() = default;
|
||||
|
||||
ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
|
||||
|
||||
-void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
|
||||
+void ChromeBrowserMainExtraPartsLinux::PostBrowserStart() {
|
||||
+ RecordDisplayServerProtocolSupport();
|
||||
+ ChromeBrowserMainExtraPartsOzone::PostBrowserStart();
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
+void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
// On the desktop, we fix the platform name if necessary.
|
||||
// See https://crbug.com/1246928.
|
||||
@@ -189,8 +195,3 @@ void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
|
||||
}
|
||||
#endif // BUILDFLAG(IS_LINUX)
|
||||
}
|
||||
-
|
||||
-void ChromeBrowserMainExtraPartsLinux::PostBrowserStart() {
|
||||
- RecordDisplayServerProtocolSupport();
|
||||
- ChromeBrowserMainExtraPartsOzone::PostBrowserStart();
|
||||
-}
|
||||
diff --git a/chrome/browser/chrome_browser_main_extra_parts_linux.h b/chrome/browser/chrome_browser_main_extra_parts_linux.h
|
||||
index 3847bd2090e28..4f188a7bdfe38 100644
|
||||
--- a/chrome/browser/chrome_browser_main_extra_parts_linux.h
|
||||
+++ b/chrome/browser/chrome_browser_main_extra_parts_linux.h
|
||||
@@ -17,9 +17,10 @@ class ChromeBrowserMainExtraPartsLinux
|
||||
const ChromeBrowserMainExtraPartsLinux&) = delete;
|
||||
~ChromeBrowserMainExtraPartsLinux() override;
|
||||
|
||||
+ static void InitOzonePlatformHint();
|
||||
+
|
||||
private:
|
||||
// ChromeBrowserMainExtraParts overrides.
|
||||
- void PreEarlyInitialization() override;
|
||||
void PostBrowserStart() override;
|
||||
};
|
||||
|
||||
Loading…
Reference in new issue