Fix alloc_align and alloc_size macros for multiple arguments

https://sourceware.org/ml/newlib/2018/msg00263.html

This is a follow-up to commit 4564b30f331a067e71b25308ac7c8a85ceb4b122.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 593760a12f7ae6daacc3425211bf567bfd616355..564ce8a288d3ddedb9e5c056c263bca9f28fd1e5 100644 (file)
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -324,8 +324,8 @@ extern long double strtold (const char *__restrict, char **__restrict);
  * If we're in a mode greater than C99, expose C11 functions.
  */
 #if __ISO_C_VISIBLE >= 2011
-void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1)
-           __alloc_size(2);
+void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align((1))
+           __alloc_size((2));
 int    at_quick_exit(void (*)(void));
 _Noreturn void
        quick_exit(int);

diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h
index fc564a5c602be4d328e525dd5f19e4ee58bb4406..b3f8d1965d49dde39e9d529b6d6ad821eb4b7b9c 100644 (file)
--- a/newlib/libc/include/sys/cdefs.h
+++ b/newlib/libc/include/sys/cdefs.h
@@ -258,12 +258,12 @@
 #define        __section(x)    __attribute__((__section__(x)))
 #endif
 #if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__)
-#define        __alloc_size(x) __attribute__((__alloc_size__(x)))
+#define        __alloc_size(x) __attribute__((__alloc_size__ x))
 #else
 #define        __alloc_size(x)
 #endif
 #if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__)
-#define        __alloc_align(x)        __attribute__((__alloc_align__(x)))
+#define        __alloc_align(x)        __attribute__((__alloc_align__ x))
 #else
 #define        __alloc_align(x)
 #endif