summaryrefslogtreecommitdiffstats
path: root/linker/linker.h
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-01-12 15:18:05 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2010-01-12 15:18:05 -0800
commita809abb086b5cb5cd5545048b12f64b899c6a253 (patch)
tree72403af0ef4438c5d8974622bb9b98602879a7d8 /linker/linker.h
parent194d3fa048cf909ca592dd56fa538dc9cd3f5ddb (diff)
downloadbionic-a809abb086b5cb5cd5545048b12f64b899c6a253.zip
bionic-a809abb086b5cb5cd5545048b12f64b899c6a253.tar.gz
bionic-a809abb086b5cb5cd5545048b12f64b899c6a253.tar.bz2
android-2.1_r1 snapshot
Diffstat (limited to 'linker/linker.h')
-rw-r--r--linker/linker.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/linker/linker.h b/linker/linker.h
index d289c81..551cf93 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -159,6 +159,13 @@ extern soinfo libdl_info;
#define R_ARM_JUMP_SLOT 22
#define R_ARM_RELATIVE 23
+/* According to the AAPCS specification, we only
+ * need the above relocations. However, in practice,
+ * the following ones turn up from time to time.
+ */
+#define R_ARM_ABS32 2
+#define R_ARM_REL32 3
+
#elif defined(ANDROID_X86_LINKER)
#define R_386_32 1
@@ -194,12 +201,6 @@ extern soinfo libdl_info;
#define DT_PREINIT_ARRAYSZ 33
#endif
-/* in theory we only need the above relative relocations,
- but in practice the following one turns up from time
- to time. fushigi na.
-*/
-#define R_ARM_ABS32 2
-
soinfo *find_library(const char *name);
unsigned unload_library(soinfo *si);
Elf32_Sym *lookup_in_library(soinfo *si, const char *name);