diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-02-20 09:03:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-20 09:03:52 +0000 |
| commit | c7931763d41be602407ed9d71e2c0292c6597e00 (patch) | |
| tree | f18a8fa32df62c4e64e2f0620c7a922c0ed7ee61 | |
| parent | bc2ab27d08ddff3b0e2e5085f0754d17b1a5597f (diff) | |
| parent | 03732dc8db08a1ff13ac97ec7a9e47d50b35f062 (diff) | |
| download | i686-linux-android-4.7-jb-mr2-dev.tar.gz | |
Merge "Use memalign instead of posix_memalign in GCC x86 mm_malloc.h"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2tools_r22l-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospidea133-weekly-releaseidea133
| -rw-r--r-- | lib/gcc/i686-linux-android/4.7/include/mm_malloc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gcc/i686-linux-android/4.7/include/mm_malloc.h b/lib/gcc/i686-linux-android/4.7/include/mm_malloc.h index 0a9f2e2..fcc0f80 100644 --- a/lib/gcc/i686-linux-android/4.7/include/mm_malloc.h +++ b/lib/gcc/i686-linux-android/4.7/include/mm_malloc.h @@ -26,6 +26,7 @@ #include <stdlib.h> +#if !defined(__ANDROID__) || defined(HAVE_POSIX_MEMALIGN) /* We can't depend on <stdlib.h> since the prototype of posix_memalign may not be visible. */ #ifndef __cplusplus @@ -33,6 +34,7 @@ extern int posix_memalign (void **, size_t, size_t); #else extern "C" int posix_memalign (void **, size_t, size_t) throw (); #endif +#endif static __inline void * _mm_malloc (size_t size, size_t alignment) @@ -42,10 +44,14 @@ _mm_malloc (size_t size, size_t alignment) return malloc (size); if (alignment == 2 || (sizeof (void *) == 8 && alignment == 4)) alignment = sizeof (void *); +#if !defined(__ANDROID__) || defined(HAVE_POSIX_MEMALIGN) if (posix_memalign (&ptr, alignment, size) == 0) return ptr; else return NULL; +#else + return memalign(alignment, size); +#endif } static __inline void |