diff options
| author | Josh Gao <jmgao@google.com> | 2016-06-24 21:59:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-24 21:59:04 +0000 |
| commit | 46ba021a2b9a7ee9622bca5597e90e9aecea138c (patch) | |
| tree | f7e5826b55aa5e4ae82c1f341cc920629a43969c | |
| parent | ddc353fb83f96518c8d9a8926b2765d2d6b38f18 (diff) | |
| parent | 7a06b0c0a00c5c6b42cc3f95645845dbce8d18e4 (diff) | |
| download | development-46ba021a2b9a7ee9622bca5597e90e9aecea138c.tar.gz | |
Merge "Rename DT_MIPS_RLD_MAP2 flag to DT_MIPS_RLD_MAP_REL in NDK headers"
6 files changed, 6 insertions, 6 deletions
diff --git a/ndk/platforms/android-21/arch-mips/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-mips/include/machine/elf_machdep.h index 339cf20e3..115341c7c 100644 --- a/ndk/platforms/android-21/arch-mips/include/machine/elf_machdep.h +++ b/ndk/platforms/android-21/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 /* Address of run time loader map, used for debugging. */ +#define DT_MIPS_RLD_MAP_REL 0x70000035 /* Address of run time loader map, used for debugging. */ /* diff --git a/ndk/platforms/android-21/arch-mips/include/machine/exec.h b/ndk/platforms/android-21/arch-mips/include/machine/exec.h index 88f82f4ad..279bc16f5 100644 --- a/ndk/platforms/android-21/arch-mips/include/machine/exec.h +++ b/ndk/platforms/android-21/arch-mips/include/machine/exec.h @@ -91,7 +91,7 @@ #define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in .dynsym */ #define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */ #define DT_MIPS_RLD_MAP 0x70000016 /* Address of debug map pointer */ -#define DT_MIPS_RLD_MAP2 0x70000035 /* Address of run time loader map, used for debugging. */ +#define DT_MIPS_RLD_MAP_REL 0x70000035 /* Address of run time loader map, used for debugging. */ #define DT_PROCNUM (DT_MIPS_RLD_MAP - DT_LOPROC + 1) diff --git a/ndk/platforms/android-21/arch-mips64/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-mips64/include/machine/elf_machdep.h index 26fd1f123..a819e6e63 100644 --- a/ndk/platforms/android-21/arch-mips64/include/machine/elf_machdep.h +++ b/ndk/platforms/android-21/arch-mips64/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 /* Address of run time loader map, used for debugging. */ +#define DT_MIPS_RLD_MAP_REL 0x70000035 /* Address of run time loader map, used for debugging. */ /* * ELF Flags diff --git a/ndk/platforms/android-21/arch-mips64/include/machine/exec.h b/ndk/platforms/android-21/arch-mips64/include/machine/exec.h index 88f82f4ad..279bc16f5 100644 --- a/ndk/platforms/android-21/arch-mips64/include/machine/exec.h +++ b/ndk/platforms/android-21/arch-mips64/include/machine/exec.h @@ -91,7 +91,7 @@ #define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in .dynsym */ #define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */ #define DT_MIPS_RLD_MAP 0x70000016 /* Address of debug map pointer */ -#define DT_MIPS_RLD_MAP2 0x70000035 /* Address of run time loader map, used for debugging. */ +#define DT_MIPS_RLD_MAP_REL 0x70000035 /* Address of run time loader map, used for debugging. */ #define DT_PROCNUM (DT_MIPS_RLD_MAP - DT_LOPROC + 1) diff --git a/ndk/platforms/android-9/arch-mips/include/asm/elf.h b/ndk/platforms/android-9/arch-mips/include/asm/elf.h index 831f54c59..8a3a87d18 100644 --- a/ndk/platforms/android-9/arch-mips/include/asm/elf.h +++ b/ndk/platforms/android-9/arch-mips/include/asm/elf.h @@ -70,7 +70,7 @@ #define DT_MIPS_GOTSYM 0x70000013 #define DT_MIPS_HIPAGENO 0x70000014 #define DT_MIPS_RLD_MAP 0x70000016 -#define DT_MIPS_RLD_MAP2 0x70000035 +#define DT_MIPS_RLD_MAP_REL 0x70000035 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define R_MIPS_NONE 0 diff --git a/ndk/platforms/android-9/arch-mips/include/machine/exec.h b/ndk/platforms/android-9/arch-mips/include/machine/exec.h index 88f82f4ad..279bc16f5 100644 --- a/ndk/platforms/android-9/arch-mips/include/machine/exec.h +++ b/ndk/platforms/android-9/arch-mips/include/machine/exec.h @@ -91,7 +91,7 @@ #define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in .dynsym */ #define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */ #define DT_MIPS_RLD_MAP 0x70000016 /* Address of debug map pointer */ -#define DT_MIPS_RLD_MAP2 0x70000035 /* Address of run time loader map, used for debugging. */ +#define DT_MIPS_RLD_MAP_REL 0x70000035 /* Address of run time loader map, used for debugging. */ #define DT_PROCNUM (DT_MIPS_RLD_MAP - DT_LOPROC + 1) |