git: 0b56b2063250 - main - www/*chromium: unbreak build on i386

The branch main has been updated by rnagy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b56b2063250ea956fe0c26427c44e3bdc409186

commit 0b56b2063250ea956fe0c26427c44e3bdc409186
Author:     Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2023-10-14 11:58:58 +0000
Commit:     Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2023-10-14 11:59:23 +0000

    www/*chromium: unbreak build on i386
---
 ...fetto_src_trace__processor_db_storage_numeric__storage.cc |  4 ++--
 www/chromium/files/patch-v8_BUILD.gn                         | 12 ++++++------
 ...fetto_src_trace__processor_db_storage_numeric__storage.cc |  4 ++--
 www/ungoogled-chromium/files/patch-v8_BUILD.gn               | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
index 8bb44fed5fdb..7e6744d9db1c 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
@@ -1,10 +1,10 @@
---- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig	2023-09-13 12:11:42 UTC
+--- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig	2023-10-14 11:56:57 UTC
 +++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc
 @@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op,
    } else if (const auto* i32 = std::get_if<int32_t>(&*val)) {
      auto* start = static_cast<const int32_t*>(data_) + range.start;
      TypedLinearSearch(*i32, start, op, builder);
-+#if defined(__OpenBSD__) && defined(__i386__)
++#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__)
 +  } else if (const auto* db = std::get_if<long double>(&*val)) {
 +    auto* start = static_cast<const long double*>(data_) + range.start;
 +#else
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index dfcbe5f2fddd..c1b88cd54d2b 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,4 +1,4 @@
---- v8/BUILD.gn.orig	2023-10-11 18:22:24 UTC
+--- v8/BUILD.gn.orig	2023-10-14 11:56:57 UTC
 +++ v8/BUILD.gn
 @@ -1417,6 +1417,14 @@ config("toolchain") {
    } else if (target_os == "chromeos") {
@@ -15,8 +15,8 @@
    }
  
    # TODO(infra): Support v8_enable_prof on Windows.
-@@ -2358,6 +2366,12 @@ template("run_mksnapshot") {
-       ]
+@@ -2380,6 +2388,12 @@ template("run_mksnapshot") {
+       }
      }
  
 +    if (v8_current_cpu == "x86") {
@@ -25,9 +25,9 @@
 +      ]
 +    }
 +
-     if (v8_enable_builtins_profiling) {
-       args += [ "--turbo-profiling" ]
-     }
+     # This is needed to distinguish between generating code for the simulator
+     # and cross-compiling. The latter may need to run code on the host with the
+     # simulator but cannot use simulator-specific instructions.
 @@ -6111,7 +6125,7 @@ v8_component("v8_libbase") {
      }
    }
diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
index cf81db2a77d1..7e6744d9db1c 100644
--- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
@@ -1,10 +1,10 @@
---- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig	2023-09-17 07:59:53 UTC
+--- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig	2023-10-14 11:56:57 UTC
 +++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc
 @@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op,
    } else if (const auto* i32 = std::get_if<int32_t>(&*val)) {
      auto* start = static_cast<const int32_t*>(data_) + range.start;
      TypedLinearSearch(*i32, start, op, builder);
-+#if defined(__OpenBSD__) && defined(__i386__)
++#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__)
 +  } else if (const auto* db = std::get_if<long double>(&*val)) {
 +    auto* start = static_cast<const long double*>(data_) + range.start;
 +#else
diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn
index 45003731447c..c1b88cd54d2b 100644
--- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn
@@ -1,4 +1,4 @@
---- v8/BUILD.gn.orig	2023-10-13 13:20:35 UTC
+--- v8/BUILD.gn.orig	2023-10-14 11:56:57 UTC
 +++ v8/BUILD.gn
 @@ -1417,6 +1417,14 @@ config("toolchain") {
    } else if (target_os == "chromeos") {
@@ -15,8 +15,8 @@
    }
  
    # TODO(infra): Support v8_enable_prof on Windows.
-@@ -2358,6 +2366,12 @@ template("run_mksnapshot") {
-       ]
+@@ -2380,6 +2388,12 @@ template("run_mksnapshot") {
+       }
      }
  
 +    if (v8_current_cpu == "x86") {
@@ -25,9 +25,9 @@
 +      ]
 +    }
 +
-     if (v8_enable_builtins_profiling) {
-       args += [ "--turbo-profiling" ]
-     }
+     # This is needed to distinguish between generating code for the simulator
+     # and cross-compiling. The latter may need to run code on the host with the
+     # simulator but cannot use simulator-specific instructions.
 @@ -6111,7 +6125,7 @@ v8_component("v8_libbase") {
      }
    }