From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 20 Apr 2020 18:27:31 +0000 (-0400)
Subject: ust-compiler.h: Allocate compound literals on heap with gcc <= 4.8
X-Git-Tag: v2.13.0-rc1~511
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=e1904921db97b70d94e69f0ab3264c6f7fe62f32

ust-compiler.h: Allocate compound literals on heap with gcc <= 4.8

g++ 4.8 and prior do not support C99 compound literals. Therefore,
force allocating those on the heap with these C++ compilers.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
index 799bca42..c2896285 100644
--- a/include/lttng/ust-compiler.h
+++ b/include/lttng/ust-compiler.h
@@ -43,6 +43,17 @@
 #  define __lttng_ust_variable_attribute_no_sanitize_address
 #endif
 
+/*
+ * g++ 4.8 and prior do not support C99 compound literals. Therefore,
+ * force allocating those on the heap with these C++ compilers.
+ */
+#if defined (__cplusplus) && defined (__GNUC__) && \
+	(__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))
+# ifndef LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
+#  define LTTNG_ALLOCATE_COMPOUND_LITERAL_ON_HEAP
+# endif
+#endif
+
 /*
  * Compound literals with static storage are needed by LTTng.
  * Compound literals are part of the C99 and C11 standards, but not