diff --git a/www/deno/files/patch-build_config_compiler_BUILD.gn b/www/deno/files/patch-build_config_compiler_BUILD.gn index e13c3a8e32be..446cabbe618a 100644 --- a/www/deno/files/patch-build_config_compiler_BUILD.gn +++ b/www/deno/files/patch-build_config_compiler_BUILD.gn @@ -1,157 +1,172 @@ ---- cargo-crates/v8-135.1.0/build/config/compiler/BUILD.gn.orig 1973-11-29 22:33:09 UTC +--- cargo-crates/v8-135.1.0/build/config/compiler/BUILD.gn.orig 2006-07-24 01:21:28 UTC +++ cargo-crates/v8-135.1.0/build/config/compiler/BUILD.gn @@ -198,7 +198,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. - simple_template_names = is_clang && !is_nacl && !is_win && !is_apple + simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd # Limits the debuginfo that gets generated in "minimal symbols" mode to just # line tables. This flag only has any effect when `symbol_level` is set to 1. @@ -267,13 +267,16 @@ config("no_unresolved_symbols") { # 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 && + if (!using_sanitizer && !is_bsd && (is_linux || is_chromeos || is_android || is_fuchsia)) { ldflags = [ "-Wl,-z,defs", "-Wl,--as-needed", ] } + if (current_cpu == "x86" && is_freebsd) { + ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ] + } } # compiler --------------------------------------------------------------------- @@ -407,7 +410,7 @@ config("compiler") { } # Linker warnings. - if (fatal_linker_warnings && !is_apple && current_os != "aix" && + if (fatal_linker_warnings && !is_apple && !is_freebsd && current_os != "aix" && current_os != "zos") { ldflags += [ "-Wl,--fatal-warnings" ] } @@ -531,6 +534,10 @@ config("compiler") { } } + if (is_freebsd) { + ldflags += [ "-Wl,-z,wxneeded" ] + } + # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { @@ -590,7 +597,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } - if (is_clang && !is_nacl) { + if (is_clang && !is_nacl && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ +@@ -1235,10 +1242,10 @@ config("compiler_cpu_abi") { + ] + } + } else if (current_cpu == "arm") { +- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { +- cflags += [ "--target=arm-linux-gnueabihf" ] +- ldflags += [ "--target=arm-linux-gnueabihf" ] +- } ++# if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { ++# cflags += [ "--target=arm-linux-gnueabihf" ] ++# ldflags += [ "--target=arm-linux-gnueabihf" ] ++# } + if (!is_nacl) { + cflags += [ + "-march=$arm_arch", @@ -1249,7 +1256,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_bsd && !is_android && !is_nacl && !is_fuchsia && !is_chromeos_device) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] @@ -1584,7 +1591,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_bsd) { # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", @@ -1604,7 +1611,7 @@ config("compiler_deterministic") { rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir), ] } - if (!is_win) { + if (!is_win && !is_bsd) { # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } @@ -1643,7 +1650,7 @@ config("clang_revision") { config("clang_revision") { if (is_clang && clang_base_path == default_clang_base_path && - current_os != "zos") { + current_os != "zos" && !is_bsd) { update_args = [ "--print-revision", "--verify-version=$clang_version", @@ -1980,7 +1987,7 @@ config("default_warnings") { "-Wno-thread-safety-reference-return", # TODO(crbug.com/376641662): Fix and re-enable. - "-Wno-nontrivial-memcall", + # "-Wno-nontrivial-memcall", ] cflags_cc += [ @@ -2299,7 +2306,7 @@ config("thin_archive") { # 2. Remove the thin_archive config, so that the .a file actually contains all # .o files, instead of just references to .o files in the build directoy config("thin_archive") { - if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix") { + if ((is_apple && use_lld) || (is_linux && !is_clang && !is_bsd) || current_os == "aix") { # The macOS and iOS linker ld64.ldd doesn't support thin archive without # symbol table, gcc on linux also throws the error `archive has no index`. # AIX does support -s option, not -S option. @@ -2754,7 +2761,7 @@ config("afdo") { # 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_clang) { + if (is_clang && !is_bsd) { cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. @@ -2781,7 +2788,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } - } else if (auto_profile_path != "" && is_a_target_toolchain) { + } else if (auto_profile_path != "" && is_a_target_toolchain && !is_bsd) { cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } @@ -2885,7 +2892,7 @@ config("symbols") { # Keeping -g2 for saigo as it's the only toolchain whose artifacts that are # part of chromium release (other nacl toolchains are used only for tests). if ((!is_nacl || is_nacl_saigo) && current_os != "zos") { - cflags += [ "-g2" ] + cflags += [ "-g0" ] } if (!is_nacl && is_clang && !is_tsan && !is_asan) { @@ -2920,7 +2927,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. _enable_gdb_index = - symbol_level == 2 && !is_apple && !is_nacl && current_cpu != "x86" && + symbol_level == 2 && !is_apple && !is_bsd && !is_nacl && current_cpu != "x86" && current_os != "zos" && use_lld && # Disable on non-fission 32-bit Android because it pushes # libcomponents_unittests over the 4gb size limit. @@ -2958,7 +2965,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } - if (is_clang && (!is_nacl || is_nacl_saigo)) { + if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) { if (is_apple) { # TODO(crbug.com/40117949): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. diff --git a/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc index c2f65ad6363f..d3cc6f81b281 100644 --- a/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc +++ b/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc @@ -1,32 +1,32 @@ --- cargo-crates/v8-135.1.0/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-26 16:28:04 UTC +++ cargo-crates/v8-135.1.0/v8/src/base/platform/platform-freebsd.cc @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache() { return new PosixDefaultTimezoneCache(); } -static unsigned StringToLong(char* buffer) { - return static_cast(strtol(buffer, nullptr, 16)); -} - std::vector OS::GetSharedLibraryAddresses() { std::vector result; int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()}; - size_t miblen = sizeof(mib) / sizeof(mib[0]); + unsigned int miblen = sizeof(mib) / sizeof(mib[0]); size_t buffer_size; if (sysctl(mib, miblen, nullptr, &buffer_size, nullptr, 0) == 0) { // Overallocate the buffer by 1/3 to account for concurrent @@ -82,8 +78,13 @@ std::vector OS::GetSharedLib lib_name = std::string(path); } result.push_back(SharedLibraryAddress( -+#if defined(__i386__) || defined(OS_FREEBSD) ++#if defined(__arm__) || defined(__i386__) || defined(OS_FREEBSD) + lib_name, static_cast(map->kve_start), + static_cast(map->kve_end))); +#else lib_name, reinterpret_cast(map->kve_start), reinterpret_cast(map->kve_end))); +#endif } start += ssize;