Title: [197069] releases/WebKitGTK/webkit-2.12/Source
- Revision
- 197069
- Author
- carlo...@webkit.org
- Date
- 2016-02-25 01:15:42 -0800 (Thu, 25 Feb 2016)
Log Message
Merge r196871 - Use of inlined asm statements causes problems for -std=c99 builds.
https://bugs.webkit.org/show_bug.cgi?id=154507
Reviewed by Dan Bernstein.
Source/bmalloc:
* bmalloc/BAssert.h:
Source/WTF:
WTF's Assertions.h may inadvertantly get included by other projects that are built
with -std=c99. The use of the inlined asm statements with the keyword "asm" is
not recognized when the -std compiler flag is used.
https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html says "When writing code that
can be compiled with -ansi and the various -std options, use __asm__ instead of
asm (see Alternate Keywords)."
So, to be a good citizen, we can change the use of "asm" in CRASH() to "__asm__"
so that we don't break the build of such other projects.
* wtf/Assertions.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog (197068 => 197069)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-02-25 09:15:29 UTC (rev 197068)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-02-25 09:15:42 UTC (rev 197069)
@@ -1,3 +1,23 @@
+2016-02-20 Mark Lam <mark....@apple.com>
+
+ Use of inlined asm statements causes problems for -std=c99 builds.
+ https://bugs.webkit.org/show_bug.cgi?id=154507
+
+ Reviewed by Dan Bernstein.
+
+ WTF's Assertions.h may inadvertantly get included by other projects that are built
+ with -std=c99. The use of the inlined asm statements with the keyword "asm" is
+ not recognized when the -std compiler flag is used.
+
+ https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html says "When writing code that
+ can be compiled with -ansi and the various -std options, use __asm__ instead of
+ asm (see Alternate Keywords)."
+
+ So, to be a good citizen, we can change the use of "asm" in CRASH() to "__asm__"
+ so that we don't break the build of such other projects.
+
+ * wtf/Assertions.h:
+
2016-02-18 Brent Fulgham <bfulg...@apple.com>
Extend HashCountedSet with a method to efficiently set the count of an entry
Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Assertions.h (197068 => 197069)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Assertions.h 2016-02-25 09:15:29 UTC (rev 197068)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Assertions.h 2016-02-25 09:15:42 UTC (rev 197069)
@@ -155,11 +155,11 @@
#if defined(NDEBUG) && OS(DARWIN)
#if CPU(X86_64) || CPU(X86)
-#define WTFBreakpointTrap() asm volatile ("int3")
+#define WTFBreakpointTrap() __asm__ volatile ("int3")
#elif CPU(ARM_THUMB2)
-#define WTFBreakpointTrap() asm volatile ("bkpt #0")
+#define WTFBreakpointTrap() __asm__ volatile ("bkpt #0")
#elif CPU(ARM64)
-#define WTFBreakpointTrap() asm volatile ("brk #0")
+#define WTFBreakpointTrap() __asm__ volatile ("brk #0")
#else
#error "Unsupported CPU".
#endif
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog (197068 => 197069)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-02-25 09:15:29 UTC (rev 197068)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-02-25 09:15:42 UTC (rev 197069)
@@ -1,3 +1,12 @@
+2016-02-20 Mark Lam <mark....@apple.com>
+
+ Use of inlined asm statements causes problems for -std=c99 builds.
+ https://bugs.webkit.org/show_bug.cgi?id=154507
+
+ Reviewed by Dan Bernstein.
+
+ * bmalloc/BAssert.h:
+
2016-02-19 Joonghun Park <jh718.p...@samsung.com>
Unreviewed. Fix debug build error since r196847
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/BAssert.h (197068 => 197069)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/BAssert.h 2016-02-25 09:15:29 UTC (rev 197068)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/BAssert.h 2016-02-25 09:15:42 UTC (rev 197069)
@@ -31,11 +31,11 @@
#if defined(NDEBUG) && BOS(DARWIN)
#if BCPU(X86_64) || BCPU(X86)
-#define BBreakpointTrap() asm volatile ("int3")
+#define BBreakpointTrap() __asm__ volatile ("int3")
#elif BCPU(ARM_THUMB2)
-#define BBreakpointTrap() asm volatile ("bkpt #0")
+#define BBreakpointTrap() __asm__ volatile ("bkpt #0")
#elif BCPU(ARM64)
-#define BBreakpointTrap() asm volatile ("brk #0")
+#define BBreakpointTrap() __asm__ volatile ("brk #0")
#else
#error "Unsupported CPU".
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
