summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikola Veljkovic <Nikola.Veljkovic@imgtec.com>2016-04-20 14:32:47 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2016-04-20 14:32:47 (GMT)
commit1e5714ccaf589fc08d1d5e0335c512b8ce5b3034 (patch)
treef9072b62a15a564ddcffc35e979f6973243234b7
parent3186005e6155741a42bd686442ea312504f8f9be (diff)
parentba7ec7f29961e88bc83e2f18cbdc54aa7f39e78d (diff)
downloadtoolchain_binutils-1e5714ccaf589fc08d1d5e0335c512b8ce5b3034.zip
toolchain_binutils-1e5714ccaf589fc08d1d5e0335c512b8ce5b3034.tar.gz
toolchain_binutils-1e5714ccaf589fc08d1d5e0335c512b8ce5b3034.tar.bz2
Revert "Add support for the new tag DT_MIPS_RLD_MAP2." am: 42704eb
am: ba7ec7f * commit 'ba7ec7f29961e88bc83e2f18cbdc54aa7f39e78d': Revert "Add support for the new tag DT_MIPS_RLD_MAP2." Change-Id: Idd296cd03815f21b2f44b598e03106ca14c63eab
-rw-r--r--binutils-2.25/bfd/elfxx-mips.c33
-rw-r--r--binutils-2.25/binutils/readelf.c1
-rw-r--r--binutils-2.25/include/elf/mips.h3
3 files changed, 3 insertions, 34 deletions
diff --git a/binutils-2.25/bfd/elfxx-mips.c b/binutils-2.25/bfd/elfxx-mips.c
index 2f46602..a876ff3 100644
--- a/binutils-2.25/bfd/elfxx-mips.c
+++ b/binutils-2.25/bfd/elfxx-mips.c
@@ -7616,7 +7616,7 @@ _bfd_mips_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
htab->sstubs = s;
if (!mips_elf_hash_table (info)->use_rld_obj_head
- && info->executable
+ && !info->shared
&& bfd_get_linker_section (abfd, ".rld_map") == NULL)
{
s = bfd_make_section_anyway_with_flags (abfd, ".rld_map",
@@ -7680,7 +7680,7 @@ _bfd_mips_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
(void) bfd_set_section_alignment (abfd, s, MIPS_ELF_LOG_FILE_ALIGN (abfd));
}
- if (info->executable)
+ if (!info->shared)
{
const char *name;
@@ -9721,7 +9721,7 @@ _bfd_mips_elf_size_dynamic_sections (bfd *output_bfd,
info->combreloc = 0;
}
}
- else if (info->executable
+ else if (! info->shared
&& ! mips_elf_hash_table (info)->use_rld_obj_head
&& CONST_STRNEQ (name, ".rld_map"))
{
@@ -9784,10 +9784,6 @@ _bfd_mips_elf_size_dynamic_sections (bfd *output_bfd,
&& !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_RLD_MAP, 0))
return FALSE;
- if (info->executable
- && !MIPS_ELF_ADD_DYNAMIC_ENTRY (info, DT_MIPS_RLD_MAP2, 0))
- return FALSE;
-
/* The DT_DEBUG entry may be filled in by the dynamic linker and
used by the debugger. */
if (info->executable
@@ -11501,27 +11497,6 @@ _bfd_mips_elf_finish_dynamic_sections (bfd *output_bfd,
}
break;
- case DT_MIPS_RLD_MAP2:
- {
- struct elf_link_hash_entry *h;
- bfd_vma dt_addr, rld_addr;
- h = mips_elf_hash_table (info)->rld_symbol;
- if (!h)
- {
- dyn_to_skip = MIPS_ELF_DYN_SIZE (dynobj);
- swap_out_p = FALSE;
- break;
- }
- s = h->root.u.def.section;
-
- dt_addr = (sdyn->output_section->vma + sdyn->output_offset
- + b - sdyn->contents);
- rld_addr = (s->output_section->vma + s->output_offset
- + h->root.u.def.value);
- dyn.d_un.d_ptr = rld_addr - dt_addr;
- }
- break;
-
case DT_MIPS_OPTIONS:
s = (bfd_get_section_by_name
(output_bfd, MIPS_ELF_OPTIONS_SECTION_NAME (output_bfd)));
@@ -15446,8 +15421,6 @@ _bfd_mips_elf_get_target_dtag (bfd_vma dtag)
return "MIPS_HIPAGENO";
case DT_MIPS_RLD_MAP:
return "MIPS_RLD_MAP";
- case DT_MIPS_RLD_MAP2:
- return "MIPS_RLD_MAP2";
case DT_MIPS_DELTA_CLASS:
return "MIPS_DELTA_CLASS";
case DT_MIPS_DELTA_CLASS_NO:
diff --git a/binutils-2.25/binutils/readelf.c b/binutils-2.25/binutils/readelf.c
index 83518c7..5ddcb55 100644
--- a/binutils-2.25/binutils/readelf.c
+++ b/binutils-2.25/binutils/readelf.c
@@ -1618,7 +1618,6 @@ get_mips_dynamic_type (unsigned long type)
case DT_MIPS_GOTSYM: return "MIPS_GOTSYM";
case DT_MIPS_HIPAGENO: return "MIPS_HIPAGENO";
case DT_MIPS_RLD_MAP: return "MIPS_RLD_MAP";
- case DT_MIPS_RLD_MAP2: return "MIPS_RLD_MAP2";
case DT_MIPS_DELTA_CLASS: return "MIPS_DELTA_CLASS";
case DT_MIPS_DELTA_CLASS_NO: return "MIPS_DELTA_CLASS_NO";
case DT_MIPS_DELTA_INSTANCE: return "MIPS_DELTA_INSTANCE";
diff --git a/binutils-2.25/include/elf/mips.h b/binutils-2.25/include/elf/mips.h
index 87704e0..22aefa6 100644
--- a/binutils-2.25/include/elf/mips.h
+++ b/binutils-2.25/include/elf/mips.h
@@ -748,9 +748,6 @@ extern void bfd_mips_elf32_swap_reginfo_out
/* Points to the base of a writable PLT. */
#define DT_MIPS_RWPLT 0x70000034
-
-/* Address of run time loader map, used for debugging. */
-#define DT_MIPS_RLD_MAP2 0x70000035
/* Flags which may appear in a DT_MIPS_FLAGS entry. */