summaryrefslogtreecommitdiffstats
path: root/linker
diff options
context:
space:
mode:
authorShylender Gaddamwar <c_shylen@quicinc.com>2009-10-05 11:00:26 -0700
committerShylender Gaddamwar <c_shylen@quicinc.com>2009-10-05 11:00:26 -0700
commitdce33c3a81a3e06072c6b5b855ee06d43fc272db (patch)
tree55173212f18cacb10fd5355cd53171763e30b623 /linker
parente984c60716eeac062736d5961d9f48248ad7bfa1 (diff)
parent5cef9a85b8763e1ea00ae65256e20d1377d5d27f (diff)
downloadbionic-dce33c3a81a3e06072c6b5b855ee06d43fc272db.zip
bionic-dce33c3a81a3e06072c6b5b855ee06d43fc272db.tar.gz
bionic-dce33c3a81a3e06072c6b5b855ee06d43fc272db.tar.bz2
Merge branch 'donut_au409' into donut_glazed01Q8650BSDCANLYA320004
Diffstat (limited to 'linker')
-rw-r--r--linker/linker.c2
-rw-r--r--linker/linker.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/linker/linker.c b/linker/linker.c
index 292cf46..789a828 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -698,7 +698,7 @@ get_lib_extents(int fd, const char *name, void *__hdr, unsigned *total_sz)
static int reserve_mem_region(soinfo *si)
{
void *base = mmap((void *)si->base, si->size, PROT_READ | PROT_EXEC,
- MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS, -1, 0);
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (base == MAP_FAILED) {
DL_ERR("%5d can NOT map (%sprelinked) library '%s' at 0x%08x "
"as requested, will try general pool: %d (%s)",
diff --git a/linker/linker.h b/linker/linker.h
index ec7e139..77044bf 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -147,8 +147,8 @@ struct soinfo
extern soinfo libdl_info;
/* these must all be powers of two */
-#define LIBBASE 0x10000000
-#define LIBLAST 0x20000000
+#define LIBBASE 0x40000000
+#define LIBLAST 0x50000000
#define LIBINC 0x00100000