Commit 440848ac authored by berto@igalia.com's avatar 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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162266 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ceb7f9ee
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>
Remove ENABLE_THREADED_HTML_PARSER defines everywhere
......
......@@ -603,7 +603,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( \
......@@ -619,7 +619,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" \
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment