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

Side by Side Diff: src/SConscript

Issue 6697023: Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
Patch Set: Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « samples/shell.cc ('k') | src/accessors.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2011 the V8 project authors. All rights reserved. 1 # Copyright 2011 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 arm/cpu-arm.cc 148 arm/cpu-arm.cc
149 arm/debug-arm.cc 149 arm/debug-arm.cc
150 arm/deoptimizer-arm.cc 150 arm/deoptimizer-arm.cc
151 arm/disasm-arm.cc 151 arm/disasm-arm.cc
152 arm/frames-arm.cc 152 arm/frames-arm.cc
153 arm/full-codegen-arm.cc 153 arm/full-codegen-arm.cc
154 arm/ic-arm.cc 154 arm/ic-arm.cc
155 arm/jump-target-arm.cc 155 arm/jump-target-arm.cc
156 arm/lithium-arm.cc 156 arm/lithium-arm.cc
157 arm/lithium-codegen-arm.cc 157 arm/lithium-codegen-arm.cc
158 arm/lithium-gap-resolver-arm.cc
158 arm/macro-assembler-arm.cc 159 arm/macro-assembler-arm.cc
159 arm/regexp-macro-assembler-arm.cc 160 arm/regexp-macro-assembler-arm.cc
160 arm/register-allocator-arm.cc 161 arm/register-allocator-arm.cc
161 arm/stub-cache-arm.cc 162 arm/stub-cache-arm.cc
162 arm/virtual-frame-arm.cc 163 arm/virtual-frame-arm.cc
163 arm/assembler-arm.cc 164 arm/assembler-arm.cc
164 """), 165 """),
165 'arch:mips': Split(""" 166 'arch:mips': Split("""
166 mips/assembler-mips.cc 167 mips/assembler-mips.cc
167 mips/builtins-mips.cc 168 mips/builtins-mips.cc
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 x64/virtual-frame-x64.cc 229 x64/virtual-frame-x64.cc
229 """), 230 """),
230 'simulator:arm': ['arm/simulator-arm.cc'], 231 'simulator:arm': ['arm/simulator-arm.cc'],
231 'simulator:mips': ['mips/simulator-mips.cc'], 232 'simulator:mips': ['mips/simulator-mips.cc'],
232 'os:freebsd': ['platform-freebsd.cc', 'platform-posix.cc'], 233 'os:freebsd': ['platform-freebsd.cc', 'platform-posix.cc'],
233 'os:openbsd': ['platform-openbsd.cc', 'platform-posix.cc'], 234 'os:openbsd': ['platform-openbsd.cc', 'platform-posix.cc'],
234 'os:linux': ['platform-linux.cc', 'platform-posix.cc'], 235 'os:linux': ['platform-linux.cc', 'platform-posix.cc'],
235 'os:android': ['platform-linux.cc', 'platform-posix.cc'], 236 'os:android': ['platform-linux.cc', 'platform-posix.cc'],
236 'os:macos': ['platform-macos.cc', 'platform-posix.cc'], 237 'os:macos': ['platform-macos.cc', 'platform-posix.cc'],
237 'os:solaris': ['platform-solaris.cc', 'platform-posix.cc'], 238 'os:solaris': ['platform-solaris.cc', 'platform-posix.cc'],
239 'os:cygwin': ['platform-cygwin.cc', 'platform-posix.cc'],
238 'os:nullos': ['platform-nullos.cc'], 240 'os:nullos': ['platform-nullos.cc'],
239 'os:win32': ['platform-win32.cc'], 241 'os:win32': ['platform-win32.cc'],
240 'mode:release': [], 242 'mode:release': [],
241 'mode:debug': [ 243 'mode:debug': [
242 'objects-debug.cc', 'prettyprinter.cc', 'regexp-macro-assembler-tracer.cc' 244 'objects-debug.cc', 'prettyprinter.cc', 'regexp-macro-assembler-tracer.cc'
243 ] 245 ]
244 } 246 }
245 247
246 248
247 D8_FILES = { 249 D8_FILES = {
(...skipping 11 matching lines...) Expand all
259 ], 261 ],
260 'os:freebsd': [ 262 'os:freebsd': [
261 'd8-posix.cc' 263 'd8-posix.cc'
262 ], 264 ],
263 'os:openbsd': [ 265 'os:openbsd': [
264 'd8-posix.cc' 266 'd8-posix.cc'
265 ], 267 ],
266 'os:solaris': [ 268 'os:solaris': [
267 'd8-posix.cc' 269 'd8-posix.cc'
268 ], 270 ],
271 'os:cygwin': [
272 'd8-posix.cc'
273 ],
269 'os:win32': [ 274 'os:win32': [
270 'd8-windows.cc' 275 'd8-windows.cc'
271 ], 276 ],
272 'os:nullos': [ 277 'os:nullos': [
273 'd8-windows.cc' # Empty implementation at the moment. 278 'd8-windows.cc' # Empty implementation at the moment.
274 ], 279 ],
275 'console:readline': [ 280 'console:readline': [
276 'd8-readline.cc' 281 'd8-readline.cc'
277 ] 282 ]
278 } 283 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 snapshot_cc = 'snapshot.cc' 349 snapshot_cc = 'snapshot.cc'
345 snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.']) 350 snapshot_obj = context.ConfigureObject(env, snapshot_cc, CPPPATH=['.'])
346 else: 351 else:
347 snapshot_obj = empty_snapshot_obj 352 snapshot_obj = empty_snapshot_obj
348 library_objs = [non_snapshot_files, libraries_obj, snapshot_obj] 353 library_objs = [non_snapshot_files, libraries_obj, snapshot_obj]
349 return (library_objs, d8_objs, [mksnapshot]) 354 return (library_objs, d8_objs, [mksnapshot])
350 355
351 356
352 (library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles() 357 (library_objs, d8_objs, mksnapshot) = ConfigureObjectFiles()
353 Return('library_objs d8_objs mksnapshot') 358 Return('library_objs d8_objs mksnapshot')
OLDNEW
« no previous file with comments | « samples/shell.cc ('k') | src/accessors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698