From: Jerin Jacob <jerinj@marvell.com>
Date: Mon, 18 Mar 2019 04:15:56 +0000 (+0000)
Subject: use appropriate EAL macro for constructors
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=55878866eb2b6d4e00ff5624259a92f13e10b481;p=dpdk.git

use appropriate EAL macro for constructors

Use eal's RTE_INIT abstraction for defining constructors.

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---

diff --git a/app/test-bbdev/main.h b/app/test-bbdev/main.h
index 20a55efca3..2bbe1b8226 100644
--- a/app/test-bbdev/main.h
+++ b/app/test-bbdev/main.h
@@ -103,8 +103,7 @@ void add_test_command(struct test_command *t);
 		.command = RTE_STR(name), \
 		.callback = test_func_##name, \
 	}; \
-	static void __attribute__((constructor, used)) \
-	test_register_##name(void) \
+	RTE_INIT(test_register_##name) \
 	{ \
 		add_test_command(&test_struct_##name); \
 	}
diff --git a/app/test/resource.h b/app/test/resource.h
index 223fa22aec..c75ebd4b5d 100644
--- a/app/test/resource.h
+++ b/app/test/resource.h
@@ -98,7 +98,7 @@ static struct resource linkres_ ##n = {       \
 	.begin = b,             \
 	.end = e,               \
 };                              \
-static void __attribute__((constructor, used)) resinitfn_ ##n(void) \
+RTE_INIT(resinitfn_ ##n)	\
 {                               \
 	resource_register(&linkres_ ##n);  \
 }
diff --git a/app/test/test.h b/app/test/test.h
index 7c24432303..9b3846b1ed 100644
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -177,8 +177,7 @@ void add_test_command(struct test_command *t);
 		.command = RTE_STR(cmd), \
 		.callback = func, \
 	}; \
-	static void __attribute__((constructor, used)) \
-	test_register_##cmd(void) \
+	RTE_INIT(test_register_##cmd) \
 	{ \
 		add_test_command(&test_struct_##cmd); \
 	}
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 7c9cd9a2f6..fd19470d72 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -832,10 +832,9 @@ int rte_mempool_register_ops(const struct rte_mempool_ops *ops);
  * Note that the rte_mempool_register_ops fails silently here when
  * more than RTE_MEMPOOL_MAX_OPS_IDX is registered.
  */
-#define MEMPOOL_REGISTER_OPS(ops)					\
-	void mp_hdlr_init_##ops(void);					\
-	void __attribute__((constructor, used)) mp_hdlr_init_##ops(void)\
-	{								\
+#define MEMPOOL_REGISTER_OPS(ops)				\
+	RTE_INIT(mp_hdlr_init_##ops)				\
+	{							\
 		rte_mempool_register_ops(&ops);			\
 	}