Bug#953083: __glibc_has_include macro needs to be restored until GCC is rebuilt

[Matthias Klose <doko@debian.org>]

Package: src:glibc
Version: 2.30-0experimental2
Severity: important
Tags: sid bullseye patch

The __glibc_has_include macro needs to be restored until GCC is rebuilt. At
least on s390x, you get a non-wrorking compiler, which at least cannot glibc
anymore.  The macro is still referenced in the include-fixed directory.

Seen with the 2.31 branch, but I see that this is also backported to 2.30.

Index: b/misc/sys/cdefs.h
===================================================================
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -412,6 +412,14 @@
 # define __glibc_has_attribute(attr)	0
 #endif
 
+#ifdef __has_include
+/* Do not use a function-like macro, so that __has_include can inhibit
+   macro expansion.  */
+# define __glibc_has_include __has_include
+#else
+# define __glibc_has_include(header)   0
+#endif
+
 #if (!defined _Noreturn \
      && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112 \
      &&  !__GNUC_PREREQ (4,7))