3 files changed, 33 insertions, 2 deletions

diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index aa17df8..f92a066 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -1,5 +1,3 @@
-#babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so has relocations in .text [textrel]
-TOOLCHAIN_pn-babeltrace2 = "gcc"
 TOOLCHAIN_pn-u-boot = "gcc"
 TOOLCHAIN_pn-cpufrequtils = "gcc"
 # crash embeds version of gdb which is not buildable with clang
diff --git a/recipes-kernel/lttng/babeltrace2/babeltrace2-2.0.2-fix-reserved-keywords.patch b/recipes-kernel/lttng/babeltrace2/babeltrace2-2.0.2-fix-reserved-keywords.patch
new file mode 100644
index 0000000..43461fe
--- /dev/null
+++ b/recipes-kernel/lttng/babeltrace2/babeltrace2-2.0.2-fix-reserved-keywords.patch
@@ -0,0 +1,31 @@
+From 790d3e55982df7b21caea7eff97dbd0ebce4f8cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Wed, 26 May 2021 05:06:55 +0200
+Subject: [PATCH] ctf-writer: Fix list of reserved keywords
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The missing comma between "void" and "_Bool" causes the compiler to
+treat it as one string ("void_Bool"), missing both "void" and "_Bool"
+as real reserved keywords.
+
+Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
+Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/117]
+---
+ src/ctf-writer/utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ctf-writer/utils.c b/src/ctf-writer/utils.c
+index 0cfb5742b..6c4b0ed8f 100644
+--- a/src/ctf-writer/utils.c
++++ b/src/ctf-writer/utils.c
+@@ -25,7 +25,7 @@ const char * const reserved_keywords_str[] = {"align", "callsite",
+        "const", "char", "clock", "double", "enum", "env", "event",
+        "floating_point", "float", "integer", "int", "long", "short", "signed",
+        "stream", "string", "struct", "trace", "typealias", "typedef",
+-       "unsigned", "variant", "void" "_Bool", "_Complex", "_Imaginary"};
++       "unsigned", "variant", "void", "_Bool", "_Complex", "_Imaginary"};
+ 
+ static GHashTable *reserved_keywords_set;
+ static int init_done;
diff --git a/recipes-kernel/lttng/babeltrace2_%.bbappend b/recipes-kernel/lttng/babeltrace2_%.bbappend
new file mode 100644
index 0000000..3f2f08b
--- /dev/null
+++ b/recipes-kernel/lttng/babeltrace2_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://babeltrace2-2.0.2-fix-reserved-keywords.patch"