From 1d830a69689518a0561213f8d8c042d444e209fc Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 14 Apr 2020 08:37:26 -0400
Subject: [PATCH] wrapper: remove compiler wrapper

---
 lib/ringbuffer/backend_internal.h |  1 -
 lttng-tracer.h                    |  3 ++-
 wrapper/compiler.h                | 31 -------------------------------
 wrapper/trace-clock.h             |  1 -
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 wrapper/compiler.h

diff --git a/lib/ringbuffer/backend_internal.h b/lib/ringbuffer/backend_internal.h
index aec5298d..3a2ce26f 100644
--- a/lib/ringbuffer/backend_internal.h
+++ b/lib/ringbuffer/backend_internal.h
@@ -10,7 +10,6 @@
 #ifndef _LIB_RING_BUFFER_BACKEND_INTERNAL_H
 #define _LIB_RING_BUFFER_BACKEND_INTERNAL_H
 
-#include <wrapper/compiler.h>
 #include <include/ringbuffer/config.h>
 #include <include/ringbuffer/backend_types.h>
 #include <include/ringbuffer/frontend_types.h>
diff --git a/lttng-tracer.h b/lttng-tracer.h
index 5490d52c..1712d031 100644
--- a/lttng-tracer.h
+++ b/lttng-tracer.h
@@ -22,7 +22,6 @@
 #include <asm/local.h>
 
 #include <wrapper/trace-clock.h>
-#include <wrapper/compiler.h>
 #include <lttng-tracer-core.h>
 #include <lttng-events.h>
 
@@ -65,4 +64,6 @@
 #define LTTNG_RFLAG_EXTENDED		RING_BUFFER_RFLAG_END
 #define LTTNG_RFLAG_END			(LTTNG_RFLAG_EXTENDED << 1)
 
+#define __LTTNG_COMPOUND_LITERAL(type, ...)	(type[]) { __VA_ARGS__ }
+
 #endif /* _LTTNG_TRACER_H */
diff --git a/wrapper/compiler.h b/wrapper/compiler.h
deleted file mode 100644
index 16d41318..00000000
--- a/wrapper/compiler.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/compiler.h
- *
- * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_COMPILER_H
-#define _LTTNG_WRAPPER_COMPILER_H
-
-#include <linux/compiler.h>
-
-/*
- * Don't allow compiling with buggy compiler.
- */
-
-#ifdef GCC_VERSION
-
-/*
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
- */
-# ifdef __ARMEL__
-#  if GCC_VERSION >= 40800 && GCC_VERSION <= 40802
-#   error Your gcc version produces clobbered frame accesses
-#  endif
-# endif
-#endif
-
-#define __LTTNG_COMPOUND_LITERAL(type, ...)	(type[]) { __VA_ARGS__ }
-
-#endif /* _LTTNG_WRAPPER_COMPILER_H */
diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 3a4de825..5b44db2f 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -25,7 +25,6 @@
 #include <asm/local.h>
 #include <lttng-kernel-version.h>
 #include <lttng-clock.h>
-#include <wrapper/compiler.h>
 #include <wrapper/random.h>
 
 extern struct lttng_trace_clock *lttng_trace_clock;
-- 
2.34.1