OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libgomp: Fix up aligned_alloc arguments [PR102838] 

C says that aligned_alloc size must be an integral multiple of alignment.
While glibc doesn't care about it, apparently Solaris does.
So, this patch decreases the priority of aligned_alloc among the other
variants because it needs more work and can waste more memory and rounds
up the size to multiple of alignment.

2021-11-18  Jakub Jelinek  <jakub@redhat.com>

	PR libgomp/102838
	* alloc.c (gomp_aligned_alloc): Prefer _aligned_alloc over
	memalign over posix_memalign over aligned_alloc over fallback
	with malloc instead of aligned_alloc over _aligned_alloc over
	posix_memalign over memalign over fallback with malloc.  For
	aligned_alloc, round up size up to multiple of al.
This commit is contained in:
Jakub Jelinek 2021-11-18 09:07:31 +01:00
parent a72b7a455c
commit 7a2aa63fad
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libgomp/alloc.c
View File

@ -65,18 +65,24 @@ gomp_aligned_alloc (size_t al, size_t size)
void *ret; void *ret;
if (al < sizeof (void *)) if (al < sizeof (void *))
al = sizeof (void *); al = sizeof (void *);
#ifdef HAVE_ALIGNED_ALLOC #ifdef HAVE__ALIGNED_MALLOC
ret = aligned_alloc (al, size);
#elif defined(HAVE__ALIGNED_MALLOC)
ret = _aligned_malloc (size, al); ret = _aligned_malloc (size, al);
#elif defined(HAVE_POSIX_MEMALIGN)
if (posix_memalign (&ret, al, size) != 0)
ret = NULL;
#elif defined(HAVE_MEMALIGN) #elif defined(HAVE_MEMALIGN)
{ {
extern void *memalign (size_t, size_t); extern void *memalign (size_t, size_t);
ret = memalign (al, size); 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 #else
ret = NULL; ret = NULL;
if ((al & (al - 1)) == 0 && size) if ((al & (al - 1)) == 0 && size)