summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog7
-rw-r--r--ld/emultempl/pe.em3
-rw-r--r--ld/emultempl/pep.em3
-rw-r--r--ld/ldlang.c6
4 files changed, 9 insertions, 10 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d5595c604e..0a6a8076f5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-13 Alan Modra <amodra@gmail.com>
+
+ * ldlang.c (sort_def_symbol, lang_one_common): Don't handle
+ warning symbols here.
+ * emultempl/pe.em (pr_sym): Remove redundant test.
+ * emultempl/pep.em (pr_sym): Likewise.
+
2011-06-09 Nick Clifton <nickc@redhat.com>
PR ld/12845
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 6369606e2a..5737fc0985 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1197,8 +1197,7 @@ This should work unless it involves constant data structures referencing symbols
static bfd_boolean
pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
{
- if (pe_dll_extra_pe_debug)
- printf ("+%s\n", h->string);
+ printf ("+%s\n", h->string);
return TRUE;
}
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index 0c1dfb9753..e02ddcf5ea 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -1130,8 +1130,7 @@ pep_find_data_imports (void)
static bfd_boolean
pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
{
- if (pep_dll_extra_pe_debug)
- printf ("+%s\n", h->string);
+ printf ("+%s\n", h->string);
return TRUE;
}
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 6289f2f866..7e06613b51 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2100,9 +2100,6 @@ static bfd_boolean
sort_def_symbol (struct bfd_link_hash_entry *hash_entry,
void *info ATTRIBUTE_UNUSED)
{
- if (hash_entry->type == bfd_link_hash_warning)
- hash_entry = (struct bfd_link_hash_entry *) hash_entry->u.i.link;
-
if (hash_entry->type == bfd_link_hash_defined
|| hash_entry->type == bfd_link_hash_defweak)
{
@@ -5885,9 +5882,6 @@ lang_one_common (struct bfd_link_hash_entry *h, void *info)
bfd_vma size;
asection *section;
- if (h->type == bfd_link_hash_warning)
- h = h->u.i.link;
-
if (h->type != bfd_link_hash_common)
return TRUE;