Changeset 194518 in webkit

Timestamp:

Jan 3, 2016 12:26:04 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

WebKit fails to build with musl libc library
​https://bugs.webkit.org/show_bug.cgi?id=152625

Patch by Khem Raj <​raj.khem@gmail.com> on 2016-01-03
Source/JavaScriptCore:

Reviewed by Daniel Bates.

Qualify isnan() calls with std namespace.

• runtime/Options.cpp:

(Option::operator==): Add std namespace qualifier.

Source/WebCore:

Reviewed by Daniel Bates and Alexey Proskuryakov.

malloc_trim is glibc specific API so guard it with GLIBC.

• platform/linux/MemoryPressureHandlerLinux.cpp:

(MemoryPressureHandler::platformReleaseMemory): Guard malloc_trim()
call with GLIBC_.

Source/WTF:

Reviewed by Daniel Bates.

Disable ctype.h check for musl C library on Linux.
Enable backtrace on Linux when using glibc.
We don't have backtrace() implemented on non-glibc system
C libraries on Linux e.g. musl.

• wtf/DisallowCType.h: Check for GLIBC.
• wtf/Assertions.cpp:

(WTFGetBacktrace): Check if libc is glibc.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/Options.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Assertions.cpp (modified) (2 diffs)
• WTF/wtf/DisallowCType.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/linux/MemoryPressureHandlerLinux.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-03  Khem Raj  <raj.khem@gmail.com>
+
+        WebKit fails to build with musl libc library
+        https://bugs.webkit.org/show_bug.cgi?id=152625
+
+        Reviewed by Daniel Bates.
+
+        Qualify isnan() calls with std namespace.
+
+        * runtime/Options.cpp:
+        (Option::operator==): Add std namespace qualifier.
+
 2016-01-03  Andreas Kling  <akling@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -654 +654 @@
         return m_entry.unsignedVal == other.m_entry.unsignedVal;
     case Options::Type::doubleType:
-        return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
+        return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
     case Options::Type::int32Type:
         return m_entry.int32Val == other.m_entry.int32Val;

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-01-03  Khem Raj  <raj.khem@gmail.com>
+
+        WebKit fails to build with musl libc library
+        https://bugs.webkit.org/show_bug.cgi?id=152625
+
+        Reviewed by Daniel Bates.
+
+        Disable ctype.h check for musl C library on Linux.
+        Enable backtrace on Linux when using glibc.
+        We don't have backtrace() implemented on non-glibc system
+        C libraries on Linux e.g. musl.
+
+        * wtf/DisallowCType.h: Check for __GLIBC__.
+        * wtf/Assertions.cpp:
+        (WTFGetBacktrace): Check if libc is glibc.
+
 2016-01-03  Andreas Kling  <akling@apple.com>
 

trunk/Source/WTF/wtf/Assertions.cpp

@@ -69 +69 @@
 #endif
 
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
 #include <cxxabi.h>
 #include <dlfcn.h>
@@ -226 +226 @@
 void WTFGetBacktrace(void** stack, int* size)
 {
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
     *size = backtrace(stack, *size);
 #elif OS(WINDOWS)

trunk/Source/WTF/wtf/DisallowCType.h

@@ -41 +41 @@
 // or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
 // isacii(). 
-#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
+#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__)
 
 #include <ctype.h>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-03  Khem Raj  <raj.khem@gmail.com>
+
+        WebKit fails to build with musl libc library
+        https://bugs.webkit.org/show_bug.cgi?id=152625
+
+        Reviewed by Daniel Bates and Alexey Proskuryakov.
+
+        malloc_trim is glibc specific API so guard it with __GLIBC__.
+
+        * platform/linux/MemoryPressureHandlerLinux.cpp:
+        (MemoryPressureHandler::platformReleaseMemory): Guard malloc_trim()
+        call with __GLIBC_.
+
 2016-01-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp

@@ -202 +202 @@
 void MemoryPressureHandler::platformReleaseMemory(Critical)
 {
+#ifdef __GLIBC__
     ReliefLogger log("Run malloc_trim");
     malloc_trim(0);
+#endif
 }