summaryrefslogtreecommitdiffstats
path: root/chrome_elf
diff options
context:
space:
mode:
authorcaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 04:39:26 +0000
committercaitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 04:39:26 +0000
commitbf4b6320dee5d45271d14534cb68c0c479159dcd (patch)
treeaf7d462731f518af3dd78f12a5459dc12752fd38 /chrome_elf
parenteea716cc77aa7406526e2dcfa73da671e41b3f2d (diff)
downloadchromium_src-bf4b6320dee5d45271d14534cb68c0c479159dcd.zip
chromium_src-bf4b6320dee5d45271d14534cb68c0c479159dcd.tar.gz
chromium_src-bf4b6320dee5d45271d14534cb68c0c479159dcd.tar.bz2
Adjust base address of chrome dll and provide a base addess for chrome_elf
This should stop the address conflicts suspected of causing the perf regression. TEST= working set size returns to normal BUG=318691 Review URL: https://codereview.chromium.org/77673005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf')
-rw-r--r--chrome_elf/chrome_elf.def4
-rw-r--r--chrome_elf/chrome_elf.gyp9
2 files changed, 12 insertions, 1 deletions
diff --git a/chrome_elf/chrome_elf.def b/chrome_elf/chrome_elf.def
index 1703016..d3ca82f 100644
--- a/chrome_elf/chrome_elf.def
+++ b/chrome_elf/chrome_elf.def
@@ -1,3 +1,7 @@
+; Copyright 2013 The Chromium Authors. All rights reserved.
+; Use of this source code is governed by a BSD-style license that can be
+; found in the LICENSE file.
+
LIBRARY "chrome_elf.dll"
EXPORTS
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index c32f710..a8f15bd 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -21,6 +21,13 @@
'chrome_elf_main.cc',
'chrome_elf_main.h',
],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'BaseAddress': '0x01c20000',
+ # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency).
+ 'SubSystem': '2',
+ },
+ },
},
],
-} \ No newline at end of file
+}