Title: [135425] trunk/Source/WTF
- Revision
- 135425
- Author
- [email protected]
- Date
- 2012-11-21 12:24:18 -0800 (Wed, 21 Nov 2012)
Log Message
Source/WTF/wtf/Assertions.cpp: fix build on a uClibc system
https://bugs.webkit.org/show_bug.cgi?id=102946
Patch by Anthony G. Basile <[email protected]> on 2012-11-21
Reviewed by Tony Chang.
Webkit-Gtk fails to build on a uClibc system because
Assertions.cpp assumes that all Linux systems have execinfo.h
and provide backtrace(). This is not necessarily the case for
uClibc which can be configured without these. This patch
refines the check for OS(LINUX) to prevent this breakage.
Originally reported at https://bugs.gentoo.org/441674
* wtf/Assertions.cpp:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (135424 => 135425)
--- trunk/Source/WTF/ChangeLog 2012-11-21 20:13:39 UTC (rev 135424)
+++ trunk/Source/WTF/ChangeLog 2012-11-21 20:24:18 UTC (rev 135425)
@@ -1,3 +1,19 @@
+2012-11-21 Anthony G. Basile <[email protected]>
+
+ Source/WTF/wtf/Assertions.cpp: fix build on a uClibc system
+ https://bugs.webkit.org/show_bug.cgi?id=102946
+
+ Reviewed by Tony Chang.
+
+ Webkit-Gtk fails to build on a uClibc system because
+ Assertions.cpp assumes that all Linux systems have execinfo.h
+ and provide backtrace(). This is not necessarily the case for
+ uClibc which can be configured without these. This patch
+ refines the check for OS(LINUX) to prevent this breakage.
+ Originally reported at https://bugs.gentoo.org/441674
+
+ * wtf/Assertions.cpp:
+
2012-11-19 Filip Pizlo <[email protected]>
DFG should be able to cache closure calls
Modified: trunk/Source/WTF/wtf/Assertions.cpp (135424 => 135425)
--- trunk/Source/WTF/wtf/Assertions.cpp 2012-11-21 20:13:39 UTC (rev 135424)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2012-11-21 20:24:18 UTC (rev 135425)
@@ -58,7 +58,7 @@
#include <windows.h>
#endif
-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -242,7 +242,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
