Put ENABLE(ASSEMBLER) guards around use of ExecutableAllocator in global data

Correct Qt and Gtk project files

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@39087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6099d68..f0ade8c 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by NOBODY (Build fix).
 
 
         Reviewed by NOBODY (Build fix).
 

+        Put ENABLE(ASSEMBLER) guards around use of ExecutableAllocator in global data
+
+        Correct Qt and Gtk project files
+
+        * GNUmakefile.am:
+        * JavaScriptCore.pri:
+        * runtime/JSGlobalData.h:
+
+2008-12-07  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by NOBODY (Build fix).
+

         Add new files to other projects.
 
         * GNUmakefile.am:
         Add new files to other projects.
 
         * GNUmakefile.am:

diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index b22ea04..795557f 100644 (file)
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -78,7 +78,7 @@ javascriptcore_sources += \
        JavaScriptCore/jit/JITPropertyAccess.cpp \
        JavaScriptCore/jit/JITArithmetic.cpp \
        JavaScriptCore/jit/ExecutableAllocator.cpp \
        JavaScriptCore/jit/JITPropertyAccess.cpp \
        JavaScriptCore/jit/JITArithmetic.cpp \
        JavaScriptCore/jit/ExecutableAllocator.cpp \

-       JavaScriptCore/jit/ExecutableAllocatorMMAP.cpp \
+       JavaScriptCore/jit/ExecutableAllocatorPosix.cpp \

        JavaScriptCore/jit/JIT.h \
        JavaScriptCore/jit/JITInlineMethods.h \
        JavaScriptCore/bytecode/CodeBlock.cpp \
        JavaScriptCore/jit/JIT.h \
        JavaScriptCore/jit/JITInlineMethods.h \
        JavaScriptCore/bytecode/CodeBlock.cpp \

diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 7fcdca9..4bb5311 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -75,7 +75,7 @@ SOURCES += \
     jit/JITArithmetic.cpp \
     jit/JITPropertyAccess.cpp \
     jit/ExecutableAllocator.cpp \
     jit/JITArithmetic.cpp \
     jit/JITPropertyAccess.cpp \
     jit/ExecutableAllocator.cpp \

-    jit/ExecutableAllocatorMMAP.cpp \
+    jit/ExecutableAllocatorPosix.cpp \

     bytecompiler/BytecodeGenerator.cpp \
     runtime/ExceptionHelpers.cpp \
     runtime/JSPropertyNameIterator.cpp \
     bytecompiler/BytecodeGenerator.cpp \
     runtime/ExceptionHelpers.cpp \
     runtime/JSPropertyNameIterator.cpp \

diff --git a/JavaScriptCore/runtime/JSGlobalData.h b/JavaScriptCore/runtime/JSGlobalData.h
index 64ff2f2..14e3569 100644 (file)
--- a/JavaScriptCore/runtime/JSGlobalData.h
+++ b/JavaScriptCore/runtime/JSGlobalData.h
@@ -120,11 +120,14 @@ namespace JSC {
         HashSet<JSObject*> arrayVisitedElements;
 
         Heap heap;
         HashSet<JSObject*> arrayVisitedElements;
 
         Heap heap;

-
+#if ENABLE(ASSEMBLER)

         PassRefPtr<ExecutablePool> poolForSize(size_t n) { return m_executableAllocator.poolForSize(n); }
         PassRefPtr<ExecutablePool> poolForSize(size_t n) { return m_executableAllocator.poolForSize(n); }

+#endif

     private:
         JSGlobalData(bool isShared = false);
     private:
         JSGlobalData(bool isShared = false);

+#if ENABLE(ASSEMBLER)

         ExecutableAllocator m_executableAllocator;
         ExecutableAllocator m_executableAllocator;

+#endif

 
         static JSGlobalData*& sharedInstanceInternal();
     };
 
         static JSGlobalData*& sharedInstanceInternal();
     };