Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: syzygy/agent/asan/asan.gyp

Issue 2316303008: Add probes for x64. (Closed)
Patch Set: Remove the trailing comma. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: syzygy/agent/asan/asan.gyp
diff --git a/syzygy/agent/asan/asan.gyp b/syzygy/agent/asan/asan.gyp
index 35e6454ba1f4ac5cf93709f0beeee874c673da8e..1468a07b3c341d57072d4491275e9c6869c4a410 100644
--- a/syzygy/agent/asan/asan.gyp
+++ b/syzygy/agent/asan/asan.gyp
@@ -116,13 +116,14 @@
'<(src)/syzygy/trace/client/client.gyp:rpc_client_lib',
'<(src)/syzygy/trace/common/common.gyp:trace_common_lib',
'<(src)/syzygy/trace/protocol/protocol.gyp:protocol_lib',
+ '<(src)/syzygy/trace/rpc/rpc.gyp:logger_rpc_lib',
'<(src)/third_party/crashpad/files/client/client.gyp:crashpad_client',
],
'conditions': [
# By default, target_arch is set to ia32 on Windows.
# To get a 64-bit build, one needs to explicitly set
# `target_arch` and `host_arch` to `x64`.
- ['target_arch=="ia32"', {
+ ['target_arch == "ia32"', {
'sources': [
'gen/memory_interceptors_impl.asm',
'gen/memory_redirectors.asm',
@@ -131,8 +132,12 @@
],
'dependencies': [
'<(src)/syzygy/kasko/kasko.gyp:kasko',
- '<(src)/syzygy/trace/rpc/rpc.gyp:logger_rpc_lib',
],
+ }, {
+ 'sources': [
+ 'memory_interceptors_impl_x64.cc',
+ 'memory_interceptors_impl_x64.h',
+ ]
}],
],
'export_dependent_settings': [
@@ -211,9 +216,40 @@
],
'conditions': [
['target_arch == "ia32"', {
- 'sources': [
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ # Disable support for large address spaces.
+ 'LargeAddressAware': 1,
+ },
+ },
+ }, {
+ 'sources!': [
+ # Static shadow doesn't work for large address spaces.
Sébastien Marchand 2016/09/13 21:11:33 Please remove the BL between each items, we rarely
+ 'static_shadow.cc',
+
+ # Kasko is to be removed.
'reporters/kasko_reporter_unittest.cc',
+
+ # Redirectors are not currently implemented for win64.
+ 'memory_interceptors_patcher_unittest.cc',
+
+ # Relies on full set of probes.
+ 'memory_interceptors_unittest.cc',
+
+ # Win64 binaries currently don't have the version info.
+ 'registry_cache_unittest.cc',
+ 'logger_unittest.cc',
+
+ # PE lib for win64 is sort of stub, so there's nothing to test there
Sébastien Marchand 2016/09/13 21:11:33 Missing period (I know that it means adding a new
+ 'iat_patcher_unittest.cc',
+
+ # IsHeapCorrupt fails (TODO: fix it).
Sébastien Marchand 2016/09/13 21:11:33 Usually our TODO go on a separate line. # Disable
+ 'heap_checker_unittest.cc',
+
+ # Uses 32bit assembler.
+ 'heap_managers/block_heap_manager_unittest.cc',
],
+ 'sources': ['dummy_shadow.cc']
}],
],
'dependencies': [
@@ -326,11 +362,7 @@
'agent_link_settings.gypi',
],
'sources': [
- # This file must have a .def extension in order for GYP to
- # automatically configure it as the ModuleDefinitionFile
- # (we usually suffix generated files with .gen).
'dummy_shadow.cc',
- 'gen/system_interceptors.def',
'syzyasan_rtl.cc',
'syzyasan_rtl.rc',
],
@@ -349,6 +381,18 @@
},
},
'conditions': [
+ ['target_arch == "ia32"', {
+ 'sources': [
+ # This file must have a .def extension in order for GYP to
+ # automatically configure it as the ModuleDefinitionFile
+ # (we usually suffix generated files with .gen).
+ 'gen/system_interceptors.def',
+ ]
+ }, {
+ 'sources': [
+ 'system_interceptors_x64.def'
+ ]
+ }],
['pgo_phase==1', {
'msvs_settings': {
'VCLinkerTool': {
« no previous file with comments | « no previous file | syzygy/agent/asan/memory_interceptors.h » ('j') | syzygy/agent/asan/memory_interceptors_impl_x64.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698