[PATCH] libc-config: merge from glibc

[Paul Eggert]

* lib/cdefs.h (__glibc_has_attribute): New macro.
---
 ChangeLog   | 3 +++
 lib/cdefs.h | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 31cf9791d..dcabc939b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-10-15  Paul Eggert  <address@hidden>
 
+       libc-config: merge from glibc
+       * lib/cdefs.h (__glibc_has_attribute): New macro.
+
        regex: depend on libc-config
        * modules/regex (Depends-on): Add libc-config.
        This is needed after the recent autoupdate from glibc.
diff --git a/lib/cdefs.h b/lib/cdefs.h
index b16453124..98cf74995 100644
--- a/lib/cdefs.h
+++ b/lib/cdefs.h
@@ -409,6 +409,12 @@
 # define __glibc_likely(cond)  (cond)
 #endif
 
+#ifdef __has_attribute
+# define __glibc_has_attribute(attr)   __has_attribute (attr)
+#else
+# define __glibc_has_attribute(attr)   0
+#endif
+
 #if (!defined _Noreturn \
      && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
      &&  !__GNUC_PREREQ (4,7))
-- 
2.17.2