Replaced -nostdlib by -nodefaultlibs such that constructors are executed at shared...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7883

diff --git a/Makefile.flags.am b/Makefile.flags.am
index 1dad49add5d87b08c50a853fafb09f851642ae23..14ad4bea59e1c7996a6b77fd7298d125292c1395 100644 (file)
--- a/Makefile.flags.am
+++ b/Makefile.flags.am
@@ -64,8 +64,8 @@ endif
 
 # Baseline link flags for making dynamic shared objects.
 #
-PRELOAD_LDFLAGS_COMMON_LINUX = -nostdlib -shared -Wl,-z,interpose,-z,initfirst
-PRELOAD_LDFLAGS_COMMON_AIX5  = -nostdlib -shared -Wl,-G -Wl,-bnogc
+PRELOAD_LDFLAGS_COMMON_LINUX = -nodefaultlibs -shared -Wl,-z,interpose,-z,initfirst
+PRELOAD_LDFLAGS_COMMON_AIX5  = -nodefaultlibs -shared -Wl,-G -Wl,-bnogc
 PRELOAD_LDFLAGS_X86_LINUX   = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
 PRELOAD_LDFLAGS_AMD64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
 PRELOAD_LDFLAGS_PPC32_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@

diff --git a/exp-drd/drd_pthread_intercepts.c b/exp-drd/drd_pthread_intercepts.c
index 6e1e6d8dfa94bba45a88f6a4542e9b23ca993567..94e9dd3b0dc5520be7d91eb5769e6b845e23ef85 100644 (file)
--- a/exp-drd/drd_pthread_intercepts.c
+++ b/exp-drd/drd_pthread_intercepts.c
@@ -83,7 +83,7 @@ typedef struct
 
 /* Function declarations. */
 
-void _init(void);
+static void init(void) __attribute__((constructor));
 static void check_threading_library(void);
 static void vg_set_main_thread_state(void);
 
@@ -94,7 +94,7 @@ static void vg_set_main_thread_state(void);
  *  after dlopen() has loaded the shared library. This function must not
  *  be declared static.
  */
-void _init(void)
+static void init(void)
 {
   check_threading_library();
   vg_set_main_thread_state();