Add dummy TLS variable to rseq_offset tests

Ensure the main executable has at least one TLS variable which will be
allocated before the rseq area, making sure the rseq_offset is not 0.  This
allows testing that the rseq_offset variable is properly initialized by
checking it is not 0.

Most toolchains will add at least one main exec TLS variable but it's
currently not the case on RISC-V.

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

diff --git a/tests/basic_test.c b/tests/basic_test.c
index fcde879bc29974634caf445a962e1328f6b301e4..6cbd73270c84f8601c6e8e7cd6559e1f7d329567 100644 (file)
--- a/tests/basic_test.c
+++ b/tests/basic_test.c
@@ -18,6 +18,17 @@
 
 #include "tap.h"
 
+/*
+ * Ensure the main executable has at least one TLS variable which will be
+ * allocated before the rseq area, making sure the rseq_offset is not 0.  This
+ * allows testing that the rseq_offset variable is properly initialized by
+ * checking it is not 0.
+ *
+ * Most toolchains will add at least one main exec TLS variable but it's
+ * currently not the case on RISC-V.
+ */
+__thread int dummy_tls = -1;
+
 static void test_registered(void)
 {
        struct rseq_abi *rseq_abi = rseq_get_abi();

diff --git a/tests/unregistered_test.c b/tests/unregistered_test.c
index fc7c18270d29ad7499d5116d13a4ce0e72607085..5aed17fc4019b4a4441696d410032c0e1c3dcd07 100644 (file)
--- a/tests/unregistered_test.c
+++ b/tests/unregistered_test.c
@@ -12,6 +12,17 @@
 
 #define NR_TESTS 4
 
+/*
+ * Ensure the main executable has at least one TLS variable which will be
+ * allocated before the rseq area, making sure the rseq_offset is not 0.  This
+ * allows testing that the rseq_offset variable is properly initialized by
+ * checking it is not 0.
+ *
+ * Most toolchains will add at least one main exec TLS variable but it's
+ * currently not the case on RISC-V.
+ */
+__thread int dummy_tls = -1;
+
 /*
  * Check the state of the public symbols when the rseq syscall is available but
  * no thread has registered.