@@ -65,18 +65,24 @@ gomp_aligned_alloc (size_t al, size_t si
void *ret;
if (al < sizeof (void *))
al = sizeof (void *);
-#ifdef HAVE_ALIGNED_ALLOC
- ret = aligned_alloc (al, size);
-#elif defined(HAVE__ALIGNED_MALLOC)
+#ifdef HAVE__ALIGNED_MALLOC
ret = _aligned_malloc (size, al);
-#elif defined(HAVE_POSIX_MEMALIGN)
- if (posix_memalign (&ret, al, size) != 0)
- ret = NULL;
#elif defined(HAVE_MEMALIGN)
{
extern void *memalign (size_t, size_t);
ret = memalign (al, size);
}
+#elif defined(HAVE_POSIX_MEMALIGN)
+ if (posix_memalign (&ret, al, size) != 0)
+ ret = NULL;
+#lif defined(HAVE_ALIGNED_ALLOC)
+ {
+ size_t sz = (size + al - 1) & ~(al - 1);
+ if (__builtin_expect (sz >= size, 1))
+ ret = aligned_alloc (al, sz);
+ else
+ ret = NULL;
+ }
#else
ret = NULL;
if ((al & (al - 1)) == 0 && size)