From 069b7c3e7f33b4c7f0d6dd04939d6fc52a97fe53 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 13 Feb 2002 09:04:53 +0000 Subject: [PATCH] Update. 2002-02-12 Andreas Schwab * csu/gmon-start.c (__gmon_start__): Remove '&' from ENTRY_POINT. --- ChangeLog | 4 ++++ csu/gmon-start.c | 4 ++-- elf/dl-open.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d4e13458a..99727733eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-02-12 Andreas Schwab + + * csu/gmon-start.c (__gmon_start__): Remove '&' from ENTRY_POINT. + 2002-02-12 Ulrich Drepper * sysdeps/generic/dl-tls.c (TLS_DTV_UNALLOCATED): Renamed from diff --git a/csu/gmon-start.c b/csu/gmon-start.c index 4df3a1326e..1aaeefcf7f 100644 --- a/csu/gmon-start.c +++ b/csu/gmon-start.c @@ -1,5 +1,5 @@ /* Code to enable profiling at program startup. - Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -63,7 +63,7 @@ __gmon_start__ (void) #endif /* Start keeping profiling records. */ - __monstartup ((u_long) &ENTRY_POINT, (u_long) &etext); + __monstartup ((u_long) ENTRY_POINT, (u_long) &etext); /* Call _mcleanup before exiting; it will write out gmon.out from the collected data. */ diff --git a/elf/dl-open.c b/elf/dl-open.c index d9ed499054..c7acd74964 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -31,7 +31,6 @@ #include #include -#include extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, @@ -498,12 +497,14 @@ _dl_open (const char *file, int mode, const void *caller) for (i = 0; i < args.map->l_searchlist.r_nlist; ++i) ++args.map->l_searchlist.r_list[i]->l_opencount; +#ifdef USE_TLS /* Maybe some of the modules which were loaded uses TLS. Since it will be removed in the folowing _dl_close call we have to mark the dtv array as having gaps to fill the holes. This is a pessimistic assumption which won't hurt if not true. */ GL(dl_tls_dtv_gaps) = true; +#endif _dl_close (args.map); } -- 2.11.4.GIT