1 files changed, 139 insertions, 0 deletions

diff --git a/www/chromium-uc/patches/patch-build_config_compiler_BUILD_gn b/www/chromium-uc/patches/patch-build_config_compiler_BUILD_gn
new file mode 100644
index 0000000..0b57051
--- /dev/null
+++ b/www/chromium-uc/patches/patch-build_config_compiler_BUILD_gn
@@ -0,0 +1,139 @@
+$OpenBSD: patch-build_config_compiler_BUILD_gn,v 1.56 2021/11/16 11:28:45 robert Exp $
+
+Index: build/config/compiler/BUILD.gn
+--- build/config/compiler/BUILD.gn.orig
++++ build/config/compiler/BUILD.gn
+@@ -153,7 +153,7 @@ declare_args() {
+ 
+   # Token limits may not be accurate for build configs not covered by the CQ,
+   # so only enable them by default for mainstream build configs.
+-  enable_wmax_tokens =
++  enable_wmax_tokens = !is_openbsd &&
+       !is_official_build && !(is_component_build && !is_debug) &&
+       ((is_mac && target_cpu == "x64" && !use_system_xcode) ||
+        (is_linux && !is_chromeos && target_cpu == "x64") ||
+@@ -240,12 +240,8 @@ config("default_include_dirs") {
+ # Compiler instrumentation can introduce dependencies in DSOs to symbols in
+ # the executable they are loaded into, so they are unresolved at link-time.
+ config("no_unresolved_symbols") {
+-  if (!using_sanitizer &&
+-      (is_linux || is_chromeos || is_android || is_fuchsia)) {
+-    ldflags = [
+-      "-Wl,-z,defs",
+-      "-Wl,--as-needed",
+-    ]
++  if (current_cpu == "x86" && is_openbsd) {
++    ldflags = [ "-Wl,-z,notext" ]
+   }
+ }
+ 
+@@ -441,6 +437,7 @@ config("compiler") {
+     }
+ 
+     ldflags += [
++      "-Wl,-z,wxneeded",
+       "-Wl,-z,noexecstack",
+       "-Wl,-z,relro",
+     ]
+@@ -533,7 +530,7 @@ config("compiler") {
+     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
+   }
+ 
+-  if (is_clang && !is_nacl && !use_xcode_clang) {
++  if (is_clang && !is_nacl && !use_xcode_clang && !is_openbsd) {
+     cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
+ 
+     # TODO(hans): Remove this once Clang generates better optimized debug info
+@@ -890,7 +887,7 @@ config("compiler_cpu_abi") {
+         ]
+       }
+     } else if (current_cpu == "arm") {
+-      if (is_clang && !is_android && !is_nacl) {
++      if (is_clang && !is_android && !is_nacl && !is_openbsd) {
+         cflags += [ "--target=arm-linux-gnueabihf" ]
+         ldflags += [ "--target=arm-linux-gnueabihf" ]
+       }
+@@ -904,7 +901,7 @@ config("compiler_cpu_abi") {
+         cflags += [ "-mtune=$arm_tune" ]
+       }
+     } else if (current_cpu == "arm64") {
+-      if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
++      if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_openbsd) {
+         cflags += [ "--target=aarch64-linux-gnu" ]
+         ldflags += [ "--target=aarch64-linux-gnu" ]
+       }
+@@ -1248,7 +1245,7 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
++    if (is_nacl || is_openbsd) {
+       # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+       cflags += [
+         "-Xclang",
+@@ -1510,11 +1507,6 @@ config("default_warnings") {
+         cflags += [
+           "-Wenum-compare-conditional",
+ 
+-          # An ABI compat warning we don't care about, https://crbug.com/1102157
+-          # TODO(thakis): Push this to the (few) targets that need it,
+-          # instead of having a global flag.
+-          "-Wno-psabi",
+-
+           # Ignore warnings about MSVC optimization pragmas.
+           # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
+           "-Wno-ignored-pragma-optimize",
+@@ -1524,7 +1516,7 @@ config("default_warnings") {
+         ]
+ 
+         # NaCl does not support flags from ToT.
+-        if (!is_nacl) {
++        if (!is_nacl && !is_openbsd) {
+           cflags += [
+             # TODO(https://crbug.com/1203071): Clean up and enable.
+             "-Wno-unused-but-set-parameter",
+@@ -1684,7 +1676,7 @@ config("no_chromium_code") {
+       # third-party libraries.
+       "-Wno-c++11-narrowing",
+     ]
+-    if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) {
++    if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_openbsd) {
+       cflags += [
+         # TODO(https://crbug.com/1202159): Clean up and enable.
+         "-Wno-misleading-indentation",
+@@ -1764,7 +1756,7 @@ config("thin_archive") {
+   # archives.
+   # TODO(crbug.com/1221615): Enable on is_apple if use_lld once that no longer
+   # confuses lldb.
+-  if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
++  if ((is_posix && !is_nacl && !is_apple && !is_openbsd) || is_fuchsia) {
+     arflags = [ "-T" ]
+   } else if (is_win && use_lld) {
+     arflags = [ "/llvmlibthin" ]
+@@ -2166,7 +2158,7 @@ config("afdo_optimize_size") {
+ # between //base/allocator:tcmalloc and AFDO on GCC), so we provide a separate
+ # config to allow AFDO to be disabled per-target.
+ config("afdo") {
+-  if (is_clang) {
++  if (is_clang && !is_openbsd) {
+     cflags = []
+     if (clang_emit_debug_info_for_profiling) {
+       # Add the following flags to generate debug info for profiling.
+@@ -2182,7 +2174,7 @@ config("afdo") {
+       cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
+       inputs = [ _clang_sample_profile ]
+     }
+-  } else if (auto_profile_path != "" && is_a_target_toolchain) {
++  } else if (auto_profile_path != "" && is_a_target_toolchain && !is_openbsd) {
+     cflags = [ "-fauto-profile=${auto_profile_path}" ]
+     inputs = [ auto_profile_path ]
+   }
+@@ -2311,7 +2303,7 @@ config("symbols") {
+     }
+   }
+ 
+-  if (is_clang && !is_nacl && !use_xcode_clang) {
++  if (is_clang && !is_nacl && !use_xcode_clang && !is_openbsd) {
+     if (is_apple) {
+       # TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
+       # Make sure we don't use constructor homing on mac.