aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog8
-rw-r--r--ld/emultempl/alphaelf.em2
-rw-r--r--ld/emultempl/hppaelf.em3
-rw-r--r--ld/emultempl/mipself.em2
-rw-r--r--ld/emultempl/ppc32elf.em2
-rw-r--r--ld/emultempl/ppc64elf.em2
6 files changed, 14 insertions, 5 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index c40683b..02aa879 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-03 Nick Clifton <nickc@redhat.com>
+
+ * emultempl/alphaelf.em: Update value expected from elf_object_id.
+ * emultempl/hppaelf.em: Likewise.
+ * emultempl/mipself.em: Likewise.
+ * emultempl/ppc32elf.em: Likewise.
+ * emultempl/ppc64elf.em: Likewise.
+
2010-02-03 Alan Modra <amodra@gmail.com>
* emultempl/ppc64elf.em (build_toc_list): Report errors from
diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em
index 7b7c8d7..21064ad 100644
--- a/ld/emultempl/alphaelf.em
+++ b/ld/emultempl/alphaelf.em
@@ -41,7 +41,7 @@ static void
alpha_after_open (void)
{
if (bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour
- && elf_object_id (link_info.output_bfd) == ALPHA_ELF_TDATA)
+ && elf_object_id (link_info.output_bfd) == ALPHA_ELF_DATA)
{
unsigned int num_plt;
lang_output_section_statement_type *os;
diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index 3ce5d54..1137ba2 100644
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -70,7 +70,8 @@ static void
hppaelf_create_output_section_statements (void)
{
if (!(bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour
- && elf_object_id (link_info.output_bfd) == HPPA_ELF_TDATA))
+ && (elf_object_id (link_info.output_bfd) == HPPA32_ELF_DATA
+ || elf_object_id (link_info.output_bfd) == HPPA64_ELF_DATA)))
return;
stub_file = lang_add_input_file ("linker stubs",
diff --git a/ld/emultempl/mipself.em b/ld/emultempl/mipself.em
index 65cb073..7a13d4d 100644
--- a/ld/emultempl/mipself.em
+++ b/ld/emultempl/mipself.em
@@ -27,7 +27,7 @@ fragment <<EOF
#define is_mips_elf(bfd) \
(bfd_get_flavour (bfd) == bfd_target_elf_flavour \
&& elf_tdata (bfd) != NULL \
- && elf_object_id (bfd) == MIPS_ELF_TDATA)
+ && elf_object_id (bfd) == MIPS_ELF_DATA)
/* Fake input file for stubs. */
static lang_input_statement_type *stub_file;
diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em
index 9ff81f5..36f9df2 100644
--- a/ld/emultempl/ppc32elf.em
+++ b/ld/emultempl/ppc32elf.em
@@ -29,7 +29,7 @@ fragment <<EOF
#define is_ppc_elf(bfd) \
(bfd_get_flavour (bfd) == bfd_target_elf_flavour \
- && elf_object_id (bfd) == PPC32_ELF_TDATA)
+ && elf_object_id (bfd) == PPC32_ELF_DATA)
/* Whether to run tls optimization. */
static int notlsopt = 0;
diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
index a11f300..9532b29 100644
--- a/ld/emultempl/ppc64elf.em
+++ b/ld/emultempl/ppc64elf.em
@@ -74,7 +74,7 @@ static void
ppc_create_output_section_statements (void)
{
if (!(bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour
- && elf_object_id (link_info.output_bfd) == PPC64_ELF_TDATA))
+ && elf_object_id (link_info.output_bfd) == PPC64_ELF_DATA))
return;
link_info.wrap_char = '.';