X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/8c470f2a28273197fbf0939a7bceb3d0d0a6df7d..c4ccbbf992e1587ae316f66af6a28006780688d8:/utils/macros.h

diff --git a/utils/macros.h b/utils/macros.h
index 70f535f..95d0ddb 100644
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -57,6 +57,8 @@
 	IGNORABLE extern char static_assert_failed[2*!!(cond) - 1]
 #endif
 
+#define COMMA ,
+
 /*----- String and character hacks ----------------------------------------*/
 
 #define CTYPE_HACK(func, ch) (func((unsigned char)(ch)))
@@ -108,6 +110,12 @@
 #  define EXECL_LIKE(ntrail) __attribute__((__sentinel__(ntrail)))
 #endif
 
+#if GCC_VERSION_P(2, 7) || CLANG_VERSION_P(0, 0)
+#  define LAUNDER(x)							\
+	({ __typeof__(x) _y; __asm__("" : "=g"(_y) : "0"(x)); _y; })
+#  define RELAX do __asm__ __volatile__("" ::: "memory"); while (0)
+#endif
+
 #if CLANG_VERSION_P(3, 3)
 
 #  define MLIB__PRAGMA_HACK(x) _Pragma(#x)
@@ -125,7 +133,9 @@
 #  define MUFFLE_WARNINGS_STMT(warns, body)				\
 	do { MLIB__MUFFLE_WARNINGS(warns, body) } while (0)
 
-#elif GCC_VERSION_P(4, 6)
+#endif
+
+#if GCC_VERSION_P(4, 6)
 
    /* --- Diagnostic suppression in GCC: a tale of woe --- *
     *
@@ -231,6 +241,14 @@
 #  define MUST_CHECK
 #endif
 
+#ifndef LAUNDER
+#  define LAUNDER
+#endif
+
+#ifndef RELAX
+#  define RELAX
+#endif
+
 #ifndef GCC_WARNING
 #  define GCC_WARNING(warn)
 #endif