Attachment #241755 for bug #271076

View | Details | Raw Unified | Return to bug 271076
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/games/punchy/Makefile (-1 / +1 lines)
1	PORTNAME= punchy	1	PORTNAME= punchy
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.0	3	DISTVERSION= 0.3.0
4	PORTREVISION= 4	4	PORTREVISION= 5
5	CATEGORIES= games wayland	5	CATEGORIES= games wayland
6		6
7	MAINTAINER= jbeich@FreeBSD.org	7	MAINTAINER= jbeich@FreeBSD.org




    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression

--- cargo-crates/v8-0.47.1/build.rs.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build.rs
@@ -262,6 +262,14 @@ fn platform() -> &'static str {
   {

 }
 
 fn download_ninja_gn_binaries() {
@@ -642,6 +650,7 @@ type NinjaEnv = Vec<(String, String)>;
 fn ninja(gn_out_dir: &Path, maybe_env: Option<NinjaEnv>) -> Command {
   let cmd_string = env::var("NINJA").unwrap_or_else(|_| "ninja".to_owned());
   let mut cmd = Command::new(cmd_string);

   cmd.arg("-C");
   cmd.arg(&gn_out_dir);
   if let Some(env) = maybe_env {
--- cargo-crates/v8-0.47.1/build/config/BUILD.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/config/BUILD.gn
@@ -218,13 +218,17 @@ config("default_libs") {
       "CoreText.framework",

 }
 
 group("common_deps") {
--- cargo-crates/v8-0.47.1/build/config/BUILDCONFIG.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/config/BUILDCONFIG.gn
@@ -136,7 +136,8 @@ declare_args() {
   is_official_build = false

   # See comments in build/toolchain/cros/BUILD.gn about board compiles.
   if (is_clang) {
     _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
@@ -298,7 +300,11 @@ is_android = current_os == "android"
 is_chromeos = current_os == "chromeos"
 is_fuchsia = current_os == "fuchsia"
 is_ios = current_os == "ios"

 is_mac = current_os == "mac"
 is_nacl = current_os == "nacl"
 is_win = current_os == "win" || current_os == "winuwp"
--- cargo-crates/v8-0.47.1/build/config/compiler/BUILD.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/config/compiler/BUILD.gn
@@ -245,13 +245,16 @@ 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") {

       # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
       cflags += [
         "-Xclang",
@@ -1303,7 +1310,7 @@ config("compiler_deterministic") {
 }
 
 config("clang_revision") {

       cflags += [
         # Disabled for similar reasons as -Wunused-variable.
         "-Wno-unused-but-set-variable",
@@ -2264,7 +2271,7 @@ config("afdo_optimize_size") {
 # There are some targeted places that AFDO regresses, so we provide a separate
 # config to allow AFDO to be disabled per-target.
 config("afdo") {

     if (is_apple) {
       # TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
       # Make sure we don't use constructor homing on mac.
--- cargo-crates/v8-0.47.1/build/config/linux/BUILD.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/config/linux/BUILD.gn
@@ -41,7 +41,7 @@ config("runtime_library") {
   }

     libs = [ "atomic" ]
   }
 }
@@ -55,16 +55,5 @@ config("libresolv") {
 }
 
 if (use_glib) {

-  }
+  # unused by rusty_v8
 }
--- cargo-crates/v8-0.47.1/build/config/linux/pkg-config.py.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/config/linux/pkg-config.py
@@ -109,7 +109,7 @@ def main():
   # If this is run on non-Linux platforms, just return nothing and indicate

     print("[[],[],[],[],[]]")
     return 0
 
--- cargo-crates/v8-0.47.1/build/detect_host_arch.py.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/detect_host_arch.py
@@ -21,6 +21,8 @@ def HostArch():
     host_arch = 'ia32'

   elif host_arch.startswith('arm'):
     host_arch = 'arm'
   elif host_arch.startswith('aarch64'):
--- cargo-crates/v8-0.47.1/build/linux/chrome.map.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/linux/chrome.map
@@ -20,6 +20,10 @@ global:
   # Program entry point.

   # Memory allocation symbols.  We want chrome and any libraries to
   # share the same heap, so it is correct to export these symbols.
   aligned_alloc;
--- cargo-crates/v8-0.47.1/build/linux/libpci/BUILD.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/linux/libpci/BUILD.gn
@@ -3,20 +3,36 @@
 # found in the LICENSE file.
 
 import("//tools/generate_library_loader/generate_library_loader.gni")

+    ]
+  }
 }
--- cargo-crates/v8-0.47.1/build/linux/unbundle/libusb.gn.orig	2023-04-25 23:33:42 UTC
+++ cargo-crates/v8-0.47.1/build/linux/unbundle/libusb.gn
@@ -0,0 +1,24 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.

+  ]
+  public_configs = [ ":system_libusb" ]
+}
--- cargo-crates/v8-0.47.1/build/linux/unbundle/replace_gn_files.py.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/linux/unbundle/replace_gn_files.py
@@ -25,6 +25,7 @@ REPLACEMENTS = {
   'libevent': 'base/third_party/libevent/BUILD.gn',

   'libvpx': 'third_party/libvpx/BUILD.gn',
   'libwebp': 'third_party/libwebp/BUILD.gn',
   'libxml': 'third_party/libxml/BUILD.gn',
--- cargo-crates/v8-0.47.1/build/toolchain/gcc_toolchain.gni.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/toolchain/gcc_toolchain.gni
@@ -786,13 +786,17 @@ template("gcc_toolchain") {
 # use_gold too.
 template("clang_toolchain") {
   gcc_toolchain(target_name) {

 
     forward_variables_from(invoker,
                            [
--- cargo-crates/v8-0.47.1/build/toolchain/get_concurrent_links.py.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/build/toolchain/get_concurrent_links.py
@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes():
       return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))

   # TODO(scottmg): Implement this for other platforms.
   return 0
 
--- cargo-crates/v8-0.47.1/third_party/zlib/BUILD.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/third_party/zlib/BUILD.gn
@@ -119,6 +119,8 @@ if (use_arm_neon_optimizations) {
       defines = [ "CRC32_ARMV8_CRC32" ]

       } else if (is_linux || is_chromeos) {
         defines += [ "ARMV8_OS_LINUX" ]
       } else if (is_mac) {
--- cargo-crates/v8-0.47.1/third_party/zlib/cpu_features.c.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/third_party/zlib/cpu_features.c
@@ -31,11 +31,13 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
 
 #ifndef CPU_NO_SIMD
 

 
-#if defined(ARMV8_OS_ANDROID)
+#if defined(ARMV8_OS_FREEBSD)
+#include <sys/auxv.h>
+#include <sys/types.h>
+#ifndef ID_AA64ISAR0_AES_VAL
+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
+#endif
+#ifndef ID_AA64ISAR0_CRC32_VAL
+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
+#endif
+#elif defined(ARMV8_OS_ANDROID)
 #include <cpu-features.h>
 #elif defined(ARMV8_OS_LINUX)
 #include <asm/hwcap.h>
@@ -56,7 +58,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
 static void _cpu_check_features(void);
 #endif
 

 #if !defined(ARMV8_OS_MACOS)
 // _cpu_check_features() doesn't need to do anything on mac/arm since all
 // features are known at build time, so don't call it.
@@ -123,6 +125,16 @@ static void _cpu_check_features(void)
 #elif defined(ARMV8_OS_WINDOWS)
     arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);
     arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);
+#elif defined(ARMV8_OS_FREEBSD) && defined(__aarch64__)
+    unsigned long features;
+    elf_aux_info(AT_HWCAP, &features, sizeof features);
+    arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
+    arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
+#elif defined(ARMV8_OS_FREEBSD) /* aarch32 */
+    unsigned long features;
+    elf_aux_info(AT_HWCAP2, &features, sizeof features);
+    arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
+    arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
 #endif
 }
 #endif
--- cargo-crates/v8-0.47.1/v8/BUILD.gn.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/v8/BUILD.gn
@@ -5348,7 +5348,7 @@ v8_component("v8_libbase") {
     }

   } else if (current_os == "aix") {
     sources += [
       "src/base/debug/stack_trace_posix.cc",
--- cargo-crates/v8-0.47.1/v8/src/api/api.cc.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/v8/src/api/api.cc
@@ -138,7 +138,7 @@
 #include "src/wasm/wasm-serialization.h"

 bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info,
                                    void* context) {
 #if V8_ENABLE_WEBASSEMBLY && V8_TRAP_HANDLER_SUPPORTED
--- cargo-crates/v8-0.47.1/v8/src/base/platform/platform-freebsd.cc.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/v8/src/base/platform/platform-freebsd.cc
@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
             lib_name = std::string(path);

         }
 
         start += ssize;
--- cargo-crates/v8-0.47.1/v8/src/base/platform/platform-posix.cc.orig	1973-11-29 21:33:09 UTC
+++ cargo-crates/v8-0.47.1/v8/src/base/platform/platform-posix.cc
@@ -294,8 +294,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
   }

 
 // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
 #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
@@ -634,7 +642,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
 
 // static
 bool OS::HasLazyCommits() {

 
 // static
 Stack::StackSlot Stack::GetStackStart() {
--- cargo-crates/v8-0.47.1/v8/src/codegen/arm/cpu-arm.cc.orig	2023-04-26 09:31:09 UTC
+++ cargo-crates/v8-0.47.1/v8/src/codegen/arm/cpu-arm.cc
@@ -2,12 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "include/v8config.h"
+
 // CPU specific code for arm independent of OS goes here.
 #ifdef __arm__
 #ifdef __QNXNTO__
 #include <sys/mman.h>  // for cache flushing.
 #undef MAP_TYPE
 #elif V8_OS_FREEBSD
+#include <sys/cdefs.h>
 #include <machine/sysarch.h>  // for cache flushing
 #include <sys/types.h>
 #elif V8_OS_STARBOARD

Return to bug 271076

Lines 8-14 error[E0308]: mismatched types Link Here

(-)b/games/punchy/files/patch-v8 (-47 / +60 lines)
8	\| \|	8	\| \|
9	\| implicitly returns `()` as its body has no tail or `return` expression	9	\| implicitly returns `()` as its body has no tail or `return` expression
10		10
11	--- cargo-crates/v8-0.47.1/build.rs.orig 1970-01-01 00:00:00 UTC	11	--- cargo-crates/v8-0.47.1/build.rs.orig 1973-11-29 21:33:09 UTC
12	+++ cargo-crates/v8-0.47.1/build.rs	12	+++ cargo-crates/v8-0.47.1/build.rs
13	@@ -262,6 +262,14 @@ fn platform() -> &'static str {	13	@@ -262,6 +262,14 @@ fn platform() -> &'static str {
14	{	14	{
Lines 25-31 error[E0308]: mismatched types Link Here
25	}	25	}
26		26
27	fn download_ninja_gn_binaries() {	27	fn download_ninja_gn_binaries() {
28	@@ -642,6 +658,7 @@ fn ninja(gn_out_dir: &Path, maybe_env: Option<NinjaEnv	28	@@ -642,6 +650,7 @@ type NinjaEnv = Vec<(String, String)>;
29	fn ninja(gn_out_dir: &Path, maybe_env: Option<NinjaEnv>) -> Command {	29	fn ninja(gn_out_dir: &Path, maybe_env: Option<NinjaEnv>) -> Command {
30	let cmd_string = env::var("NINJA").unwrap_or_else(\|_\| "ninja".to_owned());	30	let cmd_string = env::var("NINJA").unwrap_or_else(\|_\| "ninja".to_owned());
31	let mut cmd = Command::new(cmd_string);	31	let mut cmd = Command::new(cmd_string);
Lines 33-39 error[E0308]: mismatched types Link Here
33	cmd.arg("-C");	33	cmd.arg("-C");
34	cmd.arg(&gn_out_dir);	34	cmd.arg(&gn_out_dir);
35	if let Some(env) = maybe_env {	35	if let Some(env) = maybe_env {
36	--- cargo-crates/v8-0.47.1/build/config/BUILD.gn.orig 1970-01-01 00:00:00 UTC	36	--- cargo-crates/v8-0.47.1/build/config/BUILD.gn.orig 1973-11-29 21:33:09 UTC
37	+++ cargo-crates/v8-0.47.1/build/config/BUILD.gn	37	+++ cargo-crates/v8-0.47.1/build/config/BUILD.gn
38	@@ -218,13 +218,17 @@ config("default_libs") {	38	@@ -218,13 +218,17 @@ config("default_libs") {
39	"CoreText.framework",	39	"CoreText.framework",
Lines 55-61 error[E0308]: mismatched types Link Here
55	}	55	}
56		56
57	group("common_deps") {	57	group("common_deps") {
58	--- cargo-crates/v8-0.47.1/build/config/BUILDCONFIG.gn.orig 1970-01-01 00:00:00 UTC	58	--- cargo-crates/v8-0.47.1/build/config/BUILDCONFIG.gn.orig 1973-11-29 21:33:09 UTC
59	+++ cargo-crates/v8-0.47.1/build/config/BUILDCONFIG.gn	59	+++ cargo-crates/v8-0.47.1/build/config/BUILDCONFIG.gn
60	@@ -136,7 +136,8 @@ declare_args() {	60	@@ -136,7 +136,8 @@ declare_args() {
61	is_official_build = false	61	is_official_build = false
Lines 88-94 error[E0308]: mismatched types Link Here
88	# See comments in build/toolchain/cros/BUILD.gn about board compiles.	88	# See comments in build/toolchain/cros/BUILD.gn about board compiles.
89	if (is_clang) {	89	if (is_clang) {
90	_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"	90	_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
91	@@ -298,7 +300,11 @@ is_ios = current_os == "ios"	91	@@ -298,7 +300,11 @@ is_android = current_os == "android"
92	is_chromeos = current_os == "chromeos"	92	is_chromeos = current_os == "chromeos"
93	is_fuchsia = current_os == "fuchsia"	93	is_fuchsia = current_os == "fuchsia"
94	is_ios = current_os == "ios"	94	is_ios = current_os == "ios"
Lines 101-109 error[E0308]: mismatched types Link Here
101	is_mac = current_os == "mac"	101	is_mac = current_os == "mac"
102	is_nacl = current_os == "nacl"	102	is_nacl = current_os == "nacl"
103	is_win = current_os == "win" \|\| current_os == "winuwp"	103	is_win = current_os == "win" \|\| current_os == "winuwp"
104	--- cargo-crates/v8-0.47.1/build/config/compiler/BUILD.gn.orig 1970-01-01 00:00:00 UTC	104	--- cargo-crates/v8-0.47.1/build/config/compiler/BUILD.gn.orig 1973-11-29 21:33:09 UTC
105	+++ cargo-crates/v8-0.47.1/build/config/compiler/BUILD.gn	105	+++ cargo-crates/v8-0.47.1/build/config/compiler/BUILD.gn
106	@@ -245,13 +245,16 @@ config("no_unresolved_symbols") {	106	@@ -245,13 +245,16 @@ config("default_include_dirs") {
107	# Compiler instrumentation can introduce dependencies in DSOs to symbols in	107	# Compiler instrumentation can introduce dependencies in DSOs to symbols in
108	# the executable they are loaded into, so they are unresolved at link-time.	108	# the executable they are loaded into, so they are unresolved at link-time.
109	config("no_unresolved_symbols") {	109	config("no_unresolved_symbols") {
Lines 168-174 error[E0308]: mismatched types Link Here
168	# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.	168	# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
169	cflags += [	169	cflags += [
170	"-Xclang",	170	"-Xclang",
171	@@ -1303,7 +1310,7 @@ config("clang_revision") {	171	@@ -1303,7 +1310,7 @@ config("compiler_deterministic") {
172	}	172	}
173		173
174	config("clang_revision") {	174	config("clang_revision") {
Lines 186-192 error[E0308]: mismatched types Link Here
186	cflags += [	186	cflags += [
187	# Disabled for similar reasons as -Wunused-variable.	187	# Disabled for similar reasons as -Wunused-variable.
188	"-Wno-unused-but-set-variable",	188	"-Wno-unused-but-set-variable",
189	@@ -2264,7 +2271,7 @@ config("afdo") {	189	@@ -2264,7 +2271,7 @@ config("afdo_optimize_size") {
190	# There are some targeted places that AFDO regresses, so we provide a separate	190	# There are some targeted places that AFDO regresses, so we provide a separate
191	# config to allow AFDO to be disabled per-target.	191	# config to allow AFDO to be disabled per-target.
192	config("afdo") {	192	config("afdo") {
Lines 214-220 error[E0308]: mismatched types Link Here
214	if (is_apple) {	214	if (is_apple) {
215	# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.	215	# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
216	# Make sure we don't use constructor homing on mac.	216	# Make sure we don't use constructor homing on mac.
217	--- cargo-crates/v8-0.47.1/build/config/linux/BUILD.gn.orig 1970-01-01 00:00:00 UTC	217	--- cargo-crates/v8-0.47.1/build/config/linux/BUILD.gn.orig 1973-11-29 21:33:09 UTC
218	+++ cargo-crates/v8-0.47.1/build/config/linux/BUILD.gn	218	+++ cargo-crates/v8-0.47.1/build/config/linux/BUILD.gn
219	@@ -41,7 +41,7 @@ config("runtime_library") {	219	@@ -41,7 +41,7 @@ config("runtime_library") {
220	}	220	}
Lines 225-231 error[E0308]: mismatched types Link Here
225	libs = [ "atomic" ]	225	libs = [ "atomic" ]
226	}	226	}
227	}	227	}
228	@@ -55,16 +55,5 @@ if (use_glib) {	228	@@ -55,16 +55,5 @@ config("libresolv") {
229	}	229	}
230		230
231	if (use_glib) {	231	if (use_glib) {
Lines 243-249 error[E0308]: mismatched types Link Here
243	- }	243	- }
244	+ # unused by rusty_v8	244	+ # unused by rusty_v8
245	}	245	}
246	--- cargo-crates/v8-0.47.1/build/config/linux/pkg-config.py.orig 1970-01-01 00:00:00 UTC	246	--- cargo-crates/v8-0.47.1/build/config/linux/pkg-config.py.orig 1973-11-29 21:33:09 UTC
247	+++ cargo-crates/v8-0.47.1/build/config/linux/pkg-config.py	247	+++ cargo-crates/v8-0.47.1/build/config/linux/pkg-config.py
248	@@ -109,7 +109,7 @@ def main():	248	@@ -109,7 +109,7 @@ def main():
249	# If this is run on non-Linux platforms, just return nothing and indicate	249	# If this is run on non-Linux platforms, just return nothing and indicate
Lines 254-260 error[E0308]: mismatched types Link Here
254	print("[[],[],[],[],[]]")	254	print("[[],[],[],[],[]]")
255	return 0	255	return 0
256		256
257	--- cargo-crates/v8-0.47.1/build/detect_host_arch.py.orig 1970-01-01 00:00:00 UTC	257	--- cargo-crates/v8-0.47.1/build/detect_host_arch.py.orig 1973-11-29 21:33:09 UTC
258	+++ cargo-crates/v8-0.47.1/build/detect_host_arch.py	258	+++ cargo-crates/v8-0.47.1/build/detect_host_arch.py
259	@@ -21,6 +21,8 @@ def HostArch():	259	@@ -21,6 +21,8 @@ def HostArch():
260	host_arch = 'ia32'	260	host_arch = 'ia32'
Lines 265-271 error[E0308]: mismatched types Link Here
265	elif host_arch.startswith('arm'):	265	elif host_arch.startswith('arm'):
266	host_arch = 'arm'	266	host_arch = 'arm'
267	elif host_arch.startswith('aarch64'):	267	elif host_arch.startswith('aarch64'):
268	--- cargo-crates/v8-0.47.1/build/linux/chrome.map.orig 1970-01-01 00:00:00 UTC	268	--- cargo-crates/v8-0.47.1/build/linux/chrome.map.orig 1973-11-29 21:33:09 UTC
269	+++ cargo-crates/v8-0.47.1/build/linux/chrome.map	269	+++ cargo-crates/v8-0.47.1/build/linux/chrome.map
270	@@ -20,6 +20,10 @@ global:	270	@@ -20,6 +20,10 @@ global:
271	# Program entry point.	271	# Program entry point.
Lines 278-286 error[E0308]: mismatched types Link Here
278	# Memory allocation symbols. We want chrome and any libraries to	278	# Memory allocation symbols. We want chrome and any libraries to
279	# share the same heap, so it is correct to export these symbols.	279	# share the same heap, so it is correct to export these symbols.
280	aligned_alloc;	280	aligned_alloc;
281	--- cargo-crates/v8-0.47.1/build/linux/libpci/BUILD.gn.orig 1970-01-01 00:00:00 UTC	281	--- cargo-crates/v8-0.47.1/build/linux/libpci/BUILD.gn.orig 1973-11-29 21:33:09 UTC
282	+++ cargo-crates/v8-0.47.1/build/linux/libpci/BUILD.gn	282	+++ cargo-crates/v8-0.47.1/build/linux/libpci/BUILD.gn
283	@@ -3,20 +3,36 @@ import("//tools/generate_library_loader/generate_libra	283	@@ -3,20 +3,36 @@
284	# found in the LICENSE file.	284	# found in the LICENSE file.
285		285
286	import("//tools/generate_library_loader/generate_library_loader.gni")	286	import("//tools/generate_library_loader/generate_library_loader.gni")
Lines 331-337 error[E0308]: mismatched types Link Here
331	+ ]	331	+ ]
332	+ }	332	+ }
333	}	333	}
334	--- cargo-crates/v8-0.47.1/build/linux/unbundle/libusb.gn.orig 2021-04-15 08:12:30 UTC	334	--- cargo-crates/v8-0.47.1/build/linux/unbundle/libusb.gn.orig 2023-04-25 23:33:42 UTC
335	+++ cargo-crates/v8-0.47.1/build/linux/unbundle/libusb.gn	335	+++ cargo-crates/v8-0.47.1/build/linux/unbundle/libusb.gn
336	@@ -0,0 +1,24 @@	336	@@ -0,0 +1,24 @@
337	+# Copyright 2016 The Chromium Authors. All rights reserved.	337	+# Copyright 2016 The Chromium Authors. All rights reserved.
Lines 358-364 error[E0308]: mismatched types Link Here
358	+ ]	358	+ ]
359	+ public_configs = [ ":system_libusb" ]	359	+ public_configs = [ ":system_libusb" ]
360	+}	360	+}
361	--- cargo-crates/v8-0.47.1/build/linux/unbundle/replace_gn_files.py.orig 1970-01-01 00:00:00 UTC	361	--- cargo-crates/v8-0.47.1/build/linux/unbundle/replace_gn_files.py.orig 1973-11-29 21:33:09 UTC
362	+++ cargo-crates/v8-0.47.1/build/linux/unbundle/replace_gn_files.py	362	+++ cargo-crates/v8-0.47.1/build/linux/unbundle/replace_gn_files.py
363	@@ -25,6 +25,7 @@ REPLACEMENTS = {	363	@@ -25,6 +25,7 @@ REPLACEMENTS = {
364	'libevent': 'base/third_party/libevent/BUILD.gn',	364	'libevent': 'base/third_party/libevent/BUILD.gn',
Lines 368-376 error[E0308]: mismatched types Link Here
368	'libvpx': 'third_party/libvpx/BUILD.gn',	368	'libvpx': 'third_party/libvpx/BUILD.gn',
369	'libwebp': 'third_party/libwebp/BUILD.gn',	369	'libwebp': 'third_party/libwebp/BUILD.gn',
370	'libxml': 'third_party/libxml/BUILD.gn',	370	'libxml': 'third_party/libxml/BUILD.gn',
371	--- cargo-crates/v8-0.47.1/build/toolchain/gcc_toolchain.gni.orig 1970-01-01 00:00:00 UTC	371	--- cargo-crates/v8-0.47.1/build/toolchain/gcc_toolchain.gni.orig 1973-11-29 21:33:09 UTC
372	+++ cargo-crates/v8-0.47.1/build/toolchain/gcc_toolchain.gni	372	+++ cargo-crates/v8-0.47.1/build/toolchain/gcc_toolchain.gni
373	@@ -786,13 +786,17 @@ template("clang_toolchain") {	373	@@ -786,13 +786,17 @@ template("gcc_toolchain") {
374	# use_gold too.	374	# use_gold too.
375	template("clang_toolchain") {	375	template("clang_toolchain") {
376	gcc_toolchain(target_name) {	376	gcc_toolchain(target_name) {
Lines 394-400 error[E0308]: mismatched types Link Here
394		394
395	forward_variables_from(invoker,	395	forward_variables_from(invoker,
396	[	396	[
397	--- cargo-crates/v8-0.47.1/build/toolchain/get_concurrent_links.py.orig 1970-01-01 00:00:00 UTC	397	--- cargo-crates/v8-0.47.1/build/toolchain/get_concurrent_links.py.orig 1973-11-29 21:33:09 UTC
398	+++ cargo-crates/v8-0.47.1/build/toolchain/get_concurrent_links.py	398	+++ cargo-crates/v8-0.47.1/build/toolchain/get_concurrent_links.py
399	@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes():	399	@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes():
400	return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))	400	return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
Lines 411-417 error[E0308]: mismatched types Link Here
411	# TODO(scottmg): Implement this for other platforms.	411	# TODO(scottmg): Implement this for other platforms.
412	return 0	412	return 0
413		413
414	--- cargo-crates/v8-0.47.1/third_party/zlib/BUILD.gn.orig 1970-01-01 00:00:00 UTC	414	--- cargo-crates/v8-0.47.1/third_party/zlib/BUILD.gn.orig 1973-11-29 21:33:09 UTC
415	+++ cargo-crates/v8-0.47.1/third_party/zlib/BUILD.gn	415	+++ cargo-crates/v8-0.47.1/third_party/zlib/BUILD.gn
416	@@ -119,6 +119,8 @@ if (use_arm_neon_optimizations) {	416	@@ -119,6 +119,8 @@ if (use_arm_neon_optimizations) {
417	defines = [ "CRC32_ARMV8_CRC32" ]	417	defines = [ "CRC32_ARMV8_CRC32" ]
Lines 422-430 error[E0308]: mismatched types Link Here
422	} else if (is_linux \|\| is_chromeos) {	422	} else if (is_linux \|\| is_chromeos) {
423	defines += [ "ARMV8_OS_LINUX" ]	423	defines += [ "ARMV8_OS_LINUX" ]
424	} else if (is_mac) {	424	} else if (is_mac) {
425	--- cargo-crates/v8-0.47.1/third_party/zlib/cpu_features.c.orig 1970-01-01 00:00:00 UTC	425	--- cargo-crates/v8-0.47.1/third_party/zlib/cpu_features.c.orig 1973-11-29 21:33:09 UTC
426	+++ cargo-crates/v8-0.47.1/third_party/zlib/cpu_features.c	426	+++ cargo-crates/v8-0.47.1/third_party/zlib/cpu_features.c
427	@@ -31,11 +31,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;	427	@@ -31,11 +31,13 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
428		428
429	#ifndef CPU_NO_SIMD	429	#ifndef CPU_NO_SIMD
430		430
Lines 435-453 error[E0308]: mismatched types Link Here
435		435
436	-#if defined(ARMV8_OS_ANDROID)	436	-#if defined(ARMV8_OS_ANDROID)
437	+#if defined(ARMV8_OS_FREEBSD)	437	+#if defined(ARMV8_OS_FREEBSD)
438	+#include <machine/armreg.h>	438	+#include <sys/auxv.h>
439	+#include <sys/types.h>
440	+#ifndef ID_AA64ISAR0_AES_VAL
441	+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES
442	+#endif
443	+#ifndef ID_AA64ISAR0_CRC32_VAL
444	+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
445	+#endif
446	+#elif defined(ARMV8_OS_ANDROID)	439	+#elif defined(ARMV8_OS_ANDROID)
447	#include <cpu-features.h>	440	#include <cpu-features.h>
448	#elif defined(ARMV8_OS_LINUX)	441	#elif defined(ARMV8_OS_LINUX)
449	#include <asm/hwcap.h>	442	#include <asm/hwcap.h>
450	@@ -56,7 +65,7 @@ static void _cpu_check_features(void);	443	@@ -56,7 +58,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0;
451	static void _cpu_check_features(void);	444	static void _cpu_check_features(void);
452	#endif	445	#endif
453		446
Lines 456-476 error[E0308]: mismatched types Link Here
456	#if !defined(ARMV8_OS_MACOS)	449	#if !defined(ARMV8_OS_MACOS)
457	// _cpu_check_features() doesn't need to do anything on mac/arm since all	450	// _cpu_check_features() doesn't need to do anything on mac/arm since all
458	// features are known at build time, so don't call it.	451	// features are known at build time, so don't call it.
459	@@ -123,6 +132,13 @@ static void _cpu_check_features(void)	452	@@ -123,6 +125,16 @@ static void _cpu_check_features(void)
460	#elif defined(ARMV8_OS_WINDOWS)	453	#elif defined(ARMV8_OS_WINDOWS)
461	arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);	454	arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);
462	arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);	455	arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE);
463	+#elif defined(ARMV8_OS_FREEBSD)	456	+#elif defined(ARMV8_OS_FREEBSD) && defined(__aarch64__)
464	+ uint64_t id_aa64isar0;	457	+ unsigned long features;
465	+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);	458	+ elf_aux_info(AT_HWCAP, &features, sizeof features);
466	+ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)	459	+ arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
467	+ arm_cpu_enable_pmull = 1;	460	+ arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
468	+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)	461	+#elif defined(ARMV8_OS_FREEBSD) /* aarch32 */
469	+ arm_cpu_enable_crc32 = 1;	462	+ unsigned long features;
		463	+ elf_aux_info(AT_HWCAP2, &features, sizeof features);
		464	+ arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
		465	+ arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
470	#endif	466	#endif
471	}	467	}
472	#endif	468	#endif
473	--- cargo-crates/v8-0.47.1/v8/BUILD.gn.orig 1970-01-01 00:00:00 UTC	469	--- cargo-crates/v8-0.47.1/v8/BUILD.gn.orig 1973-11-29 21:33:09 UTC
474	+++ cargo-crates/v8-0.47.1/v8/BUILD.gn	470	+++ cargo-crates/v8-0.47.1/v8/BUILD.gn
475	@@ -5348,7 +5348,7 @@ v8_component("v8_libbase") {	471	@@ -5348,7 +5348,7 @@ v8_component("v8_libbase") {
476	}	472	}
Lines 500-506 error[E0308]: mismatched types Link Here
500	} else if (current_os == "aix") {	496	} else if (current_os == "aix") {
501	sources += [	497	sources += [
502	"src/base/debug/stack_trace_posix.cc",	498	"src/base/debug/stack_trace_posix.cc",
503	--- cargo-crates/v8-0.47.1/v8/src/api/api.cc.orig 1970-01-01 00:00:00 UTC	499	--- cargo-crates/v8-0.47.1/v8/src/api/api.cc.orig 1973-11-29 21:33:09 UTC
504	+++ cargo-crates/v8-0.47.1/v8/src/api/api.cc	500	+++ cargo-crates/v8-0.47.1/v8/src/api/api.cc
505	@@ -138,7 +138,7 @@	501	@@ -138,7 +138,7 @@
506	#include "src/wasm/wasm-serialization.h"	502	#include "src/wasm/wasm-serialization.h"
Lines 520-526 error[E0308]: mismatched types Link Here
520	bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info,	516	bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info,
521	void* context) {	517	void* context) {
522	#if V8_ENABLE_WEBASSEMBLY && V8_TRAP_HANDLER_SUPPORTED	518	#if V8_ENABLE_WEBASSEMBLY && V8_TRAP_HANDLER_SUPPORTED
523	--- cargo-crates/v8-0.47.1/v8/src/base/platform/platform-freebsd.cc.orig 1970-01-01 00:00:00 UTC	519	--- cargo-crates/v8-0.47.1/v8/src/base/platform/platform-freebsd.cc.orig 1973-11-29 21:33:09 UTC
524	+++ cargo-crates/v8-0.47.1/v8/src/base/platform/platform-freebsd.cc	520	+++ cargo-crates/v8-0.47.1/v8/src/base/platform/platform-freebsd.cc
525	@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib	521	@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
526	lib_name = std::string(path);	522	lib_name = std::string(path);
Lines 533-539 error[E0308]: mismatched types Link Here
533	}	529	}
534		530
535	start += ssize;	531	start += ssize;
536	--- cargo-crates/v8-0.47.1/v8/src/base/platform/platform-posix.cc.orig 1970-01-01 00:00:00 UTC	532	--- cargo-crates/v8-0.47.1/v8/src/base/platform/platform-posix.cc.orig 1973-11-29 21:33:09 UTC
537	+++ cargo-crates/v8-0.47.1/v8/src/base/platform/platform-posix.cc	533	+++ cargo-crates/v8-0.47.1/v8/src/base/platform/platform-posix.cc
538	@@ -294,8 +294,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {	534	@@ -294,8 +294,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
539	}	535	}
Lines 559-565 error[E0308]: mismatched types Link Here
559		555
560	// TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.	556	// TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
561	#if !V8_OS_CYGWIN && !V8_OS_FUCHSIA	557	#if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
562	@@ -634,7 +642,7 @@ bool OS::HasLazyCommits() {	558	@@ -634,7 +642,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
563		559
564	// static	560	// static
565	bool OS::HasLazyCommits() {	561	bool OS::HasLazyCommits() {
Lines 590-592 error[E0308]: mismatched types Link Here
590		586
591	// static	587	// static
592	Stack::StackSlot Stack::GetStackStart() {	588	Stack::StackSlot Stack::GetStackStart() {
593	-	589	--- cargo-crates/v8-0.47.1/v8/src/codegen/arm/cpu-arm.cc.orig 2023-04-26 09:31:09 UTC
		590	+++ cargo-crates/v8-0.47.1/v8/src/codegen/arm/cpu-arm.cc
		591	@@ -2,12 +2,15 @@
		592	// Use of this source code is governed by a BSD-style license that can be
		593	// found in the LICENSE file.
		594
		595	+#include "include/v8config.h"
		596	+
		597	// CPU specific code for arm independent of OS goes here.
		598	#ifdef __arm__
		599	#ifdef __QNXNTO__
		600	#include <sys/mman.h> // for cache flushing.
		601	#undef MAP_TYPE
		602	#elif V8_OS_FREEBSD
		603	+#include <sys/cdefs.h>
		604	#include <machine/sysarch.h> // for cache flushing
		605	#include <sys/types.h>
		606	#elif V8_OS_STARBOARD