Changeset 56062 in webkit

Timestamp:

Mar 16, 2010 8:39:02 AM (14 years ago)

Author:

Simon Hausmann

Message:

Roll out r55889, as it breaks the Qt port on Leopard

2010-03-11 Kent Hansen <​kent.hansen@nokia.com>

Reviewed by Simon Hausmann.

Mac OS X: Use deployment target to determine whether memory tagging should be enabled
​https://bugs.webkit.org/show_bug.cgi?id=34888

Use TARGETING_TIGER rather than BUILDING_ON_TIGER to determine the tags.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/VMTags.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ -138 +138 @@
 
         * yarr/RegexInterpreter.cpp:
-
-2010-03-11  Kent Hansen  <kent.hansen@nokia.com>
-
-        Reviewed by Simon Hausmann.
-
-        Mac OS X: Use deployment target to determine whether memory tagging should be enabled
-        https://bugs.webkit.org/show_bug.cgi?id=34888
-
-        Use TARGETING_TIGER rather than BUILDING_ON_TIGER to determine the tags.
-
-        * wtf/VMTags.h:
 
 2010-03-11  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>

trunk/JavaScriptCore/wtf/VMTags.h

@@ -29 +29 @@
 // On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
 // in order to aid tools that inspect system memory use. 
-#if OS(DARWIN) && !defined(TARGETING_TIGER)
+#if OS(DARWIN) && !defined(BUILDING_ON_TIGER)
 
 #include <mach/vm_statistics.h>
@@ -55 +55 @@
 #endif // defined(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
 
-#else // OS(DARWIN) && !defined(TARGETING_TIGER)
+#else // OS(DARWIN) && !defined(BUILDING_ON_TIGER)
 
 #define VM_TAG_FOR_TCMALLOC_MEMORY -1
@@ -63 +63 @@
 #define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY -1
 
-#endif // OS(DARWIN) && !defined(TARGETING_TIGER)
+#endif // OS(DARWIN) && !defined(BUILDING_ON_TIGER)
 
 #endif // VMTags_h