diff options
Diffstat (limited to 'lang/v8/files')
19 files changed, 69 insertions, 156 deletions
diff --git a/lang/v8/files/patch-v8_BUILD.gn b/lang/v8/files/patch-BUILD.gn index e0fe44d86a02..f4cf17f479ab 100644 --- a/lang/v8/files/patch-v8_BUILD.gn +++ b/lang/v8/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2020-09-18 23:49:09 UTC +--- BUILD.gn.orig 2021-04-22 15:00:28 UTC +++ BUILD.gn -@@ -4069,7 +4069,7 @@ v8_component("v8_libbase") { +@@ -4438,7 +4438,7 @@ v8_component("v8_libbase") { } } @@ -9,10 +9,10 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -4089,6 +4089,12 @@ v8_component("v8_libbase") { - "dl", - "rt", +@@ -4455,6 +4455,12 @@ v8_component("v8_libbase") { ] + + libs = [ "dl" ] + } else if (is_bsd) { + sources += [ + "src/base/debug/stack_trace_posix.cc", @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -4431,6 +4437,7 @@ if (v8_monolithic) { +@@ -4890,6 +4896,7 @@ if (v8_monolithic) { ":v8_libsampler", "//build/win:default_exe_manifest", ] diff --git a/lang/v8/files/patch-build_config_BUILD.gn b/lang/v8/files/patch-build_config_BUILD.gn index 964e6821a3a3..78876659bd55 100644 --- a/lang/v8/files/patch-build_config_BUILD.gn +++ b/lang/v8/files/patch-build_config_BUILD.gn @@ -1,15 +1,15 @@ ---- build/config/BUILD.gn.orig 2020-09-19 19:50:44 UTC +--- build/config/BUILD.gn.orig 2021-05-01 21:15:31 UTC +++ build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } -- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && enable_iterator_debugging) { -+ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { +- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && ++ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && + enable_iterator_debugging) { # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . - # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -231,9 +231,7 @@ config("default_libs") { +@@ -232,9 +232,7 @@ config("default_libs") { ] } else if (is_linux || is_chromeos) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -316,7 +314,7 @@ config("executable_config") { +@@ -313,7 +311,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] diff --git a/lang/v8/files/patch-build_config_BUILDCONFIG.gn b/lang/v8/files/patch-build_config_BUILDCONFIG.gn index d06fbd3ddec1..a58edd5f70e8 100644 --- a/lang/v8/files/patch-build_config_BUILDCONFIG.gn +++ b/lang/v8/files/patch-build_config_BUILDCONFIG.gn @@ -1,19 +1,15 @@ ---- build/config/BUILDCONFIG.gn.orig 2020-11-16 14:30:51 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-05-01 21:15:31 UTC +++ build/config/BUILDCONFIG.gn -@@ -131,10 +131,10 @@ declare_args() { +@@ -131,7 +131,7 @@ declare_args() { is_official_build = false - # Whether we're a traditional desktop unix. -- is_desktop_linux = current_os == "linux" -+ is_desktop_linux = current_os == "linux" || current_os == "freebsd" - # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || + is_clang = current_os != "linux" || current_os == "freebsd" || (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") -@@ -186,8 +186,8 @@ if (host_toolchain == "") { +@@ -183,8 +183,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -24,7 +20,7 @@ host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -224,7 +224,7 @@ if (target_os == "android") { +@@ -221,7 +221,7 @@ if (target_os == "android") { assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -33,7 +29,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -288,10 +288,11 @@ is_android = current_os == "android" +@@ -285,10 +285,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/lang/v8/files/patch-build_config_compiler_BUILD.gn b/lang/v8/files/patch-build_config_compiler_BUILD.gn index 35cd606c4e03..9f75619ad3f6 100644 --- a/lang/v8/files/patch-build_config_compiler_BUILD.gn +++ b/lang/v8/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2020-11-16 14:30:51 UTC +--- build/config/compiler/BUILD.gn.orig 2021-05-01 21:15:31 UTC +++ build/config/compiler/BUILD.gn -@@ -128,7 +128,7 @@ declare_args() { +@@ -132,7 +132,7 @@ declare_args() { # # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may # call an old clang that doesn't support auto-init. @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -291,7 +291,7 @@ config("compiler") { +@@ -324,7 +324,7 @@ config("compiler") { } # Linker warnings. @@ -17,8 +17,8 @@ + if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } - if (fatal_linker_warnings && is_apple && -@@ -389,7 +389,7 @@ config("compiler") { + if (fatal_linker_warnings && is_apple) { +@@ -419,7 +419,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -480,7 +480,7 @@ config("compiler") { +@@ -509,7 +509,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] cflags += [ -@@ -776,7 +776,7 @@ config("compiler_cpu_abi") { +@@ -841,7 +841,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1129,7 +1129,7 @@ config("compiler_deterministic") { +@@ -1191,7 +1191,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1512,7 +1512,7 @@ config("default_warnings") { +@@ -1574,7 +1574,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,16 +63,16 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1764,7 +1764,7 @@ config("thin_archive") { - # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't - # have a "thin archive" mode (it does accept -T, but it means truncating - # archive names to 16 characters, which is not what we want). -- if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { -+ if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) { +@@ -1822,7 +1822,7 @@ config("export_dynamic") { + config("thin_archive") { + # The macOS and iOS default linker ld64 does not support reading thin + # archives. +- if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) { ++ if ((is_posix && !is_nacl && (!is_apple || use_lld) && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2297,7 +2297,7 @@ config("symbols") { +@@ -2367,7 +2367,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -81,7 +81,7 @@ } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2339,7 +2339,7 @@ config("symbols") { +@@ -2400,7 +2400,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. if (!is_apple && !is_nacl && current_cpu != "x86" && diff --git a/lang/v8/files/patch-build_config_compiler_compiler.gni b/lang/v8/files/patch-build_config_compiler_compiler.gni index 1106d32da150..aad060a3ebc4 100644 --- a/lang/v8/files/patch-build_config_compiler_compiler.gni +++ b/lang/v8/files/patch-build_config_compiler_compiler.gni @@ -1,11 +1,11 @@ ---- build/config/compiler/compiler.gni.orig 2020-06-13 18:27:18 UTC +--- build/config/compiler/compiler.gni.orig 2021-05-01 21:15:31 UTC +++ build/config/compiler/compiler.gni -@@ -176,7 +176,7 @@ declare_args() { +@@ -201,7 +201,7 @@ declare_args() { + declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. - use_gold = -- !use_lld && !(is_chromecast && is_linux && -+ !is_bsd && !use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && - ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || - current_cpu == "arm" || current_cpu == "arm64" || +- use_gold = !use_lld && !(is_chromecast && is_linux && ++ use_gold = !use_lld && !is_bsd && !(is_chromecast && is_linux && + (current_cpu == "arm" || current_cpu == "mipsel")) && + (((is_linux || is_chromeos_lacros) && + (current_cpu == "x64" || current_cpu == "x86" || diff --git a/lang/v8/files/patch-build_config_linux_BUILD.gn b/lang/v8/files/patch-build_config_linux_BUILD.gn index e1ce0cbb1905..171a343ed558 100644 --- a/lang/v8/files/patch-build_config_linux_BUILD.gn +++ b/lang/v8/files/patch-build_config_linux_BUILD.gn @@ -1,8 +1,8 @@ ---- build/config/linux/BUILD.gn.orig 2020-05-13 18:39:36 UTC +--- build/config/linux/BUILD.gn.orig 2021-05-01 21:15:31 UTC +++ build/config/linux/BUILD.gn @@ -30,7 +30,7 @@ config("runtime_library") { - if ((!(is_chromeos || chromeos_is_browser_only) || + if ((!(is_chromeos_ash || is_chromeos_lacros) || default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { diff --git a/lang/v8/files/patch-build_linux_chrome.map b/lang/v8/files/patch-build_linux_chrome.map index 7465bc9773c5..f540509b3054 100644 --- a/lang/v8/files/patch-build_linux_chrome.map +++ b/lang/v8/files/patch-build_linux_chrome.map @@ -1,4 +1,4 @@ ---- build/linux/chrome.map.orig 2019-03-11 22:00:52 UTC +--- build/linux/chrome.map.orig 2021-05-01 21:15:31 UTC +++ build/linux/chrome.map @@ -1,4 +1,7 @@ { @@ -19,10 +19,10 @@ # Memory allocation symbols. We want chrome and any libraries to # share the same heap, so it is correct to export these symbols. calloc; -@@ -81,7 +88,4 @@ global: - localtime64; - localtime64_r; +@@ -83,7 +90,4 @@ global: localtime_r; + + v8dbg_*; - -local: - *; diff --git a/lang/v8/files/patch-build_toolchain_gcc__toolchain.gni b/lang/v8/files/patch-build_toolchain_gcc__toolchain.gni index 1c051a3a9547..b4ccef3ae135 100644 --- a/lang/v8/files/patch-build_toolchain_gcc__toolchain.gni +++ b/lang/v8/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2020-11-16 14:30:51 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-05-01 21:15:31 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) { +@@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -641,13 +646,23 @@ template("clang_toolchain") { +@@ -646,13 +651,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/lang/v8/files/patch-build_toolchain_get__concurrent__links.py b/lang/v8/files/patch-build_toolchain_get__concurrent__links.py index 45bc3d0a520e..edf94a0e06b7 100644 --- a/lang/v8/files/patch-build_toolchain_get__concurrent__links.py +++ b/lang/v8/files/patch-build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC +--- build/toolchain/get_concurrent_links.py.orig 2021-05-01 21:15:31 UTC +++ build/toolchain/get_concurrent_links.py -@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): +@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 diff --git a/lang/v8/files/patch-build_toolchain_linux_BUILD.gn b/lang/v8/files/patch-build_toolchain_linux_BUILD.gn index 29b9160f7b07..08d5cf924d40 100644 --- a/lang/v8/files/patch-build_toolchain_linux_BUILD.gn +++ b/lang/v8/files/patch-build_toolchain_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/toolchain/linux/BUILD.gn.orig 2019-04-30 22:22:28 UTC +--- build/toolchain/linux/BUILD.gn.orig 2021-05-01 21:15:31 UTC +++ build/toolchain/linux/BUILD.gn -@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") { +@@ -23,7 +23,6 @@ clang_toolchain("clang_arm") { } clang_toolchain("clang_arm64") { diff --git a/lang/v8/files/patch-v8_include_v8config.h b/lang/v8/files/patch-include_v8config.h index abb2e3cc1749..5b3e5a7df644 100644 --- a/lang/v8/files/patch-v8_include_v8config.h +++ b/lang/v8/files/patch-include_v8config.h @@ -1,8 +1,8 @@ ---- include/v8config.h.orig 2020-03-03 18:55:34 UTC +--- include/v8config.h.orig 2021-04-22 15:00:28 UTC +++ include/v8config.h -@@ -273,7 +273,18 @@ - # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \ - (__has_attribute(warn_unused_result)) +@@ -293,7 +293,18 @@ path. Add it with -I<path> to the command line + + # define V8_HAS_CPP_ATTRIBUTE_NODISCARD (V8_HAS_CPP_ATTRIBUTE(nodiscard)) +// Work around Clang bug present in 9.0.1, at least. +// diff --git a/lang/v8/files/patch-v8_src_api_api.cc b/lang/v8/files/patch-src_api_api.cc index b583f93e3123..47244c44d1b6 100644 --- a/lang/v8/files/patch-v8_src_api_api.cc +++ b/lang/v8/files/patch-src_api_api.cc @@ -1,6 +1,6 @@ ---- src/api/api.cc.orig 2020-05-13 18:41:59 UTC +--- src/api/api.cc.orig 2021-04-22 15:00:28 UTC +++ src/api/api.cc -@@ -5726,7 +5726,7 @@ bool v8::V8::Initialize() { +@@ -5694,7 +5694,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } @@ -8,4 +8,4 @@ +#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, void* context) { - #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID + // When the target code runs on the V8 arm simulator, the trap handler does diff --git a/lang/v8/files/patch-v8_src_base_cpu.cc b/lang/v8/files/patch-src_base_cpu.cc index 1ee0e5c1abcc..65f51266f753 100644 --- a/lang/v8/files/patch-v8_src_base_cpu.cc +++ b/lang/v8/files/patch-src_base_cpu.cc @@ -1,6 +1,6 @@ ---- src/base/cpu.cc.orig 2020-05-13 18:41:59 UTC +--- src/base/cpu.cc.orig 2021-04-22 15:00:28 UTC +++ src/base/cpu.cc -@@ -427,6 +427,7 @@ CPU::CPU() +@@ -545,6 +545,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -460,6 +461,7 @@ CPU::CPU() +@@ -578,6 +579,7 @@ CPU::CPU() } delete[] part; } diff --git a/lang/v8/files/patch-v8_src_base_platform_platform-freebsd.cc b/lang/v8/files/patch-src_base_platform_platform-freebsd.cc index ed3a93e17053..0af7a6ed208b 100644 --- a/lang/v8/files/patch-v8_src_base_platform_platform-freebsd.cc +++ b/lang/v8/files/patch-src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- src/base/platform/platform-freebsd.cc.orig 2020-05-13 18:41:59 UTC +--- src/base/platform/platform-freebsd.cc.orig 2021-04-22 15:00:28 UTC +++ src/base/platform/platform-freebsd.cc @@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib lib_name = std::string(path); diff --git a/lang/v8/files/patch-v8_src_base_platform_platform-posix.cc b/lang/v8/files/patch-src_base_platform_platform-posix.cc index 60b6aa2f5eb4..1dc9654483a7 100644 --- a/lang/v8/files/patch-v8_src_base_platform_platform-posix.cc +++ b/lang/v8/files/patch-src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- src/base/platform/platform-posix.cc.orig 2020-05-13 18:41:59 UTC +--- src/base/platform/platform-posix.cc.orig 2021-04-22 15:00:28 UTC +++ src/base/platform/platform-posix.cc -@@ -433,7 +433,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -478,7 +478,7 @@ bool OS::DiscardSystemPages(void* address, size_t size // static bool OS::HasLazyCommits() { @@ -9,7 +9,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -564,6 +564,12 @@ int OS::GetCurrentThreadId() { +@@ -611,6 +611,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/lang/v8/files/patch-src_objects_js-list-format.cc b/lang/v8/files/patch-src_objects_js-list-format.cc deleted file mode 100644 index 6b78534db47e..000000000000 --- a/lang/v8/files/patch-src_objects_js-list-format.cc +++ /dev/null @@ -1,83 +0,0 @@ -https://github.com/v8/v8/commit/035c305ce7761f51328b45f1bd83e26aef267c9d - -../../src/objects/js-list-format.cc:145:55: error: 'createInstance' is a private member of 'icu::ListFormatter' - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( - ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ -/usr/local/include/unicode/listformatter.h:267:27: note: declared private here - static ListFormatter* createInstance(const Locale& locale, const char* style, UErrorCode& errorCode); - ^ - ---- src/objects/js-list-format.cc.orig 2020-11-11 06:36:03 UTC -+++ src/objects/js-list-format.cc -@@ -29,46 +29,27 @@ namespace v8 { - namespace internal { - - namespace { --const char* kStandard = "standard"; --const char* kOr = "or"; --const char* kUnit = "unit"; --const char* kStandardShort = "standard-short"; --const char* kOrShort = "or-short"; --const char* kUnitShort = "unit-short"; --const char* kStandardNarrow = "standard-narrow"; --const char* kOrNarrow = "or-narrow"; --const char* kUnitNarrow = "unit-narrow"; - --const char* GetIcuStyleString(JSListFormat::Style style, -- JSListFormat::Type type) { -+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { -+ switch (style) { -+ case JSListFormat::Style::LONG: -+ return ULISTFMT_WIDTH_WIDE; -+ case JSListFormat::Style::SHORT: -+ return ULISTFMT_WIDTH_SHORT; -+ case JSListFormat::Style::NARROW: -+ return ULISTFMT_WIDTH_NARROW; -+ } -+ UNREACHABLE(); -+} -+ -+UListFormatterType GetIcuType(JSListFormat::Type type) { - switch (type) { - case JSListFormat::Type::CONJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kStandard; -- case JSListFormat::Style::SHORT: -- return kStandardShort; -- case JSListFormat::Style::NARROW: -- return kStandardNarrow; -- } -+ return ULISTFMT_TYPE_AND; - case JSListFormat::Type::DISJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kOr; -- case JSListFormat::Style::SHORT: -- return kOrShort; -- case JSListFormat::Style::NARROW: -- return kOrNarrow; -- } -+ return ULISTFMT_TYPE_OR; - case JSListFormat::Type::UNIT: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kUnit; -- case JSListFormat::Style::SHORT: -- return kUnitShort; -- case JSListFormat::Style::NARROW: -- return kUnitNarrow; -- } -+ return ULISTFMT_TYPE_UNITS; - } - UNREACHABLE(); - } -@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat::New(Isolate* i - icu::Locale icu_locale = r.icu_locale; - UErrorCode status = U_ZERO_ERROR; - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( -- icu_locale, GetIcuStyleString(style_enum, type_enum), status); -+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); - if (U_FAILURE(status) || formatter == nullptr) { - delete formatter; - THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError), diff --git a/lang/v8/files/v8.pc b/lang/v8/files/v8.pc.in index 8d9970831e04..8d9970831e04 100644 --- a/lang/v8/files/v8.pc +++ b/lang/v8/files/v8.pc.in diff --git a/lang/v8/files/v8_libbase.pc b/lang/v8/files/v8_libbase.pc.in index 171cd2e2112d..171cd2e2112d 100644 --- a/lang/v8/files/v8_libbase.pc +++ b/lang/v8/files/v8_libbase.pc.in diff --git a/lang/v8/files/v8_libplatform.pc b/lang/v8/files/v8_libplatform.pc.in index 43708a89a9bd..43708a89a9bd 100644 --- a/lang/v8/files/v8_libplatform.pc +++ b/lang/v8/files/v8_libplatform.pc.in |