Changeset 162266 in webkit

Timestamp:

Jan 18, 2014 11:41:58 AM (10 years ago)

Author:

berto@igalia.com

Message:

JavaScriptCore uses PLATFORM(MAC) when it means OS(DARWIN)
​https://bugs.webkit.org/show_bug.cgi?id=99683

Reviewed by Anders Carlsson.

• jit/ThunkGenerators.cpp:
• tools/CodeProfile.cpp:

(JSC::symbolName):
(JSC::CodeProfile::sample):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ThunkGenerators.cpp (modified) (2 diffs)
• tools/CodeProfile.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-18  Alberto Garcia  <berto@igalia.com>
+
+        JavaScriptCore uses PLATFORM(MAC) when it means OS(DARWIN)
+        https://bugs.webkit.org/show_bug.cgi?id=99683
+
+        Reviewed by Anders Carlsson.
+
+        * jit/ThunkGenerators.cpp:
+        * tools/CodeProfile.cpp:
+        (JSC::symbolName):
+        (JSC::CodeProfile::sample):
+
 2014-01-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp

@@ -604 +604 @@
 }
 
-#if CPU(X86_64) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
+#if CPU(X86_64) && COMPILER(GCC) && (OS(DARWIN) || OS(LINUX))
 
 #define defineUnaryDoubleOpWrapper(function) \
@@ -620 +620 @@
     static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
 
-#elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
+#elif CPU(X86) && COMPILER(GCC) && (OS(DARWIN) || OS(LINUX))
 #define defineUnaryDoubleOpWrapper(function) \
     asm( \

trunk/Source/JavaScriptCore/tools/CodeProfile.cpp

@@ -34 +34 @@
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
 #include <cxxabi.h>
 #include <dlfcn.h>
@@ -57 +57 @@
 static const char* symbolName(void* address)
 {
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     Dl_info info;
     if (!dladdr(address, &info) || !info.dli_sname)
@@ -124 +124 @@
             return;
 
-#if PLATFORM(MAC) && CPU(X86_64)
+#if OS(DARWIN) && CPU(X86_64)
         // Walk up the stack.
         pc = framePointer[1];