Tom spot Callaway
3 years ago
commit
ed7be51b3b
@ -0,0 +1,69 @@
|
||||
diff -up chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp.gcc12fix chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp
|
||||
--- chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp.gcc12fix 2022-02-25 22:17:18.071775686 +0000
|
||||
+++ chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp 2022-02-25 22:17:40.964996468 +0000
|
||||
@@ -659,6 +659,7 @@ void emitIASOpTyGPR(const Cfg *Func, Typ
|
||||
}
|
||||
}
|
||||
|
||||
+#if 0
|
||||
template <bool VarCanBeByte, bool SrcCanBeByte>
|
||||
void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var,
|
||||
const Operand *Src, const GPREmitterRegOp &Emitter) {
|
||||
@@ -697,6 +698,7 @@ void emitIASRegOpTyGPR(const Cfg *Func,
|
||||
llvm_unreachable("Unexpected operand type");
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
void emitIASAddrOpTyGPR(const Cfg *Func, Type Ty, const AsmAddress &Addr,
|
||||
const Operand *Src, const GPREmitterAddrOp &Emitter) {
|
||||
diff -up chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h.gcc12fix chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h
|
||||
--- chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h.gcc12fix 2022-02-25 22:17:51.409640955 +0000
|
||||
+++ chromium-98.0.4758.102/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h 2022-02-25 22:19:13.478847553 +0000
|
||||
@@ -576,8 +576,44 @@ void emitIASXmmShift(const Cfg *Func, Ty
|
||||
/// Emit a two-operand (GPR) instruction, where the dest operand is a Variable
|
||||
/// that's guaranteed to be a register.
|
||||
template <bool VarCanBeByte = true, bool SrcCanBeByte = true>
|
||||
-void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Dst,
|
||||
- const Operand *Src, const GPREmitterRegOp &Emitter);
|
||||
+
|
||||
+void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var,
|
||||
+ const Operand *Src, const GPREmitterRegOp &Emitter) {
|
||||
+ auto *Target = InstX86Base::getTarget(Func);
|
||||
+ Assembler *Asm = Func->getAssembler<Assembler>();
|
||||
+ assert(Var->hasReg());
|
||||
+ // We cheat a little and use GPRRegister even for byte operations.
|
||||
+ GPRRegister VarReg = VarCanBeByte ? RegX8664::getEncodedGPR(Var->getRegNum())
|
||||
+ : RegX8664::getEncodedGPR(Var->getRegNum());
|
||||
+ if (const auto *SrcVar = llvm::dyn_cast<Variable>(Src)) {
|
||||
+ if (SrcVar->hasReg()) {
|
||||
+ GPRRegister SrcReg = SrcCanBeByte
|
||||
+ ? RegX8664::getEncodedGPR(SrcVar->getRegNum())
|
||||
+ : RegX8664::getEncodedGPR(SrcVar->getRegNum());
|
||||
+ (Asm->*(Emitter.GPRGPR))(Ty, VarReg, SrcReg);
|
||||
+ } else {
|
||||
+ AsmAddress SrcStackAddr = AsmAddress(SrcVar, Target);
|
||||
+ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, SrcStackAddr);
|
||||
+ }
|
||||
+ } else if (const auto *Mem = llvm::dyn_cast<X86OperandMem>(Src)) {
|
||||
+ Mem->emitSegmentOverride(Asm);
|
||||
+ (Asm->*(Emitter.GPRAddr))(Ty, VarReg, AsmAddress(Mem, Asm, Target));
|
||||
+ } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger32>(Src)) {
|
||||
+ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue()));
|
||||
+ } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger64>(Src)) {
|
||||
+ assert(Utils::IsInt(32, Imm->getValue()));
|
||||
+ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue()));
|
||||
+ } else if (const auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(Src)) {
|
||||
+ const auto FixupKind = (Reloc->getName().hasStdString() &&
|
||||
+ Reloc->getName().toString() == GlobalOffsetTable)
|
||||
+ ? FK_GotPC
|
||||
+ : FK_Abs;
|
||||
+ AssemblerFixup *Fixup = Asm->createFixup(FixupKind, Reloc);
|
||||
+ (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Fixup));
|
||||
+ } else {
|
||||
+ llvm_unreachable("Unexpected operand type");
|
||||
+ }
|
||||
+}
|
||||
|
||||
/// Instructions of the form x := op(x).
|
||||
template <typename InstX86Base::InstKindX86 K>
|
||||
@ -0,0 +1,20 @@
|
||||
diff -up chromium-98.0.4758.102/remoting/BUILD.gn.remoting-no-tests chromium-98.0.4758.102/remoting/BUILD.gn
|
||||
--- chromium-98.0.4758.102/remoting/BUILD.gn.remoting-no-tests 2022-02-28 19:15:23.835872267 +0000
|
||||
+++ chromium-98.0.4758.102/remoting/BUILD.gn 2022-03-01 17:55:50.625536957 +0000
|
||||
@@ -8,7 +8,7 @@ import("//remoting/build/config/remoting
|
||||
group("remoting_all") {
|
||||
testonly = true
|
||||
|
||||
- deps = [ ":remoting_unittests" ]
|
||||
+ deps = [ ]
|
||||
|
||||
if (is_win) {
|
||||
deps += [
|
||||
@@ -37,7 +37,6 @@ group("remoting_all") {
|
||||
|
||||
if (enable_remoting_host) {
|
||||
deps += [
|
||||
- ":remoting_perftests",
|
||||
"//remoting/host",
|
||||
]
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
diff -up chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-utility-for-std-exchange chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h
|
||||
--- chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-utility-for-std-exchange 2022-02-25 22:30:02.833745309 +0000
|
||||
+++ chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h 2022-02-25 22:30:02.832745344 +0000
|
||||
@@ -58,6 +58,8 @@
|
||||
#include "config.h"
|
||||
#include "glog/logging.h"
|
||||
|
||||
+#include <utility>
|
||||
+
|
||||
#ifdef HAVE_SYMBOLIZE
|
||||
|
||||
#include <algorithm>
|
||||
diff -up chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h.missing-utility-for-std-exchange chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h
|
||||
--- chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h.missing-utility-for-std-exchange 2022-02-27 20:08:40.027930037 +0000
|
||||
+++ chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h 2022-02-27 20:08:52.945490126 +0000
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_
|
||||
#define V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_
|
||||
|
||||
+#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "include/cppgc/prefinalizer.h"
|
||||
@ -0,0 +1,32 @@
|
||||
From f1befebb6cea78950b5a8133bf3e65d56889d353 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Dapena Paz <jdapena@igalia.com>
|
||||
Date: Thu, 20 Jan 2022 09:38:13 +0100
|
||||
Subject: [PATCH] GCC: use braces initialization for NoDestructor in AutofillAssistantModelExecutor
|
||||
|
||||
Fix build with GCC failing to resolve initialization of NoDestructor
|
||||
with initializer list.
|
||||
|
||||
Bug: 819294
|
||||
Change-Id: I5fe8d30b4aefdddd71ff7b220eeffcd838308f5a
|
||||
---
|
||||
|
||||
diff --git a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc
|
||||
index 033205b..670376e 100644
|
||||
--- a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc
|
||||
+++ b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc
|
||||
@@ -156,13 +156,13 @@
|
||||
// TODO(b/204841212): Implement this with use of ModelMetadata.
|
||||
absl::optional<std::string> AutofillAssistantModelExecutor::Postprocess(
|
||||
const std::vector<const TfLiteTensor*>& output_tensors) {
|
||||
- static const base::NoDestructor<std::vector<std::string>> output_roles(
|
||||
+ static const base::NoDestructor<std::vector<std::string>> output_roles{
|
||||
{"UNKNOWN_ROLE", "NAME_FIRST", "NAME_LAST", "NAME_FULL", "ADDRESS_LINE1",
|
||||
"ADDRESS_LINE2", "CITY", "STATE", "COUNTRY", "POSTAL_CODE",
|
||||
"CREDIT_CARD_NUMBER", "CREDIT_CARD_EXP_MONTH",
|
||||
"CREDIT_CARD_VERIFICATION_CODE", "ORGANIZATION",
|
||||
"CREDIT_CARD_EXPIRATION", "PHONE_NUMBER", "USERNAME_OR_EMAIL",
|
||||
- "CREDIT_CARD_EXP_YEAR"});
|
||||
+ "CREDIT_CARD_EXP_YEAR"}};
|
||||
|
||||
DCHECK_GE(output_tensors.size(), 1u);
|
||||
std::vector<float> data;
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-99.0.4844.51/content/common/user_agent.cc.fedora-user-agent chromium-99.0.4844.51/content/common/user_agent.cc
|
||||
--- chromium-99.0.4844.51/content/common/user_agent.cc.fedora-user-agent 2022-03-04 15:06:27.774789749 +0000
|
||||
+++ chromium-99.0.4844.51/content/common/user_agent.cc 2022-03-04 15:07:22.837911148 +0000
|
||||
@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() {
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
return "Macintosh; ";
|
||||
#elif defined(USE_OZONE)
|
||||
- return "X11; "; // strange, but that's what Firefox uses
|
||||
+ return "X11; Fedora; "; // strange, but that's what Firefox uses
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
return "Linux; ";
|
||||
#elif BUILDFLAG(IS_FUCHSIA)
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-99.0.4844.51/components/os_crypt/features.gni.disblegnomekeyring chromium-99.0.4844.51/components/os_crypt/features.gni
|
||||
--- chromium-99.0.4844.51/components/os_crypt/features.gni.disblegnomekeyring 2022-03-05 14:24:15.073877597 -0500
|
||||
+++ chromium-99.0.4844.51/components/os_crypt/features.gni 2022-03-05 14:25:04.174183483 -0500
|
||||
@@ -8,7 +8,7 @@ import("//build/config/ui.gni")
|
||||
declare_args() {
|
||||
# Whether to use libgnome-keyring (deprecated by libsecret).
|
||||
# See http://crbug.com/466975 and http://crbug.com/355223.
|
||||
- use_gnome_keyring = is_linux && use_glib
|
||||
+ use_gnome_keyring = false
|
||||
|
||||
# Whether to make account and service names for the crypto key storage
|
||||
# configurable at runtime for embedders.
|
||||
@ -0,0 +1,14 @@
|
||||
diff -up chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc.widevine-no-download chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc
|
||||
--- chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc.widevine-no-download 2022-03-04 14:57:16.459599123 +0000
|
||||
+++ chromium-99.0.4844.51/chrome/browser/component_updater/registration.cc 2022-03-04 14:58:39.560763939 +0000
|
||||
@@ -105,10 +105,6 @@ void RegisterComponentsForUpdate() {
|
||||
RegisterMediaFoundationWidevineCdmComponent(cus);
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
- RegisterWidevineCdmComponent(cus);
|
||||
-#endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
-
|
||||
#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_ANDROID)
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// PNaCl on Chrome OS is on rootfs and there is no need to download it. But
|
||||
Loading…
Reference in new issue