commit f9a9cda23a6afc1c2dfdfd624cde23b61941eb5e
author Nick Kralevich <nnk@google.com> Fri Jul 15 16:12:45 2011 -0700
committer Nick Kralevich <nnk@google.com> Fri Jul 15 16:12:45 2011 -0700
tree b0a12123fbfa78be81e8b9c9965e964f593606c0
parent 7059b1f02ea9197728c851edd9ae0dd7688fa700

Revert "linker: get rid of the buddy allocator"

This reverts commit 7059b1f02ea9197728c851edd9ae0dd7688fa700.
Bug: 5036610

linker/linker.h

diff --git a/linker/linker.h b/linker/linker.h
index 301d268..68ac275 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -83,6 +83,7 @@
 #define FLAG_LINKED     0x00000001
 #define FLAG_ERROR      0x00000002
 #define FLAG_EXE        0x00000004 // The main executable
+#define FLAG_PRELINKED  0x00000008 // This is a pre-linked lib
 
 #define SOINFO_NAME_LEN 128
 
@@ -94,6 +95,8 @@
     unsigned entry;
     unsigned base;
     unsigned size;
+    // buddy-allocator index, negative for prelinked libraries
+    int ba_index;
 
     unsigned *dynamic;
 
@@ -151,6 +154,17 @@
 
 extern soinfo libdl_info;
 
+/* these must all be powers of two */
+#ifdef ARCH_SH
+#define LIBBASE 0x60000000
+#define LIBLAST 0x70000000
+#define LIBINC  0x00100000
+#else
+#define LIBBASE 0x80000000
+#define LIBLAST 0x90000000
+#define LIBINC  0x00100000
+#endif
+
 #ifdef ANDROID_ARM_LINKER
 
 #define R_ARM_COPY       20