diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/JavaScriptCore/GNUmakefile.am | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/JavaScriptCore/GNUmakefile.am')
| -rw-r--r-- | Source/JavaScriptCore/GNUmakefile.am | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/GNUmakefile.am b/Source/JavaScriptCore/GNUmakefile.am index 93f10ee..4c8d204 100644 --- a/Source/JavaScriptCore/GNUmakefile.am +++ b/Source/JavaScriptCore/GNUmakefile.am @@ -78,12 +78,15 @@ javascriptcore_sources += \ Source/JavaScriptCore/assembler/AbstractMacroAssembler.h \ Source/JavaScriptCore/assembler/ARMAssembler.cpp \ Source/JavaScriptCore/assembler/ARMAssembler.h \ + Source/JavaScriptCore/assembler/ARMv7Assembler.cpp \ + Source/JavaScriptCore/assembler/ARMv7Assembler.h \ Source/JavaScriptCore/assembler/AssemblerBuffer.h \ Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h \ Source/JavaScriptCore/assembler/CodeLocation.h \ Source/JavaScriptCore/assembler/LinkBuffer.h \ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp \ Source/JavaScriptCore/assembler/MacroAssemblerARM.h \ + Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h \ Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h \ Source/JavaScriptCore/assembler/MacroAssembler.h \ Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h \ @@ -236,8 +239,10 @@ javascriptcore_sources += \ Source/JavaScriptCore/runtime/CallData.cpp \ Source/JavaScriptCore/runtime/CallData.h \ Source/JavaScriptCore/runtime/ClassInfo.h \ - Source/JavaScriptCore/runtime/Collector.cpp \ - Source/JavaScriptCore/runtime/Collector.h \ + Source/JavaScriptCore/runtime/MarkedSpace.cpp \ + Source/JavaScriptCore/runtime/MarkedSpace.h \ + Source/JavaScriptCore/runtime/Heap.cpp \ + Source/JavaScriptCore/runtime/Heap.h \ Source/JavaScriptCore/runtime/CollectorHeapIterator.h \ Source/JavaScriptCore/runtime/CommonIdentifiers.cpp \ Source/JavaScriptCore/runtime/CommonIdentifiers.h \ @@ -336,6 +341,8 @@ javascriptcore_sources += \ Source/JavaScriptCore/runtime/LiteralParser.h \ Source/JavaScriptCore/runtime/Lookup.cpp \ Source/JavaScriptCore/runtime/Lookup.h \ + Source/JavaScriptCore/runtime/MachineStackMarker.cpp \ + Source/JavaScriptCore/runtime/MachineStackMarker.h \ Source/JavaScriptCore/runtime/MarkStack.cpp \ Source/JavaScriptCore/runtime/MarkStack.h \ Source/JavaScriptCore/runtime/MathObject.cpp \ @@ -550,13 +557,16 @@ javascriptcore_sources += \ Source/JavaScriptCore/wtf/VMTags.h \ Source/JavaScriptCore/wtf/WTFThreadData.cpp \ Source/JavaScriptCore/wtf/WTFThreadData.h \ - Source/JavaScriptCore/yarr/RegexInterpreter.cpp \ - Source/JavaScriptCore/yarr/RegexInterpreter.h \ - Source/JavaScriptCore/yarr/RegexJIT.cpp \ - Source/JavaScriptCore/yarr/RegexJIT.h \ - Source/JavaScriptCore/yarr/RegexParser.h \ - Source/JavaScriptCore/yarr/RegexPattern.cpp \ - Source/JavaScriptCore/yarr/RegexPattern.h + Source/JavaScriptCore/yarr/Yarr.h \ + Source/JavaScriptCore/yarr/YarrInterpreter.cpp \ + Source/JavaScriptCore/yarr/YarrInterpreter.h \ + Source/JavaScriptCore/yarr/YarrJIT.cpp \ + Source/JavaScriptCore/yarr/YarrJIT.h \ + Source/JavaScriptCore/yarr/YarrParser.h \ + Source/JavaScriptCore/yarr/YarrPattern.cpp \ + Source/JavaScriptCore/yarr/YarrPattern.h \ + Source/JavaScriptCore/yarr/YarrSyntaxChecker.cpp \ + Source/JavaScriptCore/yarr/YarrSyntaxChecker.h if TARGET_WIN32 javascriptcore_sources += \ |