This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/pr14831 updated. glibc-2.16-ports-merge-672-g588e673
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Nov 2012 23:44:57 -0000
- Subject: GNU C Library master sources branch hjl/pr14831 updated. glibc-2.16-ports-merge-672-g588e673
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/pr14831 has been updated
via 588e673bd061914c4c5758bbdd2170c061adce47 (commit)
from 6dda64cb46cc42c41b7472233c61867b8218d1f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=588e673bd061914c4c5758bbdd2170c061adce47
commit 588e673bd061914c4c5758bbdd2170c061adce47
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Nov 14 14:04:50 2012 -0800
Update comments
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index c4c57c2..fa15472 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -1,5 +1,5 @@
/* On-demand PLT fixup for shared objects.
- Copyright (C) 1995-2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 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
@@ -166,12 +166,11 @@ _dl_profile_fixup (
if (l->l_reloc_result == NULL)
{
- /* Resolve an IRELATIVE relocation in another DSO may reference a
- function defined in libc.so before l_reloc_result is allocated.
- For example, __get_cpu_features in libc.so is called to resolve
- R_X86_64_IRELATIVE relocations in x86-64 libm.so. Skip audit and
- resolve the function in this case. It is OK since we aren't
- supposed to audit IRELATIVE relocations. */
+ /* ELF_DYNAMIC_RELOCATE is called before l_reloc_result is allocated.
+ We will get here if ELF_DYNAMIC_RELOCATE calls a resolver function
+ to resolve IRELATIVE relocation. For example, resolver in x86-64
+ libm.so calls __get_cpu_features defined in libc.so. Skip audit
+ and resolve the external function in this case. */
*framesizep = -1;
return _dl_fixup (
# ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
-----------------------------------------------------------------------
Summary of changes:
elf/dl-runtime.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources