From 19d304e8d17fb39efe795b51e1ee0f5564a0692a Mon Sep 17 00:00:00 2001
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 18 Jan 2014 19:41:58 +0000
Subject: 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):

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

Change-Id: Ia5b36b80ba095dbf0de4430137dc8133d0c06a8e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 Source/JavaScriptCore/jit/ThunkGenerators.cpp | 4 ++--
 Source/JavaScriptCore/tools/CodeProfile.cpp   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
index 9684df2d0..fde1347a0 100644
--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
@@ -508,7 +508,7 @@ double jsRound(double d)
 
 }
 
-#if CPU(X86_64) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
+#if CPU(X86_64) && COMPILER(GCC) && (OS(DARWIN) || OS(LINUX))
 
 #define defineUnaryDoubleOpWrapper(function) \
     asm( \
@@ -524,7 +524,7 @@ double jsRound(double d)
     } \
     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( \
         ".text\n" \
diff --git a/Source/JavaScriptCore/tools/CodeProfile.cpp b/Source/JavaScriptCore/tools/CodeProfile.cpp
index de86e52ef..3106eff89 100644
--- a/Source/JavaScriptCore/tools/CodeProfile.cpp
+++ b/Source/JavaScriptCore/tools/CodeProfile.cpp
@@ -33,7 +33,7 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC)
+#if OS(DARWIN)
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <execinfo.h>
@@ -56,7 +56,7 @@ const char* CodeProfile::s_codeTypeNames[CodeProfile::NumberOfCodeTypes] = {
 // Helper function, find the symbol name for a pc in JSC.
 static const char* symbolName(void* address)
 {
-#if PLATFORM(MAC)
+#if OS(DARWIN)
     Dl_info info;
     if (!dladdr(address, &info) || !info.dli_sname)
         return "<unknown>";
@@ -123,7 +123,7 @@ void CodeProfile::sample(void* pc, void** framePointer)
         if (type != EngineFrame)
             return;
 
-#if PLATFORM(MAC) && CPU(X86_64)
+#if OS(DARWIN) && CPU(X86_64)
         // Walk up the stack.
         pc = framePointer[1];
         framePointer = reinterpret_cast<void**>(*framePointer);
-- 
cgit v1.2.1