Get rid of build/sysincl/linux.yml

commit_hash:97fa41cd5275a225e78ee11b14b34ac670cd8a8c

build/conf/sysincl.conf

@@ -4,7 +4,6 @@ SYSINCL+=build/sysincl/libc-to-compat.yml
 SYSINCL+=build/sysincl/libc-to-nothing.yml
 SYSINCL+=build/sysincl/stl-to-libstdcxx.yml
 SYSINCL+=build/sysincl/stl-to-nothing.yml
-SYSINCL+=build/sysincl/linux.yml
 SYSINCL+=build/sysincl/windows.yml
 SYSINCL+=build/sysincl/darwin.yml
 SYSINCL+=build/sysincl/android.yml

build/sysincl/libc-to-nothing.yml

@@ -1,9 +1,13 @@
 # We want musl to resolve itself without these sysincls, but its test must have them
 - source_filter: "^(?!contrib/libs/musl).*|^contrib/libs/musl/tests"
   includes:
+  - a.out.h
   - aio.h
+  - aliases.h
   - alloca.h
   - ar.h
+  - argp.h
+  - argz.h
   - arpa/inet.h
   - arpa/nameser_compat.h
   - arpa/nameser.h
@@ -22,18 +26,26 @@
   - elf.h
   - endian.h
   - err.h
+  - error.h
+  - execinfo.h
   - fcntl.h
   - features.h
   - fenv.h
   - fmtmsg.h
   - fnmatch.h
+  - fpu_control.h
+  - fstab.h
+  - fts.h
   - ftw.h
+  - gconv.h
   - getopt.h
   - glob.h
   - gnu-versions.h
   - gnu/libc-version.h
   - grp.h
+  - gshadow.h
   - iconv.h
+  - ieee754.h
   - ifaddrs.h
   - iso646.h
   - langinfo.h
@@ -42,6 +54,7 @@
   - libintl.h
   - link.h
   - malloc.h
+  - mcheck.h
   - memory.h
   - mntent.h
   - monetary.h
@@ -51,6 +64,10 @@
   - net/if_arp.h
   - net/if_ppp.h
   - net/if.h
+  - netash/ash.h
+  - netatalk/at.h
+  - netax25/ax25.h
+  - neteconet/ec.h
   - netinet/ether.h
   - netinet/icmp6.h
   - netinet/if_ether.h
@@ -62,17 +79,22 @@
   - netinet/ip_icmp.h
   - netinet/tcp.h
   - netinet/udp.h
+  - netipx/ipx.h
   - netpacket/packet.h
   - netrom/netrom.h
   - netrose/rose.h
   - net/route.h
   - nl_types.h
+  - nss.h
+  - obstack.h
   - paths.h
   - poll.h
+  - printf.h
   - pthread.h
   - pty.h
   - pwd.h
   - regex.h
+  - regexp.h
   - resolv.h
   - rpcsvc/yp_prot.h
   - rpcsvc/ypclnt.h

build/sysincl/linux.yml

@@ -1,25 +0,0 @@
-# FIXME: this is actually a glibc (libc6-dev) headers listing.
-#        It should be disassembled and libc-to-nothing should be used instead.
-- includes:
-  - a.out.h
-  - aliases.h
-  - argp.h
-  - argz.h
-  - error.h
-  - execinfo.h
-  - fpu_control.h
-  - fstab.h
-  - fts.h
-  - gconv.h
-  - gshadow.h
-  - ieee754.h
-  - mcheck.h
-  - netash/ash.h
-  - netatalk/at.h
-  - netax25/ax25.h
-  - neteconet/ec.h
-  - netipx/ipx.h
-  - nss.h
-  - obstack.h
-  - printf.h
-  - regexp.h