22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
diff -up chromium-75.0.3770.80/third_party/angle/src/common/debug.h.gcc-assume chromium-75.0.3770.80/third_party/angle/src/common/debug.h
|
|
--- chromium-75.0.3770.80/third_party/angle/src/common/debug.h.gcc-assume 2019-06-06 17:38:01.876631704 -0400
|
|
+++ chromium-75.0.3770.80/third_party/angle/src/common/debug.h 2019-06-07 09:30:06.205446547 -0400
|
|
@@ -248,7 +248,7 @@ std::ostream &FmtHex(std::ostream &os, T
|
|
# define EVENT(message, ...) (void(0))
|
|
#endif
|
|
|
|
-#if defined(COMPILER_GCC) || defined(__clang__)
|
|
+#if defined(__GNUC__)
|
|
# define ANGLE_CRASH() __builtin_trap()
|
|
#else
|
|
# define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0)
|
|
@@ -336,7 +336,7 @@ std::ostream &FmtHex(std::ostream &os, T
|
|
# define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
|
|
_Pragma("clang diagnostic push") _Pragma("clang diagnostic error \"-Wpadded\"")
|
|
# define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("clang diagnostic pop")
|
|
-#elif defined(COMPILER_GCC)
|
|
+#elif defined(__GNUC__)
|
|
# define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
|
|
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error \"-Wpadded\"")
|
|
# define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("GCC diagnostic pop")
|