Skip to content

Commit

Permalink
Merge branch 'master' of ssh://sourceware.org/git/glibc
Browse files Browse the repository at this point in the history
Conflicts:
	ChangeLog
  • Loading branch information
Ulrich Drepper committed Aug 22, 2011
2 parents e888bcb + 70538b7 commit 304c6e0
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
10 changes: 10 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
* elf/tst-initorder2.c: New file.
* elf/tst-initorder2.exp: New file.

2011-08-22 Andreas Schwab <schwab@redhat.com>

* sysdeps/unix/sysv/linux/i386/scandir64.c: Include <string.h>.

* elf/dl-deps.c (_dl_map_object_deps): Move check for missing
dependencies back to end of function.

* dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd
$(elfobjdir)/ld.so.

2011-08-21 Ulrich Drepper <drepper@gmail.com>

* sysdeps/unix/sysv/linux/x86_64/gettimeofday.S: Removed.
Expand Down
3 changes: 2 additions & 1 deletion dlfcn/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ $(objpfx)bug-atexit1.out: $(objpfx)bug-atexit1-lib.so
$(objpfx)bug-atexit2: $(libdl)
$(objpfx)bug-atexit2.out: $(objpfx)bug-atexit2-lib.so

LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(common-objpfx)libc_nonshared.a
LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(elfobjdir)/ld.so \
$(common-objpfx)libc_nonshared.a
$(objpfx)bug-atexit3: $(libdl)
$(objpfx)bug-atexit3.out: $(objpfx)bug-atexit3-lib.so

Expand Down
8 changes: 4 additions & 4 deletions elf/dl-deps.c
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,6 @@ _dl_map_object_deps (struct link_map *map,
if (errno == 0 && errno_saved != 0)
__set_errno (errno_saved);

if (errno_reason)
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
NULL, errstring);

struct link_map **old_l_initfini = NULL;
if (map->l_initfini != NULL && map->l_type == lt_loaded)
{
Expand Down Expand Up @@ -691,4 +687,8 @@ Filters not supported with LD_TRACE_PRELINKING"));
}
if (old_l_initfini != NULL)
map->l_orig_initfini = old_l_initfini;

if (errno_reason)
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
NULL, errstring);
}
1 change: 1 addition & 0 deletions sysdeps/unix/sysv/linux/i386/scandir64.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2);

#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
# include <string.h>
# include <errno.h>
# include "olddirent.h"

Expand Down

0 comments on commit 304c6e0

Please sign in to comment.