X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Finit.h;h=a9367697a85f340d2dce283d6233396d8cb494c4;hb=d54815c441c77f0b50d375848aef7fc4ff639492;hp=f163ee2fb7a2bc8ec86ef4801fe4ad81564e51b7;hpb=13adc3d48d562b13422259d8c7ac411fb43c7e8b;p=vpp.git

diff --git a/src/vlib/init.h b/src/vlib/init.h
index f163ee2fb7a..a9367697a85 100644
--- a/src/vlib/init.h
+++ b/src/vlib/init.h
@@ -115,6 +115,7 @@ typedef struct vlib_config_function_runtime_t
 /* Declaration is global (e.g. not static) so that init functions can
    be called from other modules to resolve init function depend. */
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_DECLARE_INIT_FUNCTION(x, tag)                      \
 vlib_init_function_t * _VLIB_INIT_FUNCTION_SYMBOL (x, tag) = x; \
 static void __vlib_add_##tag##_function_##x (void)              \
@@ -152,6 +153,12 @@ static void __vlib_rm_##tag##_function_##x (void)               \
       next = next->next_init_function;                          \
     }                                                           \
 }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VLIB_DECLARE_INIT_FUNCTION(x, tag)                      \
+static __clib_unused void * __clib_unused_##tag##_##x = x;
+#endif
 
 #define VLIB_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,init)
 #define VLIB_WORKER_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,worker_init)
@@ -161,6 +168,7 @@ static void __vlib_rm_##tag##_function_##x (void)               \
 #define VLIB_MAIN_LOOP_EXIT_FUNCTION(x) \
 VLIB_DECLARE_INIT_FUNCTION(x,main_loop_exit)
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_CONFIG_FUNCTION(x,n,...)                           \
     __VA_ARGS__ vlib_config_function_runtime_t                  \
     VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
@@ -191,7 +199,20 @@ static void __vlib_rm_config_function_##x (void)                \
     .function = x,                                              \
     .is_early = 0,						\
   }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VLIB_CONFIG_FUNCTION(x,n,...)                           \
+  static __clib_unused vlib_config_function_runtime_t           \
+    VLIB_CONFIG_FUNCTION_SYMBOL (__clib_unused_##x)             \
+  = {                                                           \
+    .name = n,                                                  \
+    .function = x,                                              \
+    .is_early = 0,						\
+  }
+#endif
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_EARLY_CONFIG_FUNCTION(x,n,...)                     \
     __VA_ARGS__ vlib_config_function_runtime_t                  \
     VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
@@ -222,6 +243,18 @@ static void __vlib_rm_config_function_##x (void)                \
     .function = x,                                              \
     .is_early = 1,						\
   }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VLIB_EARLY_CONFIG_FUNCTION(x,n,...)                     \
+  static __clib_unused vlib_config_function_runtime_t           \
+    VLIB_CONFIG_FUNCTION_SYMBOL (__clib_unused_##x)             \
+  = {                                                           \
+    .name = n,                                                  \
+    .function = x,                                              \
+    .is_early = 1,						\
+  }
+#endif
 
 /* Call given init function: used for init function dependencies. */
 #define vlib_call_init_function(vm, x)					\