Merge "Use memalign instead of posix_memalign in GCC x86 mm_malloc.h"
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 @@
#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 @@
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
