diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-08-11 09:51:10 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2011-08-11 09:51:10 +0400 |
| commit | 70ad46f919214c40d315310d6be7ad1fca60b44a (patch) | |
| tree | 4b1a02ee10db07615e9f4a3591d0fccb84a1afe0 | |
| parent | df7636d9aeecf6800792f3036f751ba8df45cfea (diff) | |
| parent | 48303e96bc26c8e128e4c8a7992e174902855da3 (diff) | |
| download | bionic-70ad46f919214c40d315310d6be7ad1fca60b44a.zip bionic-70ad46f919214c40d315310d6be7ad1fca60b44a.tar.gz bionic-70ad46f919214c40d315310d6be7ad1fca60b44a.tar.bz2 | |
Merge "Enable use of clz instruction in ffs function for all ARMv5+" into gingerbread
| -rw-r--r-- | libc/arch-arm/bionic/ffs.S | 2 | ||||
| -rw-r--r-- | libc/bionic/dlmalloc.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libc/arch-arm/bionic/ffs.S b/libc/arch-arm/bionic/ffs.S index f11141c..c7ffca2 100644 --- a/libc/arch-arm/bionic/ffs.S +++ b/libc/arch-arm/bionic/ffs.S @@ -47,7 +47,7 @@ ENTRY(ffs) /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */ rsb r1, r0, #0 ands r0, r0, r1 -#ifndef __ARM_ARCH_5__ +#if _ARM_ARCH_ < 5 /* * now r0 has at most one set bit, call this X * if X = 0, all further instructions are skipped diff --git a/libc/bionic/dlmalloc.c b/libc/bionic/dlmalloc.c index 19fbb75..559ccaf 100644 --- a/libc/bionic/dlmalloc.c +++ b/libc/bionic/dlmalloc.c @@ -465,6 +465,10 @@ DEFAULT_MMAP_THRESHOLD default: 256K */ +#ifdef ANDROID +#define USE_BUILTIN_FFS 1 +#endif /* ANDROID */ + #ifndef WIN32 #ifdef _WIN32 #define WIN32 1 |