On 04/16/2011 01:07 PM, Ulrich Drepper wrote:
But it's not. The last change for ldgeneric.c should fix up the
comment and not change just the duplication.
I've amended that commit. OK now?
Aside, changes without any code changes shouldn't pollute the
Sounds sensible. BTW: Ulrich, would you accept a similar patch for glibc? I've run
Jim's script and there are quite a lot of duplications. Thanks.
Signed-off-by: Marek Polacek <mpolacek(a)redhat.com>
libebl/eblrelativerelocp.c | 2 +-
libelf/libelfP.h | 2 +-
src/arlib.c | 2 +-
src/elf32-i386.script | 2 +-
src/ld.c | 2 +-
src/ldgeneric.c | 5 ++---
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/libebl/eblrelativerelocp.c b/libebl/eblrelativerelocp.c
index 8ea97b8..9c28b59 100644
@@ -1,4 +1,4 @@
-/* Check whether given relocation is a relocation relocation.
+/* Check whether given relocation is a relative relocation.
Copyright (C) 2006 Red Hat, Inc.
This file is part of Red Hat elfutils.
Written by Ulrich Drepper <drepper(a)redhat.com>, 2006.
diff --git a/libelf/libelfP.h b/libelf/libelfP.h
index 2b8391b..8f2f33a 100644
@@ -251,7 +251,7 @@ struct Elf_Scn
char *rawdata_base; /* The unmodified data of the section. */
char *data_base; /* The converted data of the section. */
- struct Elf_ScnList *list; /* Pointer the the section list element the
+ struct Elf_ScnList *list; /* Pointer to the section list element the
data is in. */
diff --git a/src/arlib.c b/src/arlib.c
index af98454..c69a138 100644
@@ -61,7 +61,7 @@ arlib_init (void)
/* Using snprintf here has a problem: the call always wants to add a
NUL byte. We could use a trick whereby we specify the target
buffer size longer than it is and this would not actually fail,
- since all the fields are consecutive and we fill them in in
+ since all the fields are consecutive and we fill them in
sequence (i.e., the NUL byte gets overwritten). But
_FORTIFY_SOURCE=2 would not let us play these games. Therefore
we play it safe. */
diff --git a/src/elf32-i386.script b/src/elf32-i386.script
index a6cfffa..2083278 100644
@@ -120,7 +120,7 @@ SEGMENT [RW]
is in. */
/* We don't want to include the .ctor section from
- from the crtend.o file until after the sorted ctors.
+ the crtend.o file until after the sorted ctors.
The .ctor section from the crtend file contains the
end of ctors marker and it must be last */
KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
diff --git a/src/ld.c b/src/ld.c
index 932496e..a3b0934 100644
@@ -1465,7 +1465,7 @@ static void
/* Walk through the data from the linker script and generate all the
- symbols which are required to be present and and those marked
+ symbols which are required to be present and those marked
with PROVIDE if there is a undefined reference. */
if (ld_state.output_segments == NULL)
diff --git a/src/ldgeneric.c b/src/ldgeneric.c
index d51b54f..5b26fcf 100644
@@ -5854,9 +5854,8 @@ section index too large in dynamic symbol table"));
- the symbol is for a file
- it is not externally visible (internal, hidden)
- - if export_all_dynamic is not set and is only defined in
- the executable (i.e., it is defined, but not (also) in
- in DSO)
+ - export_all_dynamic is not set and is only defined in
+ the executable (i.e., it is defined, but not (also) in DSO)
Set symstrent[cnt] to NULL in case an entry is ignored. */
if (XELF_ST_TYPE (sym->st_info) == STT_FILE