[git commit] ldso: use ADDR_ALIGN instead of hard-coded value

Carmelo Amoroso carmelo.amoroso at st.com
Fri Jul 1 07:49:47 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=289d19f45d7f8af9a4079938a3426aafdd2674ba
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Use ADDR_ALIGN to align the minvma when loading shared libraries instead
of the hard coded 0xffffU value.
This fixes teh stand/alone support on ARM as reported in bug #3133.

Signed-off-by: Sven Ola <sven-ola at gmx.de>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
(cherry picked from commit 435471db8561e4686e5921b7f719ab6d5a0d06f7)

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 ldso/ldso/dl-elf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index d72dd5a..5d49e07 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -474,7 +474,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
 	DL_CHECK_LIB_TYPE (epnt, piclib, _dl_progname, libname);
 
 	maxvma = (maxvma + ADDR_ALIGN) & PAGE_ALIGN;
-	minvma = minvma & ~0xffffU;
+	minvma = minvma & ~ADDR_ALIGN;
 
 	flags = MAP_PRIVATE /*| MAP_DENYWRITE */ ;
 
-- 
1.7.3.4



More information about the uClibc-cvs mailing list