* k5-platform.h (DELAY_INITIALIZER): Don't define.

(CONSTRUCTOR_ATTR_WORKS, DESTRUCTOR_ATTR_WORKS): Don't define.
(USE_LINKER_FINI_OPTION): Don't define.
(MAYBE_DUMMY_INIT): New macro, to optionally produce a dummy initializer for
the linker to reference in the case where other options indicate we don't want
to use it.
(MAKE_INIT_FUNCTION): Use it in some versions.  Set the exported function name
to have a __auxinit suffix.
(MAKE_FINI_FUNCTION) [!SHARED]: Declare the function static, and do nothing to
try to cause it to get invoked.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16282 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 43 insertions, 20 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 279990cb30..d242da4993 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,16 @@
+2004-04-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* k5-platform.h (DELAY_INITIALIZER): Don't define.
+	(CONSTRUCTOR_ATTR_WORKS, DESTRUCTOR_ATTR_WORKS): Don't define.
+	(USE_LINKER_FINI_OPTION): Don't define.
+	(MAYBE_DUMMY_INIT): New macro, to optionally produce a dummy
+	initializer for the linker to reference in the case where other
+	options indicate we don't want to use it.
+	(MAKE_INIT_FUNCTION): Use it in some versions.  Set the exported
+	function name to have a __auxinit suffix.
+	(MAKE_FINI_FUNCTION) [!SHARED]: Declare the function static, and
+	do nothing to try to cause it to get invoked.
+
 2004-04-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-platform.h (DELAY_INITIALIZER): New macro, defined always.
diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h
index 22b38f4986..04cc276a15 100644
--- a/src/include/k5-platform.h
+++ b/src/include/k5-platform.h
@@ -148,23 +148,7 @@
    tell us how to get a shared library finalization function invoked
    automatically.  */
 
-#if !defined(_WIN32xxx)
-# define DELAY_INITIALIZER
-#endif
-
-/* These should be turned into feature tests or otherwise driven from
-   the configure script.  */
-#if defined(__linux__) || defined(__NetBSD__) \
-	|| (defined(__sun__) && defined(__svr4__) && defined(__GNUC__))
-# define CONSTRUCTOR_ATTR_WORKS
-# define DESTRUCTOR_ATTR_WORKS
-#endif
-#if defined(__sgi) && defined(__mips) && defined(_SYSTYPE_SVR4) /* IRIX? */
-# define USE_LINKER_FINI_OPTION
-#endif
-#if !defined(__GNUC__) && defined(__sun) && defined(__SVR4) && defined(__SUNPRO_C) /* Solaris ld -z finiarray */
-# define USE_LINKER_FINI_OPTION
-#endif
+/* Helper macros.  */
 
 # define JOIN4_2(A,B,C,D) A ## B ## C ## D
 # define JOIN4(A,B,C,D) JOIN4_2(A,B,C,D)
@@ -183,8 +167,15 @@
    possible moment.  This means multiple threads may be active.  */
 # include "k5-thread.h"
 typedef struct { k5_once_t once; int error, did_run; void (*fn)(void); } k5_init_t;
+# ifdef USE_LINKER_INIT_OPTION
+#  define MAYBE_DUMMY_INIT(NAME)		\
+	void JOIN2(NAME, __auxinit) () { }
+# else
+#  define MAYBE_DUMMY_INIT(NAME)
+# endif
 # define MAKE_INIT_FUNCTION(NAME)				\
 	static int NAME(void);					\
+	MAYBE_DUMMY_INIT(NAME)					\
 	/* forward declaration for use in initializer */	\
 	static void JOIN2(NAME, __aux) (void);			\
 	static k5_init_t JOIN2(NAME, __once) =			\
@@ -221,8 +212,17 @@ static inline int k5_call_init_function(k5_init_t *i)
 #elif defined(__GNUC__) && !defined(_WIN32) && defined(CONSTRUCTOR_ATTR_WORKS)
 
 /* Run initializer at load time, via GCC/C++ hook magic.  */
+
+# ifdef USE_LINKER_INIT_OPTION
+#  define MAYBE_DUMMY_INIT(NAME)		\
+	void JOIN2(NAME, __auxinit) () { }
+# else
+#  define MAYBE_DUMMY_INIT(NAME)
+# endif
+
 typedef struct { int error; unsigned char did_run; } k5_init_t;
 # define MAKE_INIT_FUNCTION(NAME)		\
+	MAYBE_DUMMY_INIT(NAME)			\
 	static k5_init_t JOIN2(NAME, __ran)	\
 		= { 0, 2 };			\
 	static void JOIN2(NAME, __aux)(void)	\
@@ -238,9 +238,9 @@ typedef struct { int error; unsigned char did_run; } k5_init_t;
 	(JOIN2(NAME, __ran).did_run == 3	\
 	 ? JOIN2(NAME, __ran).error		\
 	 : (abort(),0))
-# define INITIALIZER_RAN(NAME)	(JOIN2(NAME, __ran).error == 0)
+# define INITIALIZER_RAN(NAME)	(JOIN2(NAME,__ran).did_run == 3 && JOIN2(NAME, __ran).error == 0)
 
-#elif defined(LINKER_HAS_INIT_OPTION)
+#elif defined(USE_LINKER_INIT_OPTION)
 
 /* Run initializer at load time, via linker magic.  */
 typedef struct { int error; unsigned char did_run; } k5_init_t;
@@ -248,7 +248,7 @@ typedef struct { int error; unsigned char did_run; } k5_init_t;
 	static k5_init_t JOIN2(NAME, __ran)	\
 		= { 0, 2 };			\
 	static int NAME(void);			\
-	void JOIN2(NAME, __aux)			\
+	void JOIN2(NAME, __auxinit)		\
 	{					\
 	    JOIN2(NAME, __ran).error = NAME();	\
 	    JOIN2(NAME, __ran).did_run = 3;	\
@@ -291,6 +291,16 @@ typedef struct { int error; unsigned char did_run; } k5_init_t;
 # define MAKE_FINI_FUNCTION(NAME)	\
 	static void NAME(void) __attribute__((destructor))
 
+#elif !defined(SHARED)
+
+/* In this case, we just don't care about finalization.
+
+   The code will still define the function, but we won't do anything
+   with it.  Annoying: This may generate unused-function warnings.  */
+
+# define MAKE_FINI_FUNCTION(NAME)	\
+	static void NAME(void)
+
 #else
 
 # error "Don't know how to do unload-time finalization for this configuration."