[PATCH 2/3] shared: fix UNIQ definition
flat view
STALE2110d
From: Lucas De Marchi <hidden>
Date: 2020-12-18 16:03:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
We need a macro indirection for UNIQ to work. Otherwise it won't be unique at all since it will just append "UNIQ" to the name: In file included from testsuite/test-init.c:30: testsuite/testsuite.h:142:27: error: redefinition of ‘stest_load_resourcesUNIQ’ --- shared/macro.h | 7 +++++-- testsuite/testsuite.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/shared/macro.h b/shared/macro.h
index 4fc5405..b59f7dc 100644
--- a/shared/macro.h
+++ b/shared/macro.h@@ -45,9 +45,14 @@ }) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr)) + #define XSTRINGIFY(x) #x #define STRINGIFY(x) XSTRINGIFY(x) +#define XCONCATENATE(x, y) x ## y +#define CONCATENATE(x, y) XCONCATENATE(x, y) +#define UNIQ(x) CONCATENATE(x, __COUNTER__) + /* Temporaries for importing index handling */ #define NOFAIL(x) (x) #define fatal(x...) do { } while (0)
@@ -69,5 +74,3 @@ #define noreturn __attribute__((noreturn)) #endif #endif - -#define UNIQ __COUNTER__
diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h
index 7ed96bf..f190249 100644
--- a/testsuite/testsuite.h
+++ b/testsuite/testsuite.h@@ -139,7 +139,7 @@ int test_run(const struct test *t); /* Test definitions */ #define DEFINE_TEST(_name, ...) \ - static const struct test s##_name##UNIQ \ + static const struct test UNIQ(s##_name) \ __attribute__((used, section("kmod_tests"), aligned(8))) = { \ .name = #_name, \ .func = _name, \
--
2.29.2