diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi index 5aa7c3fb4d2927..ddeba2112f9310 100644 --- a/tools/v8_gypfiles/features.gypi +++ b/tools/v8_gypfiles/features.gypi @@ -63,11 +63,16 @@ 'is_component_build': 0, }], ['OS == "win" or OS == "mac"', { - # Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing + # Sets -DENABLE_SYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing 'v8_enable_system_instrumentation': 1, }, { 'v8_enable_system_instrumentation': 0, }], + ['OS == "win"', { + 'v8_enable_etw_stack_walking': 1, + }, { + 'v8_enable_etw_stack_walking': 0, + }] ], 'is_debug%': 0, @@ -219,17 +224,9 @@ 'v8_enable_zone_compression%': 0, # Enable the experimental V8 sandbox. - # Sets -DV8_SANDBOX. + # Sets -DV8_ENABLE_SANDBOX. 'v8_enable_sandbox%': 0, - # Enable external pointer sandboxing. Requires v8_enable_sandbox. - # Sets -DV8_SANDBOXED_EXTERNAL_POINRTERS. - 'v8_enable_sandboxed_external_pointers%': 0, - - # Enable sandboxed pointers. Requires v8_enable_sandbox. - # Sets -DV8_SANDBOXED_POINTERS. - 'v8_enable_sandboxed_pointers%': 0, - # Experimental feature for collecting per-class zone memory stats. # Requires use_rtti = true 'v8_enable_precise_zone_stats%': 0, @@ -263,6 +260,10 @@ # (incomplete and experimental). 'v8_enable_cet_shadow_stack%': 0, + # Compile V8 using zlib as dependency. + # Sets -DV8_USE_ZLIB + 'v8_use_zlib%': 1, + # Variables from v8.gni # Enable ECMAScript Internationalization API. Enabling this feature will @@ -323,13 +324,7 @@ 'defines': ['V8_COMPRESS_ZONES',], }], ['v8_enable_sandbox==1', { - 'defines': ['V8_SANDBOX',], - }], - ['v8_enable_sandboxed_pointers==1', { - 'defines': ['V8_SANDBOXED_POINTERS',], - }], - ['v8_enable_sandboxed_external_pointers==1', { - 'defines': ['V8_SANDBOXED_EXTERNAL_POINTERS',], + 'defines': ['V8_ENABLE_SANDBOX',], }], ['v8_enable_object_print==1', { 'defines': ['OBJECT_PRINT',], @@ -427,6 +422,9 @@ ['v8_enable_cet_shadow_stack==1', { 'defines': ['V8_ENABLE_CET_SHADOW_STACK',], }], + ['v8_use_zlib==1', { + 'defines': ['V8_USE_ZLIB',], + }], ['v8_enable_precise_zone_stats==1', { 'defines': ['V8_ENABLE_PRECISE_ZONE_STATS',], }], @@ -439,6 +437,9 @@ ['v8_enable_system_instrumentation==1', { 'defines': ['V8_ENABLE_SYSTEM_INSTRUMENTATION',], }], + ['v8_enable_etw_stack_walking==1', { + 'defines': ['V8_ENABLE_ETW_STACK_WALKING',], + }], ['v8_enable_webassembly==1', { 'defines': ['V8_ENABLE_WEBASSEMBLY',], }], diff --git a/tools/v8_gypfiles/inspector.gypi b/tools/v8_gypfiles/inspector.gypi index bf792b8a852690..fbf6741ea159bd 100644 --- a/tools/v8_gypfiles/inspector.gypi +++ b/tools/v8_gypfiles/inspector.gypi @@ -6,8 +6,6 @@ 'variables': { 'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol', 'inspector_protocol_files': [ - '<(inspector_protocol_path)/lib/base_string_adapter_cc.template', - '<(inspector_protocol_path)/lib/base_string_adapter_h.template', '<(inspector_protocol_path)/lib/Forward_h.template', '<(inspector_protocol_path)/lib/Object_cpp.template', '<(inspector_protocol_path)/lib/Object_h.template', diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi index 8ade60b4e3ee0d..7b10d0d47c0a37 100644 --- a/tools/v8_gypfiles/toolchain.gypi +++ b/tools/v8_gypfiles/toolchain.gypi @@ -347,8 +347,7 @@ 'V8_TARGET_ARCH_IA32', ], }], # v8_target_arch=="ia32" - ['v8_target_arch=="mips" or v8_target_arch=="mipsel" \ - or v8_target_arch=="mips64" or v8_target_arch=="mips64el"', { + ['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', { 'target_conditions': [ ['_toolset=="target"', { 'conditions': [ @@ -390,451 +389,6 @@ }], #'_toolset=="host" ], }], - ['v8_target_arch=="mips"', { - 'defines': [ - 'V8_TARGET_ARCH_MIPS', - ], - 'conditions': [ - [ 'v8_can_use_fpu_instructions=="true"', { - 'defines': [ - 'CAN_USE_FPU_INSTRUCTIONS', - ], - }], - [ 'v8_use_mips_abi_hardfloat=="true"', { - 'defines': [ - '__mips_hard_float=1', - 'CAN_USE_FPU_INSTRUCTIONS', - ], - }, { - 'defines': [ - '__mips_soft_float=1' - ] - }], - ], - 'target_conditions': [ - ['_toolset=="target"', { - 'conditions': [ - ['v8_target_arch==target_arch', { - # Target built with a Mips CXX compiler. - 'cflags': [ - '-EB', - '-Wno-error=array-bounds', # Workaround https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56273 - ], - 'ldflags': ['-EB'], - 'conditions': [ - [ 'v8_use_mips_abi_hardfloat=="true"', { - 'cflags': ['-mhard-float'], - 'ldflags': ['-mhard-float'], - }, { - 'cflags': ['-msoft-float'], - 'ldflags': ['-msoft-float'], - }], - ['mips_arch_variant=="r6"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R6', - 'FPU_MODE_FP64', - ], - 'cflags!': ['-mfp32', '-mfpxx'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips32r6'], - }], - ], - 'cflags': ['-mips32r6'], - 'ldflags': ['-mips32r6'], - }], - ['mips_arch_variant=="r6" and mips_use_msa==1', { - 'defines': [ '_MIPS_MSA' ], - }], - ['mips_arch_variant=="r2"', { - 'conditions': [ - [ 'mips_fpu_mode=="fp64"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP64', - ], - 'cflags': ['-mfp64'], - }], - ['mips_fpu_mode=="fpxx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FPXX', - ], - 'cflags': ['-mfpxx'], - }], - ['mips_fpu_mode=="fp32"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP32', - ], - 'cflags': ['-mfp32'], - }], - [ 'clang==0', { - 'cflags': ['-Wa,-mips32r2'], - }], - ], - 'cflags': ['-mips32r2'], - 'ldflags': ['-mips32r2'], - }], - ['mips_arch_variant=="r1"', { - 'defines': [ - 'FPU_MODE_FP32', - ], - 'cflags!': ['-mfp64', '-mfpxx'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips32'], - }], - ], - 'cflags': ['-mips32'], - 'ldflags': ['-mips32'], - }], - ['mips_arch_variant=="rx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32RX', - 'FPU_MODE_FPXX', - ], - 'cflags!': ['-mfp64', '-mfp32'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips32'], - }], - ], - 'cflags': ['-mips32', '-mfpxx'], - 'ldflags': ['-mips32'], - }], - ], - }, { - # 'v8_target_arch!=target_arch' - # Target not built with an MIPS CXX compiler (simulator build). - 'conditions': [ - ['mips_arch_variant=="r6"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R6', - 'FPU_MODE_FP64', - ], - }], - ['mips_arch_variant=="r6" and mips_use_msa==1', { - 'defines': [ '_MIPS_MSA' ], - }], - ['mips_arch_variant=="r2"', { - 'conditions': [ - [ 'mips_fpu_mode=="fp64"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP64', - ], - }], - ['mips_fpu_mode=="fpxx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FPXX', - ], - }], - ['mips_fpu_mode=="fp32"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP32', - ], - }], - ], - }], - ['mips_arch_variant=="r1"', { - 'defines': [ - 'FPU_MODE_FP32', - ], - }], - ['mips_arch_variant=="rx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32RX', - 'FPU_MODE_FPXX', - ], - }], - ], - }], - ], - }], #_toolset=="target" - ['_toolset=="host"', { - 'conditions': [ - ['mips_arch_variant=="rx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32RX', - 'FPU_MODE_FPXX', - ], - }], - ['mips_arch_variant=="r6"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R6', - 'FPU_MODE_FP64', - ], - }], - ['mips_arch_variant=="r6" and mips_use_msa==1', { - 'defines': [ '_MIPS_MSA' ], - }], - ['mips_arch_variant=="r2"', { - 'conditions': [ - ['mips_fpu_mode=="fp64"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP64', - ], - }], - ['mips_fpu_mode=="fpxx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FPXX', - ], - }], - ['mips_fpu_mode=="fp32"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP32' - ], - }], - ], - }], - ['mips_arch_variant=="r1"', { - 'defines': ['FPU_MODE_FP32',], - }], - ] - }], #_toolset=="host" - ], - }], # v8_target_arch=="mips" - ['v8_target_arch=="mipsel"', { - 'defines': [ - 'V8_TARGET_ARCH_MIPS', - ], - 'conditions': [ - [ 'v8_can_use_fpu_instructions=="true"', { - 'defines': [ - 'CAN_USE_FPU_INSTRUCTIONS', - ], - }], - [ 'v8_use_mips_abi_hardfloat=="true"', { - 'defines': [ - '__mips_hard_float=1', - 'CAN_USE_FPU_INSTRUCTIONS', - ], - }, { - 'defines': [ - '__mips_soft_float=1' - ], - }], - ], - 'target_conditions': [ - ['_toolset=="target"', { - 'conditions': [ - ['v8_target_arch==target_arch', { - # Target built with a Mips CXX compiler. - 'cflags': [ - '-EL', - '-Wno-error=array-bounds', # Workaround https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56273 - ], - 'ldflags': ['-EL'], - 'conditions': [ - [ 'v8_use_mips_abi_hardfloat=="true"', { - 'cflags': ['-mhard-float'], - 'ldflags': ['-mhard-float'], - }, { - 'cflags': ['-msoft-float'], - 'ldflags': ['-msoft-float'], - }], - ['mips_arch_variant=="r6"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R6', - 'FPU_MODE_FP64', - ], - 'cflags!': ['-mfp32', '-mfpxx'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips32r6'], - }], - ], - 'cflags': ['-mips32r6'], - 'ldflags': ['-mips32r6'], - }], - ['mips_arch_variant=="r6" and mips_use_msa==1', { - 'defines': [ '_MIPS_MSA' ], - }], - ['mips_arch_variant=="r2"', { - 'conditions': [ - [ 'mips_fpu_mode=="fp64"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP64', - ], - 'cflags': ['-mfp64'], - }], - ['mips_fpu_mode=="fpxx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FPXX', - ], - 'cflags': ['-mfpxx'], - }], - ['mips_fpu_mode=="fp32"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP32', - ], - 'cflags': ['-mfp32'], - }], - [ 'clang==0', { - 'cflags': ['-Wa,-mips32r2'], - }], - ], - 'cflags': ['-mips32r2'], - 'ldflags': ['-mips32r2'], - }], - ['mips_arch_variant=="r1"', { - 'defines': [ - 'FPU_MODE_FP32', - ], - 'cflags!': ['-mfp64', '-mfpxx'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips32'], - }], - ], - 'cflags': ['-mips32'], - 'ldflags': ['-mips32'], - }], - ['mips_arch_variant=="rx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32RX', - 'FPU_MODE_FPXX', - ], - 'cflags!': ['-mfp64', '-mfp32'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips32'], - }], - ], - 'cflags': ['-mips32', '-mfpxx'], - 'ldflags': ['-mips32'], - }], - ['mips_arch_variant=="loongson"', { - 'defines': [ - '_MIPS_ARCH_LOONGSON', - 'FPU_MODE_FP32', - ], - 'cflags!': ['-mfp64', '-mfpxx'], - 'conditions': [ - [ 'clang==0', { - 'cflags': ['-Wa,-mips3'], - }], - ], - 'cflags': ['-mips3', '-mfp32'], - }], - ], - }, { - # 'v8_target_arch!=target_arch' - # Target not built with an MIPS CXX compiler (simulator build). - 'conditions': [ - ['mips_arch_variant=="r6"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R6', - 'FPU_MODE_FP64', - ], - }], - ['mips_arch_variant=="r6" and mips_use_msa==1', { - 'defines': [ '_MIPS_MSA' ], - }], - ['mips_arch_variant=="r2"', { - 'conditions': [ - [ 'mips_fpu_mode=="fp64"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP64', - ], - }], - ['mips_fpu_mode=="fpxx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FPXX', - ], - }], - ['mips_fpu_mode=="fp32"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP32', - ], - }], - ], - }], - ['mips_arch_variant=="r1"', { - 'defines': [ - 'FPU_MODE_FP32', - ], - }], - ['mips_arch_variant=="rx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32RX', - 'FPU_MODE_FPXX', - ], - }], - ['mips_arch_variant=="loongson"', { - 'defines': [ - '_MIPS_ARCH_LOONGSON', - 'FPU_MODE_FP32', - ], - }], - ], - }], - ], - }], #_toolset=="target - ['_toolset=="host"', { - 'conditions': [ - ['mips_arch_variant=="rx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32RX', - 'FPU_MODE_FPXX', - ], - }], - ['mips_arch_variant=="r6"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R6', - 'FPU_MODE_FP64', - ], - }], - ['mips_arch_variant=="r6" and mips_use_msa==1', { - 'defines': [ '_MIPS_MSA' ], - }], - ['mips_arch_variant=="r2"', { - 'conditions': [ - ['mips_fpu_mode=="fp64"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP64', - ], - }], - ['mips_fpu_mode=="fpxx"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FPXX', - ], - }], - ['mips_fpu_mode=="fp32"', { - 'defines': [ - '_MIPS_ARCH_MIPS32R2', - 'FPU_MODE_FP32' - ], - }], - ], - }], - ['mips_arch_variant=="r1"', { - 'defines': ['FPU_MODE_FP32',], - }], - ['mips_arch_variant=="loongson"', { - 'defines': [ - '_MIPS_ARCH_LOONGSON', - 'FPU_MODE_FP32', - ], - }], - ] - }], - ], - }], # v8_target_arch=="mipsel" ['v8_target_arch=="mips64el" or v8_target_arch=="mips64"', { 'defines': [ 'V8_TARGET_ARCH_MIPS64', @@ -1029,7 +583,6 @@ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ - v8_target_arch=="mips" or v8_target_arch=="mipsel" or \ v8_target_arch=="ppc")', { 'target_conditions': [ ['_toolset=="host"', { diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 42e26cd9987cc5..6fc63aa88fb6e6 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -21,7 +21,10 @@ 'torque_outputs_inl_inc': ['