r6222: Change the mechanism by which library init and fini functions are specified

Signed-off-by: James Lentini <jlentini@netapp.com>

diff --git a/Makefile.am b/Makefile.am
index e09001b29e59d7f51e88f8581b29d0782c286ebb..405dca27aca75fe9efb2d61f64a8cc1753f7c94d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,7 +173,8 @@ dapl_udapl_libdaplcma_la_SOURCES = dapl/udapl/dapl_init.c \
         dapl/openib_cma/dapl_ib_mem.c               
 
 dapl_udapl_libdaplcma_la_LDFLAGS = -version-info 1:2:0 $(daplcma_version_script) \
-                                  -lpthread -libverbs -lrdmacm   
+                                  -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
+                                  -lpthread -libverbs -lrdmacm 
                                
 
 #        
@@ -282,6 +283,7 @@ dapl_udapl_libdaplscm_la_SOURCES = dapl/udapl/dapl_init.c \
         dapl/openib_scm/dapl_ib_mem.c               
 
 dapl_udapl_libdaplscm_la_LDFLAGS = -version-info 1:2:0 $(daplscm_version_script) \
+                                  -Wl,-init,dapl_init -Wl,-fini,dapl_fini \
                                   -lpthread -libverbs
                                    
 libdatincludedir = $(includedir)/dat

diff --git a/dapl/udapl/dapl_init.c b/dapl/udapl/dapl_init.c
index 6fce5cbe22fce705de35e21b673964afdabb9d26..787261bdd8d5204d91d4c1986cfca37c6bb8ccf0 100644 (file)
--- a/dapl/udapl/dapl_init.c
+++ b/dapl/udapl/dapl_init.c
@@ -66,7 +66,7 @@
  *
  * Return Values:
  */
-static void __attribute__((constructor)) dapl_init ( void )
+void dapl_init ( void )
 {
     DAT_RETURN         dat_status;
 
@@ -138,7 +138,7 @@ bail:
  *
  * Return Values:
  */
-static void __attribute__((destructor)) dapl_fini ( void )
+void dapl_fini ( void )
 {
     DAT_RETURN         dat_status;