From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 14 Dec 2021 19:46:45 +0000 (-0500)
Subject: fix: isystem: delete global -isystem compile option (v5.16)
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5987e66c2cba50425d775ce587dd763244373e16;p=lttng-modules.git

fix: isystem: delete global -isystem compile option (v5.16)

See upstream commit :

  commit 04e85bbf71c9072dcf0ad9a7150495d72461105c
  Author: Alexey Dobriyan <adobriyan@gmail.com>
  Date:   Mon Aug 2 23:43:15 2021 +0300

    isystem: delete global -isystem compile option

    Further isolate kernel from userspace, prevent accidental inclusion of
    undesireable headers, mainly float.h and stdatomic.h.

    nds32 keeps -isystem globally due to intrinsics used in entrenched header.

    -isystem is selectively reenabled for some files, again, for intrinsics.

Change-Id: I5bea29687dc2bc15e96eeb13008aefe1acc97b8a
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/msgpack.h b/include/lttng/msgpack.h
index a5c03ba6..0c63f1ba 100644
--- a/include/lttng/msgpack.h
+++ b/include/lttng/msgpack.h
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stddef.h>
 #ifdef __KERNEL__
 #include <linux/types.h>
 #else /* __KERNEL__ */
diff --git a/include/lttng/string-utils.h b/include/lttng/string-utils.h
index 3e7267e9..8b39bef5 100644
--- a/include/lttng/string-utils.h
+++ b/include/lttng/string-utils.h
@@ -6,8 +6,6 @@
  * Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
-#include <stdbool.h>
-
 typedef char (*strutils_get_char_at_cb)(size_t, void *);
 
 bool strutils_is_star_glob_pattern(const char *pattern);
diff --git a/include/lttng/tracer.h b/include/lttng/tracer.h
index fbffc7e8..927ad9f4 100644
--- a/include/lttng/tracer.h
+++ b/include/lttng/tracer.h
@@ -11,7 +11,6 @@
  * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <stdarg.h>
 #include <linux/types.h>
 #include <linux/limits.h>
 #include <linux/list.h>
diff --git a/src/lib/msgpack/msgpack.c b/src/lib/msgpack/msgpack.c
index b4d9beec..fbbd96f0 100644
--- a/src/lib/msgpack/msgpack.c
+++ b/src/lib/msgpack/msgpack.c
@@ -20,7 +20,6 @@
 
 #define _GNU_SOURCE
 #define _LGPL_SOURCE
-#include <stddef.h>
 
 #define MSGPACK_FIXSTR_ID_MASK		0xA0
 #define MSGPACK_FIXMAP_ID_MASK		0x80
diff --git a/src/lttng-events.c b/src/lttng-events.c
index 2b4b1039..4ddf4a77 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -49,6 +49,12 @@
 #include <ringbuffer/frontend.h>
 #include <wrapper/time.h>
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
+#include <linux/stdarg.h>
+#else
+#include <stdarg.h>
+#endif
+
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
 static LIST_HEAD(sessions);
diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index 6ea9f13d..d5e5df4a 100644
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -28,6 +28,7 @@
 #include <wrapper/file.h>
 #include <wrapper/rcu.h>
 #include <wrapper/syscall.h>
+#include <wrapper/limits.h>
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/utils.h>
diff --git a/src/lttng-syscalls.h b/src/lttng-syscalls.h
index 7cbdd0ff..a464e69e 100644
--- a/src/lttng-syscalls.h
+++ b/src/lttng-syscalls.h
@@ -10,8 +10,6 @@
 #ifndef LTTNG_SYSCALLS_H
 #define LTTNG_SYSCALLS_H
 
-#include <stddef.h>
-
 #include <asm/ptrace.h>
 #include <linux/compat.h>
 #include <linux/fcntl.h>