[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] libc-config: update to match cdefs
From: |
Paul Eggert |
Subject: |
[PATCH 2/2] libc-config: update to match cdefs |
Date: |
Thu, 5 May 2022 15:16:45 -0700 |
* lib/libc-config.h (__attribute_alloc_align__)
(__attribute_maybe_unused, __fortified_attr_access)
(__glibc_fortify, __glibc_fortify_n, __glibc_likely)
(__glibc_safe_len_cond, __glibc_safe_or_unknown_len)
(__glibc_unsafe_len, __glibc_unsigned_or_positive, __wur):
Undef these too, since lib/cdefs.h now defines them
unconditionally.
---
ChangeLog | 9 +++++++++
lib/libc-config.h | 11 +++++++++++
2 files changed, 20 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index f1a154027a..ea2c24dee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2022-05-05 Paul Eggert <eggert@cs.ucla.edu>
+ libc-config: update to match cdefs
+ * lib/libc-config.h (__attribute_alloc_align__)
+ (__attribute_maybe_unused, __fortified_attr_access)
+ (__glibc_fortify, __glibc_fortify_n, __glibc_likely)
+ (__glibc_safe_len_cond, __glibc_safe_or_unknown_len)
+ (__glibc_unsafe_len, __glibc_unsigned_or_positive, __wur):
+ Undef these too, since lib/cdefs.h now defines them
+ unconditionally.
+
cdefs: merge from glibc
* lib/cdefs.h (__glibc_safe_or_unknown_len):
Use glibc’s newer version.
diff --git a/lib/libc-config.h b/lib/libc-config.h
index 8fec489378..a56665b1ce 100644
--- a/lib/libc-config.h
+++ b/lib/libc-config.h
@@ -121,6 +121,7 @@
# undef __attr_dealloc
# undef __attr_dealloc_free
# undef __attribute__
+# undef __attribute_alloc_align__
# undef __attribute_alloc_size__
# undef __attribute_artificial__
# undef __attribute_const__
@@ -129,6 +130,7 @@
# undef __attribute_format_arg__
# undef __attribute_format_strfmon__
# undef __attribute_malloc__
+# undef __attribute_maybe_unused__
# undef __attribute_noinline__
# undef __attribute_nonstring__
# undef __attribute_pure__
@@ -142,16 +144,24 @@
# undef __extern_always_inline
# undef __extern_inline
# undef __flexarr
+# undef __fortified_attr_access
# undef __fortify_function
# undef __glibc_c99_flexarr_available
+# undef __glibc_fortify
+# undef __glibc_fortify_n
# undef __glibc_has_attribute
# undef __glibc_has_builtin
# undef __glibc_has_extension
+# undef __glibc_likely
# undef __glibc_macro_warning
# undef __glibc_macro_warning1
# undef __glibc_objsize
# undef __glibc_objsize0
+# undef __glibc_safe_len_cond
+# undef __glibc_safe_or_unknown_len
# undef __glibc_unlikely
+# undef __glibc_unsafe_len
+# undef __glibc_unsigned_or_positive
# undef __inline
# undef __ptr_t
# undef __restrict
@@ -159,6 +169,7 @@
# undef __va_arg_pack
# undef __va_arg_pack_len
# undef __warnattr
+# undef __wur
/* Include our copy of glibc <sys/cdefs.h>. */
# include <cdefs.h>
--
2.35.1