summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-01-09 05:49:49 +0000
committerUlrich Drepper <drepper@redhat.com>2008-01-09 05:49:49 +0000
commite219f1c1b2a5a2e4f248714fdc93d031cdc5ee6a (patch)
treefa6765a61fa75066ddc0dd271135025748a7faf6 /src
parent9fbf0d9bdcc9043491e7ea53e769506743160760 (diff)
downloadelfutils-e219f1c1b2a5a2e4f248714fdc93d031cdc5ee6a.tar.gz
propagate from branch 'com.redhat.elfutils.roland.pending' (head 26cc2ce45739af072e7ff4fdab5e8eb7cd756d50)
to branch 'com.redhat.elfutils' (head bb519012dee7013b2cab5c2f5ed465cb3821b063)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/elflint.c3
-rw-r--r--src/ld.h5
-rw-r--r--src/strip.c3
4 files changed, 17 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 79ce2e85..aa9b6241 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-04 Roland McGrath <roland@redhat.com>
+
+ * strip.c (handle_elf): Move SHDRIDX defn to silence gcc warning.
+
+2008-01-03 Roland McGrath <roland@redhat.com>
+
+ * ld.h (linked_from_dso_p): Use __attribute__ ((__gnu_inline__)).
+
+ * elflint.c (check_dynamic): Remove duplicate initializer.
+
2008-01-02 Ulrich Drepper <drepper@redhat.com>
* addr2line.c: Update copyright year.
diff --git a/src/elflint.c b/src/elflint.c
index 85b24954..e4ebac4c 100644
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -1,5 +1,5 @@
/* Pedantic checking of ELF files compliance with gABI/psABI spec.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Red Hat, Inc.
This file is part of Red Hat elfutils.
Written by Ulrich Drepper <drepper@redhat.com>, 2001.
@@ -1507,7 +1507,6 @@ check_dynamic (Ebl *ebl, GElf_Ehdr *ehdr, GElf_Shdr *shdr, int idx)
[DT_JMPREL] = { [DT_PLTRELSZ] = true, [DT_PLTREL] = true },
[DT_RUNPATH] = { [DT_STRTAB] = true },
[DT_PLTREL] = { [DT_JMPREL] = true },
- [DT_PLTRELSZ] = { [DT_JMPREL] = true }
};
bool has_dt[DT_NUM];
bool has_val_dt[DT_VALNUM];
diff --git a/src/ld.h b/src/ld.h
index 59633e65..bcf21f2c 100644
--- a/src/ld.h
+++ b/src/ld.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2005, 2006, 2008 Red Hat, Inc.
This file is part of Red Hat elfutils.
Written by Ulrich Drepper <drepper@redhat.com>, 2001.
@@ -1087,6 +1087,9 @@ extern bool dynamically_linked_p (void);
/* Checked whether the symbol is undefined and referenced from a DSO. */
extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
extern inline bool
linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
{
diff --git a/src/strip.c b/src/strip.c
index 1e61911a..5fddeeeb 100644
--- a/src/strip.c
+++ b/src/strip.c
@@ -383,6 +383,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
Elf *debugelf = NULL;
char *tmp_debug_fname = NULL;
int result = 0;
+ size_t shdridx = 0;
size_t shstrndx;
struct shdr_info
{
@@ -981,7 +982,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname,
}
/* Index of the section header table in the shdr_info array. */
- size_t shdridx = cnt;
+ shdridx = cnt;
/* Add the section header string table section name. */
shdr_info[cnt].se = ebl_strtabadd (shst, ".shstrtab", 10);