Rename DT_MIPS_RLD_MAP2 flag to DT_MIPS_RLD_MAP_REL
Change-Id: I2c0972f5ce3586c3f4f130034f7063f97557ab4e
diff --git a/libc/arch-mips/include/machine/elf_machdep.h b/libc/arch-mips/include/machine/elf_machdep.h
index 0aacedf..4db087b 100644
--- a/libc/arch-mips/include/machine/elf_machdep.h
+++ b/libc/arch-mips/include/machine/elf_machdep.h
@@ -121,7 +121,7 @@
#define DT_MIPS_GOTSYM 0x70000013 /* first dynamic sym in got */
#define DT_MIPS_HIPAGENO 0x70000014
#define DT_MIPS_RLD_MAP 0x70000016 /* address of loader map */
-#define DT_MIPS_RLD_MAP2 0x70000035 /* offset of loader map, used for PIE */
+#define DT_MIPS_RLD_MAP_REL 0x70000035 /* offset of loader map, used for PIE */
/*
* ELF Flags
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 855b32b..93fab8f 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3634,8 +3634,8 @@
*dp = &_r_debug;
}
break;
- case DT_MIPS_RLD_MAP2:
- // Set the DT_MIPS_RLD_MAP2 entry to the address of _r_debug for GDB.
+ case DT_MIPS_RLD_MAP_REL:
+ // Set the DT_MIPS_RLD_MAP_REL entry to the address of _r_debug for GDB.
{
r_debug** dp = reinterpret_cast<r_debug**>(
reinterpret_cast<ElfW(Addr)>(d) + d->d_un.d_val);
diff --git a/tools/relocation_packer/src/elf_file.cc b/tools/relocation_packer/src/elf_file.cc
index 014883d..96e6efd 100644
--- a/tools/relocation_packer/src/elf_file.cc
+++ b/tools/relocation_packer/src/elf_file.cc
@@ -552,11 +552,11 @@
<< " d_val adjusted to " << dynamic->d_un.d_val;
}
- // Special case: DT_MIPS_RLD_MAP2 stores the difference between dynamic
+ // Special case: DT_MIPS_RLD_MAP_REL stores the difference between dynamic
// entry address and the address of the _r_debug (used by GDB)
// since the dynamic section and target address are on the
// different sides of the hole it needs to be adjusted accordingly
- if (tag == DT_MIPS_RLD_MAP2) {
+ if (tag == DT_MIPS_RLD_MAP_REL) {
dynamic->d_un.d_val += hole_size;
VLOG(1) << "dynamic[" << i << "] " << dynamic->d_tag
<< " d_val adjusted to " << dynamic->d_un.d_val;
diff --git a/tools/relocation_packer/src/elf_traits.h b/tools/relocation_packer/src/elf_traits.h
index 1c938fa..3e282b2 100644
--- a/tools/relocation_packer/src/elf_traits.h
+++ b/tools/relocation_packer/src/elf_traits.h
@@ -10,8 +10,8 @@
#include "elf.h"
#include "libelf.h"
-#if !defined(DT_MIPS_RLD_MAP2)
-#define DT_MIPS_RLD_MAP2 0x70000035
+#if !defined(DT_MIPS_RLD_MAP_REL)
+#define DT_MIPS_RLD_MAP_REL 0x70000035
#endif
// ELF is a traits structure used to provide convenient aliases for