Changeset 278302 in webkit

Timestamp:

Jun 1, 2021, 6:01:01 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE][GTK] Support building against uClibc
​https://bugs.webkit.org/show_bug.cgi?id=226244

Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

• assembler/MacroAssemblerARM64.cpp:

(getauxval): Provide a fallback implementation of getauxval() for
systems which do not provide <sys/auxv.h>, like those using uClibc
as their C library.

Source/WTF:

• wtf/PlatformRegisters.h: Use the <sys/ucontext.h> header instead of

<ucontext.h>, which is enough to gain access to the type definitions
for CPU registers and is available on every libc. On the other hand,
uClibc does not have <ucontext.h>, so this fixes the build in that
case.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/assembler/MacroAssemblerARM64.cpp (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformRegisters.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-06-01  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Support building against uClibc
+        https://bugs.webkit.org/show_bug.cgi?id=226244
+
+        Reviewed by Michael Catanzaro.
+
+        * assembler/MacroAssemblerARM64.cpp:
+        (getauxval): Provide a fallback implementation of getauxval() for
+        systems which do not provide <sys/auxv.h>, like those using uClibc
+        as their C library.
+
 2021-05-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.cpp

@@ -35 +35 @@
 #if OS(LINUX)
 #include <asm/hwcap.h>
+#if __has_include(<sys/auxv.h>)
 #include <sys/auxv.h>
+#else
+#include <linux/auxvec.h>
+// Provide an implementation for C libraries which do not ship one.
+static unsigned long getauxval(unsigned long type)
+{
+    char** env = environ;
+    while (*env++) { /* no-op */ }
+
+    for (auto* auxv = reinterpret_cast<unsigned long*>(env); *auxv != AT_NULL; auxv += 2) {
+        if (*auxv == type)
+            return auxv[1];
+    }
+
+    errno = ENOENT;
+    return 0;
+}
+#endif
 #endif
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-06-01  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Support building against uClibc
+        https://bugs.webkit.org/show_bug.cgi?id=226244
+
+        Reviewed by Michael Catanzaro.
+
+        * wtf/PlatformRegisters.h: Use the <sys/ucontext.h> header instead of
+        <ucontext.h>, which is enough to gain access to the type definitions
+        for CPU registers and is available on every libc. On the other hand,
+        uClibc does not have <ucontext.h>, so this fixes the build in that
+        case.
+
 2021-05-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/PlatformRegisters.h

@@ -36 +36 @@
 #include <windows.h>
 #else
-#include <ucontext.h>
+#include <sys/ucontext.h>
 #endif