Move some of glibc sysincls to glibc-to-nothing.yml

commit_hash:dfb56553029f0234daef599d1a190cbe2502f0e9

7 files changed, 21 insertions, 20 deletions

diff --git a/build/sysincl/libc-to-nothing.yml b/build/sysincl/libc-to-nothing.yml
index a5222252e1..548cf5b613 100644
--- a/build/sysincl/libc-to-nothing.yml
+++ b/build/sysincl/libc-to-nothing.yml
@@ -10,7 +10,10 @@
   - arpa/telnet.h
   - arpa/tftp.h
   - assert.h
-  - bits/alltypes.h # not libc, but similar
+  - bits/endian.h
+  - bits/fenv.h
+  - bits/types.h
+  - bits/wordsize.h
   - byteswap.h
   - cpio.h
   - crypt.h
@@ -27,6 +30,8 @@
   - ftw.h
   - getopt.h
   - glob.h
+  - gnu-versions.h
+  - gnu/libc-version.h
   - grp.h
   - iconv.h
   - ifaddrs.h
@@ -59,6 +64,7 @@
   - netinet/udp.h
   - netpacket/packet.h
   - netrom/netrom.h
+  - netrose/rose.h
   - net/route.h
   - nl_types.h
   - paths.h
@@ -68,10 +74,13 @@
   - pwd.h
   - regex.h
   - resolv.h
+  - rpcsvc/yp_prot.h
+  - rpcsvc/ypclnt.h
   - sched.h
   - scsi/scsi.h
   - search.h
   - semaphore.h
+  - sgtty.h
   - shadow.h
   - signal.h
   - spawn.h
@@ -85,6 +94,7 @@
   - stropts.h
   - sys/acct.h
   - sys/auxv.h
+  - sys/bitypes.h
   - sys/cachectl.h
   - sys/cdefs.h
   - syscall.h
@@ -170,3 +180,8 @@
   - wait.h
   - wordexp.h
   - xlocale.h
+
+# These are musl-libc specific includes not present in glibc.
+# They are used by libcxxabi at the time, hence they should resolve to nothing in glibc-specific build
+- includes:
+  - bits/alltypes.h
diff --git a/build/sysincl/linux.yml b/build/sysincl/linux.yml
index 9ead852d6e..731cec61b8 100644
--- a/build/sysincl/linux.yml
+++ b/build/sysincl/linux.yml
@@ -7,20 +7,12 @@
   - argp.h
   - argz.h
   - bfd.h
-  - bits/endian.h
-  - bits/fenv.h
-  - bits/libc-lock.h
-  - bits/reg.h
-  - bits/types.h
-  - bits/wordsize.h
   - error.h
   - execinfo.h
   - fpu_control.h
   - fstab.h
   - fts.h
   - gconv.h
-  - gnu-versions.h
-  - gnu/libc-version.h
   - gshadow.h
   - ieee754.h
   - libio.h
@@ -30,13 +22,7 @@
   - netax25/ax25.h
   - neteconet/ec.h
   - netipx/ipx.h
-  - netrose/rose.h
   - nss.h
   - obstack.h
   - printf.h
   - regexp.h
-  - rpcsvc/yp_prot.h
-  - rpcsvc/ypclnt.h
-  - sgtty.h
-  - sys/bitypes.h
-  - sys/cdefs.h
diff --git a/contrib/tools/bison/lib/error.c b/contrib/tools/bison/lib/error.c
index 3657b51cdf..a2c8a4962b 100644
--- a/contrib/tools/bison/lib/error.c
+++ b/contrib/tools/bison/lib/error.c
@@ -86,7 +86,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # undef putc
 # define putc(c, fp) _IO_putc (c, fp)
 
-# include <bits/libc-lock.h>
+# error #include <bits/libc-lock.h>
 
 #else /* not _LIBC */
 
diff --git a/contrib/tools/m4/lib/error.c b/contrib/tools/m4/lib/error.c
index 3078dd1b51..ca9e61b41f 100644
--- a/contrib/tools/m4/lib/error.c
+++ b/contrib/tools/m4/lib/error.c
@@ -81,7 +81,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # undef putc
 # define putc(c, fp) INTUSE(_IO_putc) (c, fp)
 
-# include <bits/libc-lock.h>
+# error #include <bits/libc-lock.h>
 
 #else /* not _LIBC */
 
diff --git a/contrib/tools/m4/lib/regex_internal.h b/contrib/tools/m4/lib/regex_internal.h
index 6205dbe726..6185d1f832 100644
--- a/contrib/tools/m4/lib/regex_internal.h
+++ b/contrib/tools/m4/lib/regex_internal.h
@@ -34,7 +34,7 @@
 #include <stdint.h>
 
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# error #include <bits/libc-lock.h>
 # define lock_define(name) __libc_lock_define (, name)
 # define lock_init(lock) (__libc_lock_init (lock), 0)
 # define lock_fini(lock) 0
diff --git a/contrib/tools/m4/lib/strsignal.c b/contrib/tools/m4/lib/strsignal.c
index 20d604ff38..f26ece6ba6 100644
--- a/contrib/tools/m4/lib/strsignal.c
+++ b/contrib/tools/m4/lib/strsignal.c
@@ -35,7 +35,7 @@
 #endif /* _LIBC */
 
 #ifdef _LIBC
-# include <bits/libc-lock.h>
+# error #include <bits/libc-lock.h>
 #else /* !_LIBC */
 # include "glthread/lock.h"
 # include "glthread/tls.h"
diff --git a/contrib/tools/m4/lib/unsetenv.c b/contrib/tools/m4/lib/unsetenv.c
index c58c82f4f4..cfb800a992 100644
--- a/contrib/tools/m4/lib/unsetenv.c
+++ b/contrib/tools/m4/lib/unsetenv.c
@@ -37,7 +37,7 @@
 
 #if _LIBC
 /* This lock protects against simultaneous modifications of 'environ'.  */
-# include <bits/libc-lock.h>
+# error #include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
 # define UNLOCK __libc_lock_unlock (envlock)