Changeset 222495 in webkit for trunk/Source/JavaScriptCore/runtime/MachineContext.h

Timestamp:

Sep 26, 2017, 12:07:45 AM (8 years ago)

Author:

[email protected]

Message:

Support building JavaScriptCore with the Bionic C library
​https://bugs.webkit.org/show_bug.cgi?id=177427

Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

When compiling with the Bionic C library, the MachineContext.h header
should enable the same code paths that are enabled for the GNU C library.

The Bionic C library defines the BIONIC macro, but unlike other C
libraries that mimic the GNU one, it doesn't define GLIBC. So the
BIONIC macro checks have to match the GLIBC ones.

• runtime/MachineContext.h:

(JSC::MachineContext::stackPointer):
(JSC::MachineContext::framePointer):
(JSC::MachineContext::instructionPointer):
(JSC::MachineContext::argumentPointer<1>):
(JSC::MachineContext::llintInstructionPointer):

Source/WTF:

• wtf/Platform.h: Define HAVE_MACHINE_CONTEXT when BIONIC

is defined, i.e. when building with the Bionic C library.

File:

• trunk/Source/JavaScriptCore/runtime/MachineContext.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/MachineContext.h

@@ -147 +147 @@
 #endif
 
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(__BIONIC__)
 
 #if CPU(X86)
@@ -252 +252 @@
 #endif
 
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(__BIONIC__)
 
 // The following sequence depends on glibc's sys/ucontext.h.
@@ -355 +355 @@
 #endif
 
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(__BIONIC__)
 
 // The following sequence depends on glibc's sys/ucontext.h.
@@ -467 +467 @@
 #endif
 
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(__BIONIC__)
 
 // The following sequence depends on glibc's sys/ucontext.h.
@@ -584 +584 @@
 #endif
 
-#elif defined(__GLIBC__)
+#elif defined(__GLIBC__) || defined(__BIONIC__)
 
 // The following sequence depends on glibc's sys/ucontext.h.