[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r15145 - in /fsf/glibc-2_11-branch/libc: ./ elf/ include/ sysdeps/unix/sysv/linux/
- To: commits@xxxxxxxxxx
- Subject: [commits] r15145 - in /fsf/glibc-2_11-branch/libc: ./ elf/ include/ sysdeps/unix/sysv/linux/
- From: eglibc@xxxxxxxxxx
- Date: Thu, 01 Sep 2011 07:07:26 -0000
Author: eglibc
Date: Thu Sep 1 00:07:25 2011
New Revision: 15145
Log:
Import glibc-2.11 for 2011-09-01
Modified:
fsf/glibc-2_11-branch/libc/ChangeLog
fsf/glibc-2_11-branch/libc/elf/Makefile
fsf/glibc-2_11-branch/libc/elf/dl-close.c
fsf/glibc-2_11-branch/libc/elf/dl-deps.c
fsf/glibc-2_11-branch/libc/elf/dl-load.c
fsf/glibc-2_11-branch/libc/elf/noload.c
fsf/glibc-2_11-branch/libc/include/link.h
fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/Makefile
Modified: fsf/glibc-2_11-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_11-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_11-branch/libc/ChangeLog Thu Sep 1 00:07:25 2011
@@ -139,11 +139,6 @@
Maintain aligned stack.
(CHECK_RSP): Remove unused macro.
-2011-04-01 Andreas Schwab <schwab@xxxxxxxxxx>
-
- * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
- bits/timex.h
-
2011-03-18 Ulrich Drepper <drepper@xxxxxxxxx>
[BZ #12583]
@@ -177,24 +172,6 @@
2011-03-03 Andreas Schwab <schwab@xxxxxxxxxx>
* libio/fmemopen.c (fmemopen): Don't read past end of buffer.
-
-2011-02-23 Andreas Schwab <schwab@xxxxxxxxxx>
- Ulrich Drepper <drepper@xxxxxxxxx>
-
- [BZ #12509]
- * include/link.h (struct link_map): Add l_orig_initfini.
- * elf/dl-load.c (_dl_map_object_from_fd): Free realname before
- returning unsuccessfully.
- * elf/dl-close.c (_dl_close_worker): If this is the last explicit
- close of a file loaded at startup, restore the original l_initfini
- list.
- * elf/dl-deps.c (_dl_map_object_deps): Don't free old l_initfini
- list, store the pointer.
- * elf/Makefile ($(objpfx)noload-mem): New rule.
- (noload-ENV): Define.
- (tests): Add $(objpfx)noload-mem.
- * elf/noload.c: Include <memcheck.h>.
- (main): Call mtrace. Close all opened handles.
2011-02-17 Andreas Schwab <schwab@xxxxxxxxxx>
Modified: fsf/glibc-2_11-branch/libc/elf/Makefile
==============================================================================
--- fsf/glibc-2_11-branch/libc/elf/Makefile (original)
+++ fsf/glibc-2_11-branch/libc/elf/Makefile Thu Sep 1 00:07:25 2011
@@ -209,7 +209,7 @@
ifeq (yesyes,$(have-fpie)$(build-shared))
tests: $(objpfx)tst-pie1.out
endif
-tests: $(objpfx)tst-leaks1-mem $(objpfx)noload-mem
+tests: $(objpfx)tst-leaks1-mem
tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
@@ -658,10 +658,6 @@
LDFLAGS-noload = -rdynamic
$(objpfx)noload.out: $(objpfx)testobj5.so
-$(objpfx)noload-mem: $(objpfx)noload.out
- $(common-objpfx)malloc/mtrace $(objpfx)noload.mtrace > $@
-noload-ENV = MALLOC_TRACE=$(objpfx)noload.mtrace
-
LDFLAGS-nodelete = -rdynamic
LDFLAGS-nodelmod1.so = -Wl,--enable-new-dtags,-z,nodelete
LDFLAGS-nodelmod4.so = -Wl,--enable-new-dtags,-z,nodelete
Modified: fsf/glibc-2_11-branch/libc/elf/dl-close.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/elf/dl-close.c (original)
+++ fsf/glibc-2_11-branch/libc/elf/dl-close.c Thu Sep 1 00:07:25 2011
@@ -1,5 +1,5 @@
/* Close a shared object opened by `_dl_open'.
- Copyright (C) 1996-2007, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1996-2007, 2009 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
@@ -119,17 +119,8 @@
if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
|| dl_close_state != not_pending)
{
- if (map->l_direct_opencount == 0)
- {
- if (map->l_type == lt_loaded)
- dl_close_state = rerun;
- else if (map->l_type == lt_library)
- {
- struct link_map **oldp = map->l_initfini;
- map->l_initfini = map->l_orig_initfini;
- _dl_scope_free (oldp);
- }
- }
+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
+ dl_close_state = rerun;
/* There are still references to this object. Do nothing more. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
Modified: fsf/glibc-2_11-branch/libc/elf/dl-deps.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/elf/dl-deps.c (original)
+++ fsf/glibc-2_11-branch/libc/elf/dl-deps.c Thu Sep 1 00:07:25 2011
@@ -669,5 +669,5 @@
_dl_scope_free (old_l_reldeps);
}
if (old_l_initfini != NULL)
- map->l_orig_initfini = old_l_initfini;
+ _dl_scope_free (old_l_initfini);
}
Modified: fsf/glibc-2_11-branch/libc/elf/dl-load.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/elf/dl-load.c (original)
+++ fsf/glibc-2_11-branch/libc/elf/dl-load.c Thu Sep 1 00:07:25 2011
@@ -987,7 +987,6 @@
{
/* We are not supposed to load the object unless it is already
loaded. So return now. */
- free (realname);
__close (fd);
return NULL;
}
@@ -1006,7 +1005,6 @@
_dl_zerofd = _dl_sysdep_open_zero_fill ();
if (_dl_zerofd == -1)
{
- free (realname);
__close (fd);
_dl_signal_error (errno, NULL, NULL,
N_("cannot open zero fill device"));
Modified: fsf/glibc-2_11-branch/libc/elf/noload.c
==============================================================================
--- fsf/glibc-2_11-branch/libc/elf/noload.c (original)
+++ fsf/glibc-2_11-branch/libc/elf/noload.c Thu Sep 1 00:07:25 2011
@@ -1,28 +1,20 @@
#include <dlfcn.h>
#include <stdio.h>
-#include <mcheck.h>
int
main (void)
{
int result = 0;
- void *p;
-
- mtrace ();
/* First try to load an object which is a dependency. This should
succeed. */
- p = dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD);
- if (p == NULL)
+ if (dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
{
printf ("cannot open \"testobj1.so\": %s\n", dlerror ());
result = 1;
}
else
- {
- puts ("loading \"testobj1.so\" succeeded, OK");
- dlclose (p);
- }
+ puts ("loading \"testobj1.so\" succeeded, OK");
/* Now try loading an object which is not already loaded. */
if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) != NULL)
@@ -33,6 +25,8 @@
else
{
/* Load the object and run the same test again. */
+ void *p;
+
puts ("\"testobj5.so\" wasn't loaded and RTLD_NOLOAD prevented it, OK");
p = dlopen ("testobj5.so", RTLD_LAZY);
@@ -47,17 +41,13 @@
{
puts ("loading \"testobj5.so\" succeeded, OK");
- void *q = dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD);
- if (q == NULL)
+ if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
{
printf ("cannot open \"testobj5.so\": %s\n", dlerror ());
result = 1;
}
else
- {
- puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
- dlclose (q);
- }
+ puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
if (dlclose (p) != 0)
{
Modified: fsf/glibc-2_11-branch/libc/include/link.h
==============================================================================
--- fsf/glibc-2_11-branch/libc/include/link.h (original)
+++ fsf/glibc-2_11-branch/libc/include/link.h Thu Sep 1 00:07:25 2011
@@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
loaded ELF shared objects.
- Copyright (C) 1995-2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-2006, 2007, 2009 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
@@ -236,9 +236,6 @@
/* List of object in order of the init and fini calls. */
struct link_map **l_initfini;
- /* The init and fini list generated at startup, saved when the
- object is also loaded dynamically. */
- struct link_map **l_orig_initfini;
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps
Modified: fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/Makefile
==============================================================================
--- fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/Makefile (original)
+++ fsf/glibc-2_11-branch/libc/sysdeps/unix/sysv/linux/Makefile Thu Sep 1 00:07:25 2011
@@ -95,7 +95,7 @@
endif
ifeq ($(subdir),time)
-sysdep_headers += sys/timex.h bits/timex.h
+sysdep_headers += sys/timex.h
sysdep_routines += ntp_gettime
endif