From f5e48e94a2f4d4bbd6e5628c7f2afafc6dbcc459 Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Thu, 7 Mar 2024 17:28:52 -0500
Subject: build: Build mlibc + add distclean target

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 lib/mlibc/options/glibc/include/ar.h               |  27 ------
 .../glibc/include/bits/glibc/glibc_assert.h        |  32 ------
 .../options/glibc/include/bits/glibc/glibc_icmp6.h |  21 ----
 .../glibc/include/bits/glibc/glibc_malloc.h        |  17 ----
 .../glibc/include/bits/glibc/glibc_signal.h        |  24 -----
 lib/mlibc/options/glibc/include/endian.h           |  54 -----------
 lib/mlibc/options/glibc/include/err.h              |  29 ------
 lib/mlibc/options/glibc/include/error.h            |  25 -----
 lib/mlibc/options/glibc/include/execinfo.h         |  20 ----
 lib/mlibc/options/glibc/include/features.h         |   6 --
 lib/mlibc/options/glibc/include/getopt.h           |  44 ---------
 lib/mlibc/options/glibc/include/gshadow.h          |  30 ------
 lib/mlibc/options/glibc/include/memory.h           |   6 --
 .../options/glibc/include/mlibc/glibc-sysdeps.hpp  |  16 ---
 lib/mlibc/options/glibc/include/net/ethernet.h     |  42 --------
 lib/mlibc/options/glibc/include/net/if_ppp.h       |  23 -----
 lib/mlibc/options/glibc/include/net/route.h        |  35 -------
 lib/mlibc/options/glibc/include/netax25/ax25.h     |  51 ----------
 lib/mlibc/options/glibc/include/netinet/in_systm.h |   7 --
 lib/mlibc/options/glibc/include/netipx/ipx.h       |  35 -------
 lib/mlibc/options/glibc/include/netrom/netrom.h    |  27 ------
 lib/mlibc/options/glibc/include/paths.h            |  41 --------
 lib/mlibc/options/glibc/include/printf.h           |  41 --------
 lib/mlibc/options/glibc/include/resolv.h           |  73 --------------
 lib/mlibc/options/glibc/include/shadow.h           |  42 --------
 lib/mlibc/options/glibc/include/stdio_ext.h        |  41 --------
 lib/mlibc/options/glibc/include/sys/dir.h          |   8 --
 lib/mlibc/options/glibc/include/sys/endian.h       |   0
 lib/mlibc/options/glibc/include/sys/errno.h        |   1 -
 lib/mlibc/options/glibc/include/sys/io.h           | 108 ---------------------
 lib/mlibc/options/glibc/include/sys/ioctl.h        |  44 ---------
 lib/mlibc/options/glibc/include/sys/kd.h           |  17 ----
 lib/mlibc/options/glibc/include/sys/mtio.h         | 103 --------------------
 lib/mlibc/options/glibc/include/sys/personality.h  |  58 -----------
 lib/mlibc/options/glibc/include/sys/procfs.h       |  54 -----------
 lib/mlibc/options/glibc/include/sys/reg.h          |  36 -------
 lib/mlibc/options/glibc/include/sys/signal.h       |   1 -
 lib/mlibc/options/glibc/include/sys/timeb.h        |  14 ---
 lib/mlibc/options/glibc/include/sys/timex.h        |  78 ---------------
 lib/mlibc/options/glibc/include/sys/ucontext.h     |  14 ---
 lib/mlibc/options/glibc/include/sys/user.h         |  49 ----------
 lib/mlibc/options/glibc/include/sysexits.h         |  24 -----
 42 files changed, 1418 deletions(-)
 delete mode 100644 lib/mlibc/options/glibc/include/ar.h
 delete mode 100644 lib/mlibc/options/glibc/include/bits/glibc/glibc_assert.h
 delete mode 100644 lib/mlibc/options/glibc/include/bits/glibc/glibc_icmp6.h
 delete mode 100644 lib/mlibc/options/glibc/include/bits/glibc/glibc_malloc.h
 delete mode 100644 lib/mlibc/options/glibc/include/bits/glibc/glibc_signal.h
 delete mode 100644 lib/mlibc/options/glibc/include/endian.h
 delete mode 100644 lib/mlibc/options/glibc/include/err.h
 delete mode 100644 lib/mlibc/options/glibc/include/error.h
 delete mode 100644 lib/mlibc/options/glibc/include/execinfo.h
 delete mode 100644 lib/mlibc/options/glibc/include/features.h
 delete mode 100644 lib/mlibc/options/glibc/include/getopt.h
 delete mode 100644 lib/mlibc/options/glibc/include/gshadow.h
 delete mode 100644 lib/mlibc/options/glibc/include/memory.h
 delete mode 100644 lib/mlibc/options/glibc/include/mlibc/glibc-sysdeps.hpp
 delete mode 100644 lib/mlibc/options/glibc/include/net/ethernet.h
 delete mode 100644 lib/mlibc/options/glibc/include/net/if_ppp.h
 delete mode 100644 lib/mlibc/options/glibc/include/net/route.h
 delete mode 100644 lib/mlibc/options/glibc/include/netax25/ax25.h
 delete mode 100644 lib/mlibc/options/glibc/include/netinet/in_systm.h
 delete mode 100644 lib/mlibc/options/glibc/include/netipx/ipx.h
 delete mode 100644 lib/mlibc/options/glibc/include/netrom/netrom.h
 delete mode 100644 lib/mlibc/options/glibc/include/paths.h
 delete mode 100644 lib/mlibc/options/glibc/include/printf.h
 delete mode 100644 lib/mlibc/options/glibc/include/resolv.h
 delete mode 100644 lib/mlibc/options/glibc/include/shadow.h
 delete mode 100644 lib/mlibc/options/glibc/include/stdio_ext.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/dir.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/endian.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/errno.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/io.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/ioctl.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/kd.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/mtio.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/personality.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/procfs.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/reg.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/signal.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/timeb.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/timex.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/ucontext.h
 delete mode 100644 lib/mlibc/options/glibc/include/sys/user.h
 delete mode 100644 lib/mlibc/options/glibc/include/sysexits.h

(limited to 'lib/mlibc/options/glibc/include')

diff --git a/lib/mlibc/options/glibc/include/ar.h b/lib/mlibc/options/glibc/include/ar.h
deleted file mode 100644
index c7a9f38..0000000
--- a/lib/mlibc/options/glibc/include/ar.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef  _AR_H
-#define  _AR_H
-
-#define ARMAG  "!<arch>\n"
-#define SARMAG 8
-#define ARFMAG "`\n"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ar_hdr {
-	char ar_name[16];
-	char ar_date[12];
-	char ar_uid[6];
-	char ar_gid[6];
-	char ar_mode[8];
-	char ar_size[10];
-	char ar_fmag[2];
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/bits/glibc/glibc_assert.h b/lib/mlibc/options/glibc/include/bits/glibc/glibc_assert.h
deleted file mode 100644
index 4461c5e..0000000
--- a/lib/mlibc/options/glibc/include/bits/glibc/glibc_assert.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef MLIBC_GLIBC_ASSERT_H
-#define MLIBC_GLIBC_ASSERT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-__attribute__ ((__noreturn__)) void __assert_fail_perror(int errno, const char *file, unsigned int line,
-		const char *function);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MLIBC_GLIBC_ASSERT_H */
-
-#ifdef NDEBUG
-
-#undef assert_perror
-#define assert_perror(ignore) ((void)0)
-
-#else /* NDEBUG */
-
-#undef assert_perror
-#define assert_perror(errno) (!(errno) \
-		|| (__assert_fail_perror((errno), __FILE__, __LINE__, __func__), 0))
-
-#endif /* NDEBUG */
diff --git a/lib/mlibc/options/glibc/include/bits/glibc/glibc_icmp6.h b/lib/mlibc/options/glibc/include/bits/glibc/glibc_icmp6.h
deleted file mode 100644
index eafde16..0000000
--- a/lib/mlibc/options/glibc/include/bits/glibc/glibc_icmp6.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _GLIBC_NETINET_ICMP6_H
-#define _GLIBC_NETINET_ICMP6_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ND_OPT_SOURCE_LINKADDR 1
-#define ND_OPT_TARGET_LINKADDR 2
-#define ND_OPT_PREFIX_INFORMATION 3
-#define ND_OPT_REDIRECTED_HEADER 4
-#define ND_OPT_MTU 5
-#define ND_OPT_RTR_ADV_INTERVAL 7
-#define ND_OPT_HOME_AGENT_INFO 8
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GLIBC_NETINET_ICMP6_H */
-
diff --git a/lib/mlibc/options/glibc/include/bits/glibc/glibc_malloc.h b/lib/mlibc/options/glibc/include/bits/glibc/glibc_malloc.h
deleted file mode 100644
index 7ce6c5e..0000000
--- a/lib/mlibc/options/glibc/include/bits/glibc/glibc_malloc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _GLIBC_MALLOC_H
-#define _GLIBC_MALLOC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <bits/size_t.h>
-
-size_t malloc_usable_size(void *ptr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GLIBC_MALLOC_H */
-
diff --git a/lib/mlibc/options/glibc/include/bits/glibc/glibc_signal.h b/lib/mlibc/options/glibc/include/bits/glibc/glibc_signal.h
deleted file mode 100644
index 4d34e20..0000000
--- a/lib/mlibc/options/glibc/include/bits/glibc/glibc_signal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef MLIBC_GLIBC_SIGNAL_H
-#define MLIBC_GLIBC_SIGNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-int tgkill(int, int, int);
-
-#if defined(_GNU_SOURCE)
-
-typedef void (*sighandler_t)(int);
-
-#endif
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // MLIBC_GLIBC_SIGNAL_H
diff --git a/lib/mlibc/options/glibc/include/endian.h b/lib/mlibc/options/glibc/include/endian.h
deleted file mode 100644
index 00d5ee1..0000000
--- a/lib/mlibc/options/glibc/include/endian.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _ENDIAN_H
-#define _ENDIAN_H
-
-#include <byteswap.h>
-
-#ifdef __GNUC__
-# 	define BYTE_ORDER __BYTE_ORDER__
-#	define LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
-#	define BIG_ENDIAN __ORDER_BIG_ENDIAN__
-#	define PDP_ENDIAN __ORDER_PDP_ENDIAN__
-
-# 	define __BYTE_ORDER __BYTE_ORDER__
-#ifndef __LITTLE_ENDIAN // Linux kernel headers define this already
-#	define __LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
-#endif
-#	define __BIG_ENDIAN __ORDER_BIG_ENDIAN__
-#	define __PDP_ENDIAN __ORDER_PDP_ENDIAN__
-#else
-#	error "Unsupported compiler"
-#endif
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#	define htobe16(x) __bswap_16(x)
-#	define htole16(x) (uint16_t)(x)
-#	define be16toh(x) __bswap_16(x)
-#	define le16toh(x) (uint16_t)(x)
-
-#	define htobe32(x) __bswap_32(x)
-#	define htole32(x) (uint32_t)(x)
-#	define be32toh(x) __bswap_32(x)
-#	define le32toh(x) (uint32_t)(x)
-
-#	define htobe64(x) __bswap_64(x)
-#	define htole64(x) (uint64_t)(x)
-#	define be64toh(x) __bswap_64(x)
-#	define le64toh(x) (uint64_t)(x)
-#else
-#	define htobe16(x) (uint16_t)(x)
-#	define htole16(x) __bswap_16(x)
-#	define be16toh(x) (uint16_t)(x)
-#	define le16toh(x) __bswap_16(x)
-
-#	define htobe32(x) (uint32_t)(x)
-#	define htole32(x) __bswap_32(x)
-#	define be32toh(x) (uint32_t)(x)
-#	define le32toh(x) __bswap_32(x)
-
-#	define htobe64(x) (uint64_t)(x)
-#	define htole64(x) __bswap_64(x)
-#	define be64toh(x) (uint64_t)(x)
-#	define le64toh(x) __bswap_64(x)
-#endif
-
-#endif // _ENDIAN_H
diff --git a/lib/mlibc/options/glibc/include/err.h b/lib/mlibc/options/glibc/include/err.h
deleted file mode 100644
index c3757ab..0000000
--- a/lib/mlibc/options/glibc/include/err.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef  _ERR_H
-#define  _ERR_H
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-void warn(const char *, ...);
-void vwarn(const char *, va_list);
-void warnx(const char *, ...);
-void vwarnx(const char *, va_list);
-
-__attribute__((__noreturn__)) void err(int, const char *, ...);
-__attribute__((__noreturn__)) void verr(int, const char *, va_list);
-__attribute__((__noreturn__)) void errx(int, const char *, ...);
-__attribute__((__noreturn__)) void verrx(int, const char *, va_list);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _ERR_H
-
diff --git a/lib/mlibc/options/glibc/include/error.h b/lib/mlibc/options/glibc/include/error.h
deleted file mode 100644
index 782101d..0000000
--- a/lib/mlibc/options/glibc/include/error.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ERROR_H
-#define _ERROR_H
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-void error(int status, int errnum, const char *format, ...);
-void error_at_line(int status, int errnum, const char *filename, unsigned int linenum, const char *format, ...);
-
-extern unsigned int error_message_count;
-extern int error_one_per_line;
-extern void (*error_print_progname)(void);
-	
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-	
-#endif /* _ERROR_H */
diff --git a/lib/mlibc/options/glibc/include/execinfo.h b/lib/mlibc/options/glibc/include/execinfo.h
deleted file mode 100644
index addbc4e..0000000
--- a/lib/mlibc/options/glibc/include/execinfo.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _EXECINFO_H
-#define _EXECINFO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-int backtrace(void **, int);
-char **backtrace_symbols(void *const *, int);
-void backtrace_symbols_fd(void *const *, int, int);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/features.h b/lib/mlibc/options/glibc/include/features.h
deleted file mode 100644
index 382b684..0000000
--- a/lib/mlibc/options/glibc/include/features.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef FEATURES_H
-#define FEATURES_H
-
-// This header is a stub
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/getopt.h b/lib/mlibc/options/glibc/include/getopt.h
deleted file mode 100644
index 5b24cc8..0000000
--- a/lib/mlibc/options/glibc/include/getopt.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#ifndef  _GETOPT_H
-#define  _GETOPT_H
-
-#include <mlibc-config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct option {
-	const char *name;
-	int has_arg;
-	int *flag;
-	int val;
-};
-
-#ifndef __MLIBC_ABI_ONLY
-
-extern char **environ;
-extern char *optarg;
-extern int optind;
-extern int opterr;
-extern int optopt;
-#if __MLIBC_BSD_OPTION
-extern int optreset;
-#endif //__MLIBC_BSD_OPTION
-
-int getopt(int, char *const [], const char *);
-int getopt_long(int, char *const[], const char *, const struct option *, int *);
-int getopt_long_only(int, char *const[], const char *, const struct option *, int *);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#define no_argument 0
-#define required_argument 1
-#define optional_argument 2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _GETOPT_H
-
diff --git a/lib/mlibc/options/glibc/include/gshadow.h b/lib/mlibc/options/glibc/include/gshadow.h
deleted file mode 100644
index 61ec91f..0000000
--- a/lib/mlibc/options/glibc/include/gshadow.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _GSHADOW_H
-#define _GSHADOW_H
-
-#include <paths.h>
-#include <bits/size_t.h>
-
-#define GSHADOW _PATH_GSHADOW
-
-struct sgrp {
-    char *sg_namp;
-    char *sg_passwd;
-    char **sg_adm;
-    char **sg_mem;
-};
-
-#ifndef __MLIBC_ABI_ONLY
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int getsgnam_r(const char *name, struct sgrp *result_buf, char *buffer, size_t len, struct sgrp **result);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/memory.h b/lib/mlibc/options/glibc/include/memory.h
deleted file mode 100644
index 39adee7..0000000
--- a/lib/mlibc/options/glibc/include/memory.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _MEMORY_H
-#define _MEMORY_H
-
-#include <string.h>
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/mlibc/glibc-sysdeps.hpp b/lib/mlibc/options/glibc/include/mlibc/glibc-sysdeps.hpp
deleted file mode 100644
index a3888ce..0000000
--- a/lib/mlibc/options/glibc/include/mlibc/glibc-sysdeps.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef MLIBC_GLIBC_SYSDEPS
-#define MLIBC_GLIBC_SYSDEPS
-
-namespace  [[gnu::visibility("hidden")]] mlibc {
-
-[[gnu::weak]] int sys_ioctl(int fd, unsigned long request, void *arg, int *result);
-[[gnu::weak]] int sys_tgkill(int tgid, int tid, int sig);
-
-[[gnu::weak]] int sys_personality(unsigned long persona, int *out);
-
-[[gnu::weak]] int sys_ioperm(unsigned long int from, unsigned long int num, int turn_on);
-[[gnu::weak]] int sys_iopl(int level);
-
-} // namespace mlibc
-
-#endif // MLIBC_GLIBC_SYSDEPS
diff --git a/lib/mlibc/options/glibc/include/net/ethernet.h b/lib/mlibc/options/glibc/include/net/ethernet.h
deleted file mode 100644
index 8dac98a..0000000
--- a/lib/mlibc/options/glibc/include/net/ethernet.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _NET_ETHERNET_H
-#define _NET_ETHERNET_H
-
-#include <bits/ether_addr.h>
-#include <stdint.h>
-#include <mlibc-config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if __MLIBC_LINUX_OPTION
-#	include <linux/if_ether.h>
-#endif /* __MLIBC_LINUX_OPTION */
-
-#define ETHERTYPE_PUP 0x0200
-#define ETHERTYPE_SPRITE 0x0500
-#define ETHERTYPE_IP 0x0800
-#define ETHERTYPE_ARP 0x0806
-#define ETHERTYPE_REVARP 0x8035
-#define ETHERTYPE_AT 0x809B
-#define ETHERTYPE_AARP 0x80F3
-#define ETHERTYPE_VLAN 0x8100
-#define ETHERTYPE_IPX 0x8137
-#define ETHERTYPE_IPV6 0x86dd
-#define ETHERTYPE_LOOPBACK 0x9000
-
-struct ether_header {
-	uint8_t ether_dhost[6];
-	uint8_t ether_shost[6];
-	uint16_t ether_type;
-};
-
-#define ETHER_ADDR_LEN 6
-
-#define ETHERTYPE_IP 0x0800
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/net/if_ppp.h b/lib/mlibc/options/glibc/include/net/if_ppp.h
deleted file mode 100644
index 55f46b5..0000000
--- a/lib/mlibc/options/glibc/include/net/if_ppp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _NET_IF_PPP_H
-#define _NET_IF_PPP_H
-
-#include <mlibc-config.h>
-
-#if __MLIBC_LINUX_OPTION
-#include <asm/ioctl.h>
-#include <linux/ppp_defs.h>
-
-#define PPPIOCGFLAGS _IOR('t', 90, int)
-#define PPPIOCSFLAGS _IOW('t', 89, int)
-#define PPPIOCGASYNCMAP _IOR('t', 88, int)
-#define PPPIOCSASYNCMAP _IOW('t', 87, int)
-#define PPPIOCGUNIT _IOR('t', 86, int)
-#define PPPIOCSMRU _IOW('t', 82, int)
-#define PPPIOCSMAXCID _IOW('t', 81, int)
-#define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm)
-#define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm)
-#define PPPIOCGDEBUG _IOR('t', 65, int)
-#define PPPIOCSDEBUG _IOW('t', 64, int)
-#endif
-
-#endif /* _NET_IF_PPP_H */
diff --git a/lib/mlibc/options/glibc/include/net/route.h b/lib/mlibc/options/glibc/include/net/route.h
deleted file mode 100644
index 7537241..0000000
--- a/lib/mlibc/options/glibc/include/net/route.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _NET_ROUTE_H
-#define _NET_ROUTE_H
-
-#include <sys/socket.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define RTF_HOST 0x0004
-#define RTF_REJECT 0x0200
-
-struct rtentry {
-	unsigned long int rt_pad1;
-	struct sockaddr rt_dst;
-	struct sockaddr rt_gateway;
-	struct sockaddr rt_genmask;
-	unsigned short int rt_flags;
-	short int rt_pad2;
-	unsigned long int rt_pad3;
-	unsigned char rt_tos;
-	unsigned char rt_class;
-	short int rt_pad4[3];
-	short int rt_metric;
-	char *rt_dev;
-	unsigned long int rt_mtu;
-	unsigned long int rt_window;
-	unsigned short int rt_irtt;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NET_ROUTE_H */
diff --git a/lib/mlibc/options/glibc/include/netax25/ax25.h b/lib/mlibc/options/glibc/include/netax25/ax25.h
deleted file mode 100644
index 3fb82da..0000000
--- a/lib/mlibc/options/glibc/include/netax25/ax25.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _NETAX25_AX25_H
-#define _NETAX25_AX25_H
-
-#include <mlibc-config.h>
-#include <sys/socket.h>
-
-#define AX25_VALUES_IPDEFMODE   0
-#define AX25_VALUES_AXDEFMODE   1
-#define AX25_VALUES_NETROM      2
-#define AX25_VALUES_TEXT        3
-#define AX25_VALUES_BACKOFF     4
-#define AX25_VALUES_CONMODE     5
-#define AX25_VALUES_WINDOW      6
-#define AX25_VALUES_EWINDOW     7
-#define AX25_VALUES_T1          8
-#define AX25_VALUES_T2          9
-#define AX25_VALUES_T3          10
-#define AX25_VALUES_N2          11
-#define AX25_VALUES_DIGI        12
-#define AX25_VALUES_IDLE        13
-#define AX25_VALUES_PACLEN      14
-#define AX25_VALUES_IPMAXQUEUE  15
-#define AX25_MAX_VALUES         20
-
-typedef struct {
-	char ax25_call[7];
-} ax25_address;
-
-struct sockaddr_ax25 {
-	sa_family_t sax25_family;
-	ax25_address sax25_call;
-	int sax25_ndigis;
-};
-
-struct ax25_parms_struct {
-	ax25_address port_addr;
-	unsigned short values[AX25_MAX_VALUES];
-};
-
-#if __MLIBC_LINUX_OPTION
-#include <abi-bits/ioctls.h>
-
-#define SIOCAX25GETUID (SIOCPROTOPRIVATE)
-#define SIOCAX25ADDUID (SIOCPROTOPRIVATE + 1)
-#define SIOCAX25DELUID (SIOCPROTOPRIVATE + 2)
-#define SIOCAX25NOUID (SIOCPROTOPRIVATE + 3)
-#define SIOCAX25GETPARMS (SIOCPROTOPRIVATE + 5)
-#define SIOCAX25SETPARMS (SIOCPROTOPRIVATE + 6)
-#endif /* __MLIBC_LINUX_OPTION */
-
-#endif /* _NETAX25_AX25_H */
diff --git a/lib/mlibc/options/glibc/include/netinet/in_systm.h b/lib/mlibc/options/glibc/include/netinet/in_systm.h
deleted file mode 100644
index c98298f..0000000
--- a/lib/mlibc/options/glibc/include/netinet/in_systm.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef _NETINET_IN_SYSTM_H
-#define _NETINET_IN_SYSTM_H
-
-
-
-#endif // _NETINET_IN_SYSTM_H
diff --git a/lib/mlibc/options/glibc/include/netipx/ipx.h b/lib/mlibc/options/glibc/include/netipx/ipx.h
deleted file mode 100644
index 7b5c774..0000000
--- a/lib/mlibc/options/glibc/include/netipx/ipx.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _NETIPX_IPX_H
-#define _NETIPX_IPX_H
-
-#include <mlibc-config.h>
-#include <sys/socket.h>
-#include <stdint.h>
-
-typedef struct ipx_config_data {
-	unsigned char ipxcfg_auto_select_primary;
-	unsigned char ipxcfg_auto_create_interfaces;
-} ipx_config_data;
-
-#define IPX_TYPE 1
-#define IPX_NODE_LEN 6
-
-struct sockaddr_ipx {
-	sa_family_t sipx_family;
-	uint16_t sipx_port;
-	uint32_t sipx_network;
-	unsigned char sipx_node[IPX_NODE_LEN];
-	uint8_t sipx_type;
-	unsigned char sipx_zero;
-};
-
-#define SOL_IPX 256
-
-#if __MLIBC_LINUX_OPTION
-#include <abi-bits/ioctls.h>
-
-#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
-#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
-#define SIOCIPXCFGDATA (SIOCPROTOPRIVATE + 2)
-#endif
-
-#endif /* _NETIPX_IPX_H */
diff --git a/lib/mlibc/options/glibc/include/netrom/netrom.h b/lib/mlibc/options/glibc/include/netrom/netrom.h
deleted file mode 100644
index 69497d9..0000000
--- a/lib/mlibc/options/glibc/include/netrom/netrom.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _NETROM_NETROM_H
-#define _NETROM_NETROM_H
-
-#include <mlibc-config.h>
-
-struct nr_parms_struct {
-	unsigned int quality;
-	unsigned int obs_count;
-	unsigned int ttl;
-	unsigned int timeout;
-	unsigned int ack_delay;
-	unsigned int busy_delay;
-	unsigned int tries;
-	unsigned int window;
-	unsigned int paclen;
-};
-
-#if __MLIBC_LINUX_OPTION
-#include <abi-bits/ioctls.h>
-
-#define SIOCNRGETPARMS (SIOCPROTOPRIVATE)
-#define SIOCNRSETPARMS (SIOCPROTOPRIVATE + 1)
-#define SIOCNRDECOBS (SIOCPROTOPRIVATE + 2)
-#define SIOCNRRTCTL (SIOCPROTOPRIVATE + 3)
-#endif
-
-#endif /* _NETROM_NETROM_H */
diff --git a/lib/mlibc/options/glibc/include/paths.h b/lib/mlibc/options/glibc/include/paths.h
deleted file mode 100644
index 3d8a4a6..0000000
--- a/lib/mlibc/options/glibc/include/paths.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This file is taken from musl
-// Path to original: include/paths.h
-
-#ifndef _PATHS_H
-#define _PATHS_H
-
-#define	_PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
-#define	_PATH_STDPATH "/bin:/usr/bin:/sbin:/usr/sbin"
-
-#define	_PATH_BSHELL	"/bin/sh"
-#define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_DEVNULL	"/dev/null"
-#define _PATH_GSHADOW	"/etc/gshadow"
-#define	_PATH_KLOG	"/proc/kmsg"
-#define	_PATH_LASTLOG	"/var/log/lastlog"
-#define	_PATH_MAILDIR	"/var/mail"
-#define	_PATH_MAN	"/usr/share/man"
-#define	_PATH_MNTTAB	"/etc/fstab"
-#define	_PATH_MOUNTED	"/etc/mtab"
-#define	_PATH_NOLOGIN	"/etc/nologin"
-#define _PATH_PRESERVE	"/var/lib"
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
-#define	_PATH_SHADOW	"/etc/shadow"
-#define	_PATH_SHELLS	"/etc/shells"
-#define	_PATH_TTY	"/dev/tty"
-#define _PATH_UTMP	"/dev/null/utmp"
-#define	_PATH_VI	"/usr/bin/vi"
-#define _PATH_WTMP	"/dev/null/wtmp"
-
-#define	_PATH_DEV	"/dev/"
-#define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/lib/misc/"
-#define	_PATH_VARRUN	"/var/run/"
-#define	_PATH_VARTMP	"/var/tmp/"
-
-#ifdef _GNU_SOURCE
-#define _PATH_UTMPX _PATH_UTMP
-#define _PATH_WTMPX _PATH_WTMP
-#endif
-
-#endif // _PATHS_H
diff --git a/lib/mlibc/options/glibc/include/printf.h b/lib/mlibc/options/glibc/include/printf.h
deleted file mode 100644
index e7dd0d8..0000000
--- a/lib/mlibc/options/glibc/include/printf.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef  _PRINTF_H
-#define  _PRINTF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-
-#ifndef __MLIBC_ABI_ONLY
-
-// This seems to be a glibc thing, so constants are from glibc
-size_t parse_printf_format(const char * __restrict, size_t, int * __restrict);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-enum {
-	PA_INT,
-	PA_CHAR,
-	PA_WCHAR,
-	PA_STRING,
-	PA_WSTRING,
-	PA_POINTER,
-	PA_FLOAT,
-	PA_DOUBLE,
-	PA_LAST
-};
-
-#define PA_FLAG_MASK			0xff00
-#define PA_FLAG_LONG_LONG		(1 << 8)
-#define PA_FLAG_LONG_DOUBLE		PA_FLAG_LONG_LONG
-#define PA_FLAG_LONG			(1 << 9)
-#define PA_FLAG_SHORT			(1 << 10)
-#define PA_FLAG_PTR				(1 << 11)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/resolv.h b/lib/mlibc/options/glibc/include/resolv.h
deleted file mode 100644
index 71b4fe5..0000000
--- a/lib/mlibc/options/glibc/include/resolv.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef _RESOLV_H
-#define _RESOLV_H
-
-#include <netinet/in.h>
-
-#define RES_INIT     0x00000001
-#define RES_DEBUG    0x00000002
-#define RES_USEVC    0x00000008
-#define RES_IGNTC    0x00000020
-#define RES_RECURSE  0x00000040
-#define RES_DEFNAMES 0x00000080
-#define RES_STAYOPEN 0x00000100
-#define RES_DNSRCH   0x00000200
-
-#define MAXNS     3
-#define MAXDNSRCH 6
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-int dn_expand(const unsigned char *, const unsigned char *,
-		const unsigned char *, char *, int);
-
-int res_query(const char *, int, int, unsigned char *, int);
-
-int res_init(void);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-/* From musl: Unused; purely for broken apps
- * To avoid an massive struct, only add the items requested. */
-typedef struct __res_state {
-	int retrans;
-	int retry;
-	unsigned long options;
-	int nscount;
-	struct sockaddr_in nsaddr_list[MAXNS];
-	char *dnsrch[MAXDNSRCH + 1];
-	char defdname[256];
-	unsigned ndots:4;
-	unsigned nsort:4;
-	union {
-		char pad[52];
-		struct {
-			uint16_t nscount;
-			uint16_t nsmap[MAXNS];
-			int nssocks[MAXNS];
-			uint16_t nscount6;
-			uint16_t nsinit;
-			struct sockaddr_in6	*nsaddrs[MAXNS];
-			unsigned int _initstamp[2];
-		} _ext;
-	} _u;
-} *res_state;
-
-#ifndef __MLIBC_ABI_ONLY
-
-struct __res_state *__res_state(void);
-#define _res (*__res_state())
-
-int res_ninit(res_state);
-void res_nclose(res_state);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _RESOLV_H
diff --git a/lib/mlibc/options/glibc/include/shadow.h b/lib/mlibc/options/glibc/include/shadow.h
deleted file mode 100644
index caad9cf..0000000
--- a/lib/mlibc/options/glibc/include/shadow.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _SHADOW_H
-#define _SHADOW_H
-
-#include <stdint.h>
-#include <stdio.h>
-#include <paths.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct spwd {
-	char *sp_namp;
-	char *sp_pwdp;
-	int32_t sp_lstchg;
-	int32_t sp_min;
-	int32_t sp_max;
-	int32_t sp_warn;
-	int32_t sp_inact;
-	int32_t sp_expire;
-	uint32_t sp_flag;
-};
-
-#define SHADOW _PATH_SHADOW
-
-#ifndef __MLIBC_ABI_ONLY
-
-int putspent(const struct spwd *, FILE *);
-int lckpwdf(void);
-int ulckpwdf(void);
-struct spwd *getspnam(const char *);
-int getspnam_r(const char *, struct spwd *, char *, size_t, struct spwd **);
-struct spwd *fgetspent(FILE *);
-void endspent(void);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/stdio_ext.h b/lib/mlibc/options/glibc/include/stdio_ext.h
deleted file mode 100644
index f22e05d..0000000
--- a/lib/mlibc/options/glibc/include/stdio_ext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _STDIO_EXT_H
-#define _STDIO_EXT_H
-
-#include <stddef.h>
-#include <stdio.h>
-
-#define FSETLOCKING_INTERNAL 1
-#define FSETLOCKING_BYCALLER 2
-#define FSETLOCKING_QUERY 3
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-size_t __fbufsize(FILE *);
-size_t __fpending(FILE *);
-int __flbf(FILE *);
-int __freadable(FILE *);
-int __fwritable(FILE *);
-int __freading(FILE *);
-int __fwriting(FILE *);
-int __fsetlocking(FILE *, int);
-void __fpurge(FILE *);
-
-void _flushlbf(void);
-
-// The following functions are defined by musl.
-
-size_t __freadahead(FILE *);
-const char *__freadptr(FILE *, size_t *);
-void __fseterr(FILE *);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _STDIO_EXT_H
diff --git a/lib/mlibc/options/glibc/include/sys/dir.h b/lib/mlibc/options/glibc/include/sys/dir.h
deleted file mode 100644
index eff112c..0000000
--- a/lib/mlibc/options/glibc/include/sys/dir.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SYS_DIR_H
-#define _SYS_DIR_H
-
-#include <dirent.h>
-
-#define direct  dirent
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/sys/endian.h b/lib/mlibc/options/glibc/include/sys/endian.h
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/mlibc/options/glibc/include/sys/errno.h b/lib/mlibc/options/glibc/include/sys/errno.h
deleted file mode 100644
index 339f4fc..0000000
--- a/lib/mlibc/options/glibc/include/sys/errno.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <errno.h>
diff --git a/lib/mlibc/options/glibc/include/sys/io.h b/lib/mlibc/options/glibc/include/sys/io.h
deleted file mode 100644
index 311b25f..0000000
--- a/lib/mlibc/options/glibc/include/sys/io.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef _SYS_IO_H
-#define _SYS_IO_H
-
-#include <bits/inline-definition.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-int ioperm(unsigned long int from, unsigned long int num, int turn_on);
-
-__attribute__((deprecated)) int iopl(int level);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __x86_64__
-__MLIBC_INLINE_DEFINITION unsigned char inb(unsigned short int port) {
-	unsigned char _v;
-	__asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
-	return _v;
-}
-
-__MLIBC_INLINE_DEFINITION unsigned char inb_p(unsigned short int port) {
-	unsigned char _v;
-	__asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
-	return _v;
-}
-
-__MLIBC_INLINE_DEFINITION unsigned short int inw(unsigned short int port) {
-	unsigned short _v;
-	__asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port));
-	return _v;
-}
-
-__MLIBC_INLINE_DEFINITION unsigned short int inw_p(unsigned short int port) {
-	unsigned short int _v;
-	__asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
-	return _v;
-}
-
-__MLIBC_INLINE_DEFINITION unsigned int inl(unsigned short int port) {
-	unsigned int _v;
-	__asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port));
-	return _v;
-}
-
-__MLIBC_INLINE_DEFINITION unsigned int inl_p(unsigned short int port) {
-	unsigned int _v;
-	__asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
-	return _v;
-}
-
-__MLIBC_INLINE_DEFINITION void outb(unsigned char value, unsigned short int port) {
-	__asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
-}
-
-__MLIBC_INLINE_DEFINITION void outb_p(unsigned char value, unsigned short int port) {
-	__asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value), "Nd" (port));
-}
-
-__MLIBC_INLINE_DEFINITION void outw(unsigned short int value, unsigned short int port) {
-	__asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port));
-}
-
-__MLIBC_INLINE_DEFINITION void outw_p(unsigned short int value, unsigned short int port) {
-	__asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80": :"a" (value), "Nd" (port));
-}
-
-__MLIBC_INLINE_DEFINITION void outl(unsigned int value, unsigned short int port) {
-	__asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port));
-}
-
-__MLIBC_INLINE_DEFINITION void outl_p(unsigned int value, unsigned short int port) {
-	__asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80": :"a" (value), "Nd" (port));
-}
-
-__MLIBC_INLINE_DEFINITION void insb(unsigned short int port, void *addr, unsigned long int count) {
-	__asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr), "=c" (count) :"d" (port), "0" (addr), "1" (count));
-}
-
-__MLIBC_INLINE_DEFINITION void insw(unsigned short int port, void *addr, unsigned long int count) {
-	__asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr), "=c" (count) :"d" (port), "0" (addr), "1" (count));
-}
-
-__MLIBC_INLINE_DEFINITION void insl(unsigned short int port, void *addr, unsigned long int count) {
-	__asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr), "=c" (count) :"d" (port), "0" (addr), "1" (count));
-}
-
-__MLIBC_INLINE_DEFINITION void outsb(unsigned short int port, const void *addr, unsigned long int count) {
-	__asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr), "=c" (count) :"d" (port), "0" (addr), "1" (count));
-}
-
-__MLIBC_INLINE_DEFINITION void outsw(unsigned short int port, const void *addr, unsigned long int count) {
-	__asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr), "=c" (count) :"d" (port), "0" (addr), "1" (count));
-}
-
-__MLIBC_INLINE_DEFINITION void outsl(unsigned short int port, const void *addr, unsigned long int count) {
-	__asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr), "=c" (count) :"d" (port), "0" (addr), "1" (count));
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_IO_H */
diff --git a/lib/mlibc/options/glibc/include/sys/ioctl.h b/lib/mlibc/options/glibc/include/sys/ioctl.h
deleted file mode 100644
index 6121446..0000000
--- a/lib/mlibc/options/glibc/include/sys/ioctl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _SYS_IOCTL_H
-#define _SYS_IOCTL_H
-
-#include <mlibc-config.h>
-#include <abi-bits/ioctls.h>
-
-// On Linux, sys/ioctl.h includes the termios ioctls.
-#if __MLIBC_LINUX_OPTION
-#	include <asm/ioctls.h>
-#	include <bits/winsize.h>
-#   include <sys/ttydefaults.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MLIBC_ABI_ONLY
-
-int ioctl(int fd, unsigned long request, ...);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#define FIONREAD 0x541B
-#define FIONBIO 0x5421
-#define FIONCLEX 0x5450
-#define FIOCLEX 0x5451
-
-#define SIOCGIFNAME 0x8910
-#define SIOCGIFCONF 0x8912
-#define SIOCGIFFLAGS 0x8913
-#define SIOCSIFFLAGS 0x8914
-#define SIOCGIFMTU 0x8921
-#define SIOCSIFMTU 0x8922
-#define SIOCGIFINDEX 0x8933
-
-#define SIOCPROTOPRIVATE 0x89E0
-#define SIOCDEVPRIVATE 0x89F0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _SYS_IOCTL_H
diff --git a/lib/mlibc/options/glibc/include/sys/kd.h b/lib/mlibc/options/glibc/include/sys/kd.h
deleted file mode 100644
index 285c694..0000000
--- a/lib/mlibc/options/glibc/include/sys/kd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _SYS_KD_H
-#define _SYS_KD_H
-
-/* Make sure the <linux/types.h> header is not loaded.  */
-#ifndef _LINUX_TYPES_H
-# define _LINUX_TYPES_H         1
-# define __undef_LINUX_TYPES_H
-#endif
-
-#include <linux/kd.h>
-
-#ifdef __undef_LINUX_TYPES_H
-# undef _LINUX_TYPES_H
-# undef __undef_LINUX_TYPES_H
-#endif
-
-#endif /* _SYS_KD_H */
diff --git a/lib/mlibc/options/glibc/include/sys/mtio.h b/lib/mlibc/options/glibc/include/sys/mtio.h
deleted file mode 100644
index c2f9d98..0000000
--- a/lib/mlibc/options/glibc/include/sys/mtio.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef _SYS_MTIO_H
-#define _SYS_MTIO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <mlibc-config.h>
-
-struct mtop {
-	short int mt_op;
-	int mt_count;
-};
-
-struct mtget {
-	long int mt_type;
-	long int mt_resid;
-	long int mt_dsreg;
-	long int mt_gstat;
-	long int mt_erreg;
-	int mt_fileno;
-	int mt_blkno;
-};
-
-struct mtpos {
-	long int mt_blkno;
-};
-
-struct mtconfiginfo {
-	long int mt_type;
-	long int ifc_type;
-	unsigned short int irqnr;
-	unsigned short int dmanr;
-	unsigned short int port;
-
-	unsigned long int debug;
-
-	unsigned have_dens:1;
-	unsigned have_bsf:1;
-	unsigned have_fsr:1;
-	unsigned have_bsr:1;
-	unsigned have_eod:1;
-	unsigned have_seek:1;
-	unsigned have_tell:1;
-	unsigned have_ras1:1;
-	unsigned have_ras2:1;
-	unsigned have_ras3:1;
-	unsigned have_qfa:1;
-
-	unsigned pad1:5;
-	char reserved[10];
-};
-
-#define MTRESET 0
-#define MTFSF 1
-#define MTBSF 2
-#define MTFSR 3
-#define MTBSR 4
-#define MTWEOF 5
-#define MTREW 6
-#define MTOFFL 7
-#define MTNOP 8
-#define MTRETEN 9
-#define MTBSFM 10
-#define MTFSFM 11
-#define MTEOM 12
-#define MTERASE 13
-#define MTRAS1 14
-#define MTRAS2 15
-#define MTRAS3 16
-#define MTSETBLK 20
-#define MTSETDENSITY 21
-#define MTSEEK 22
-#define MTTELL 23
-#define MTSETDRVBUFFER 24
-#define MTFSS 25
-#define MTBSS 26
-#define MTWSM 27
-#define MTLOCK 28
-#define MTUNLOCK 29
-#define MTLOAD 30
-#define MTUNLOAD 31
-#define MTCOMPRESSION 32
-#define MTSETPART 33
-#define MTMKPART 34
-
-#define GMT_WR_PROT(x) ((x) & 0x04000000)
-
-#if __MLIBC_LINUX_OPTION
-#include <asm/ioctl.h>
-
-#define MTIOCTOP _IOR('m', 1, struct mtop)
-#define MTIOCGET _IOR('m', 2, struct mtget)
-#define MTIOCPOS _IOR('m', 3, struct mtpos)
-#define MTIOCGETCONFIG _IOR('m', 4, struct mtconfiginfo)
-#define MTIOCSETCONFIG _IOR('m', 5, struct mtconfiginfo)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_MTIO_H */
diff --git a/lib/mlibc/options/glibc/include/sys/personality.h b/lib/mlibc/options/glibc/include/sys/personality.h
deleted file mode 100644
index 04563a0..0000000
--- a/lib/mlibc/options/glibc/include/sys/personality.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _SYS_PERSONALITY_H
-#define _SYS_PERSONALITY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-	UNAME26	= 0x0020000,
-	ADDR_NO_RANDOMIZE = 0x0040000,
-	FDPIC_FUNCPTRS = 0x0080000,
-	MMAP_PAGE_ZERO = 0x0100000,
-	ADDR_COMPAT_LAYOUT = 0x0200000,
-	READ_IMPLIES_EXEC = 0x0400000,
-	ADDR_LIMIT_32BIT = 0x0800000,
-	SHORT_INODE = 0x1000000,
-	WHOLE_SECONDS = 0x2000000,
-	STICKY_TIMEOUTS	= 0x4000000,
-	ADDR_LIMIT_3GB = 0x8000000,
-};
-
-enum {
-	PER_LINUX = 0x0000,
-	PER_LINUX_32BIT = 0x0000 | ADDR_LIMIT_32BIT,
-	PER_LINUX_FDPIC = 0x0000 | FDPIC_FUNCPTRS,
-	PER_SVR4 = 0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-	PER_SVR3 = 0x0002 | STICKY_TIMEOUTS | SHORT_INODE,
-	PER_SCOSVR3 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS | SHORT_INODE,
-	PER_OSR5 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS,
-	PER_WYSEV386 = 0x0004 | STICKY_TIMEOUTS | SHORT_INODE,
-	PER_ISCR4 = 0x0005 | STICKY_TIMEOUTS,
-	PER_BSD = 0x0006,
-	PER_SUNOS = 0x0006 | STICKY_TIMEOUTS,
-	PER_XENIX = 0x0007 | STICKY_TIMEOUTS | SHORT_INODE,
-	PER_LINUX32 = 0x0008,
-	PER_LINUX32_3GB = 0x0008 | ADDR_LIMIT_3GB,
-	PER_IRIX32 = 0x0009 | STICKY_TIMEOUTS,
-	PER_IRIXN32 = 0x000a | STICKY_TIMEOUTS,
-	PER_IRIX64 = 0x000b | STICKY_TIMEOUTS,
-	PER_RISCOS = 0x000c,
-	PER_SOLARIS = 0x000d | STICKY_TIMEOUTS,
-	PER_UW7 = 0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
-	PER_OSF4 = 0x000f,
-	PER_HPUX = 0x0010,
-	PER_MASK = 0x00ff,
-};
-
-#ifndef __MLIBC_ABI_ONLY
-
-int personality(unsigned long persona);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _SYS_PERSONALITY_H
diff --git a/lib/mlibc/options/glibc/include/sys/procfs.h b/lib/mlibc/options/glibc/include/sys/procfs.h
deleted file mode 100644
index b13a81d..0000000
--- a/lib/mlibc/options/glibc/include/sys/procfs.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _SYS_PROCFS_H
-#define _SYS_PROCFS_H
-
-#include <sys/user.h>
-#include <sys/time.h>
-#include <abi-bits/pid_t.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned long long elf_greg_t;
-
-#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof (elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_fpregs_struct elf_fpregset_t;
-typedef struct user_regs_struct prgregset_t;
-typedef struct user_fpregs_struct prfpregset_t;
-
-#define ELF_PRARGSZ 80
-
-struct elf_siginfo {
-	int si_signo;
-	int si_code;
-	int si_errno;
-};
-
-struct elf_prstatus {
-	struct elf_siginfo pr_info;
-	short int pr_cursig;
-	unsigned long int pr_sigpend;
-	unsigned long int pr_sighold;
-	pid_t pr_pid;
-	pid_t pr_ppid;
-	pid_t pr_pgrp;
-	pid_t pr_sid;
-	struct timeval pr_utime;
-	struct timeval pr_stime;
-	struct timeval pr_cutime;
-	struct timeval pr_cstime;
-	elf_gregset_t pr_reg;
-	int pr_fpvalid;
-};
-
-typedef pid_t lwpid_t;
-typedef void *psaddr_t;
-typedef struct elf_prstatus prstatus_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/sys/reg.h b/lib/mlibc/options/glibc/include/sys/reg.h
deleted file mode 100644
index c6e3429..0000000
--- a/lib/mlibc/options/glibc/include/sys/reg.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _SYS_REG_H
-#define _SYS_REG_H
-
-#ifdef __x86_64__
-#define R15 0
-#define R14 1
-#define R13 2
-#define R12 3
-#define RBP 4
-#define RBX 5
-#define R11 6
-#define R10 7
-#define R9 8
-#define R8 9
-#define RAX 10
-#define RCX 11
-#define RDX 12
-#define RSI 13
-#define RDI 14
-#define ORIG_RAX 15
-#define RIP 16
-#define CS 17
-#define EFLAGS 18
-#define RSP 19
-#define SS 20
-#define FS_BASE 21
-#define GS_BASE 22
-#define DS 23
-#define ES 24
-#define FS 25
-#define GS 26
-#else
-#error "Add architecture specific code here"
-#endif
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/sys/signal.h b/lib/mlibc/options/glibc/include/sys/signal.h
deleted file mode 100644
index 2e602da..0000000
--- a/lib/mlibc/options/glibc/include/sys/signal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <signal.h>
diff --git a/lib/mlibc/options/glibc/include/sys/timeb.h b/lib/mlibc/options/glibc/include/sys/timeb.h
deleted file mode 100644
index d27173b..0000000
--- a/lib/mlibc/options/glibc/include/sys/timeb.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SYS_TIMEB_H
-#define _SYS_TIMEB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _SYS_TIMEB_H
diff --git a/lib/mlibc/options/glibc/include/sys/timex.h b/lib/mlibc/options/glibc/include/sys/timex.h
deleted file mode 100644
index 97153ad..0000000
--- a/lib/mlibc/options/glibc/include/sys/timex.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _SYS_TIMEX_H
-#define _SYS_TIMEX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <abi-bits/clockid_t.h>
-#include <bits/posix/timeval.h>
-
-struct timex {
-	int modes;
-	long offset;
-	long freq;
-	long maxerror;
-	long esterror;
-	int status;
-	long constant;
-	long precision;
-	long tolerance;
-	struct timeval time;
-	long tick;
-	long ppsfreq;
-	long jitter;
-	int shift;
-	long stabil;
-	long jitcnt;
-	long calcnt;
-	long errcnt;
-	long stbcnt;
-	int tai;
-	int __padding[11];
-};
-
-#define ADJ_OFFSET 0x0001
-#define ADJ_FREQUENCY 0x0002
-#define ADJ_MAXERROR 0x0004
-#define ADJ_ESTERROR 0x0008
-#define ADJ_STATUS 0x0010
-#define ADJ_TIMECONST 0x0020
-#define ADJ_TAI 0x0080
-#define ADJ_SETOFFSET 0x0100
-#define ADJ_MICRO 0x1000
-#define ADJ_NANO 0x2000
-#define ADJ_TICK 0x4000
-#define ADJ_OFFSET_SINGLESHOT 0x8001
-#define ADJ_OFFSET_SS_READ 0xa001
-
-#define STA_PLL 0x0001
-#define STA_PPSFREQ 0x0002
-#define STA_PPSTIME 0x0004
-#define STA_FLL 0x0008
-#define STA_INS 0x0010
-#define STA_DEL 0x0020
-#define STA_UNSYNC 0x0040
-#define STA_FREQHOLD 0x0080
-#define STA_PPSSIGNAL 0x0100
-#define STA_PPSJITTER 0x0200
-#define STA_PPSWANDER 0x0400
-#define STA_PPSERROR 0x0800
-#define STA_CLOCKERR 0x1000
-#define STA_NANO 0x2000
-#define STA_MODE 0x4000
-#define STA_CLK 0x8000
-
-#ifndef __MLIBC_ABI_ONLY
-
-int adjtimex(struct timex *);
-int clock_adjtime(clockid_t clk_id, struct timex *buf);
-int ntp_adjtime(struct timex *);
-
-#endif /* !__MLIBC_ABI_ONLY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _SYS_TIMEX_H
diff --git a/lib/mlibc/options/glibc/include/sys/ucontext.h b/lib/mlibc/options/glibc/include/sys/ucontext.h
deleted file mode 100644
index b4798ee..0000000
--- a/lib/mlibc/options/glibc/include/sys/ucontext.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SYS_UCONTEXT_H
-#define _SYS_UCONTEXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _SYS_UCONTEXT_H
diff --git a/lib/mlibc/options/glibc/include/sys/user.h b/lib/mlibc/options/glibc/include/sys/user.h
deleted file mode 100644
index 9a07ac6..0000000
--- a/lib/mlibc/options/glibc/include/sys/user.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _SYS_USER_H
-#define _SYS_USER_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct user_fpregs_struct {
-	uint16_t cwd, swd, ftw, fop;
-	uint64_t rip, rdp;
-	uint32_t mxcsr, mxcr_mask;
-	uint32_t st_space[32], xmm_space[64], padding[24];
-} elf_fpregset_t;
-
-struct user_regs_struct {
-	unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
-	unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
-	unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
-};
-
-struct user {
-	struct user_regs_struct regs;
-	int u_fpvalid;
-	struct user_fpregs_struct i387;
-	unsigned long u_tsize;
-	unsigned long u_dsize;
-	unsigned long u_ssize;
-	unsigned long start_code;
-	unsigned long start_stack;
-	long signal;
-	int reserved;
-	struct user_regs_struct	*u_ar0;
-	struct user_fpregs_struct *u_fpstate;
-	unsigned long magic;
-	char u_comm[32];
-	unsigned long u_debugreg[8];
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#define PAGE_SHIFT 12
-#define PAGE_SIZE (1UL << PAGE_SHIFT)
-#define PAGE_MASK (~(PAGE_SIZE - 1))
-
-#endif
diff --git a/lib/mlibc/options/glibc/include/sysexits.h b/lib/mlibc/options/glibc/include/sysexits.h
deleted file mode 100644
index f3bde25..0000000
--- a/lib/mlibc/options/glibc/include/sysexits.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _SYSEXITS_H
-#define _SYSEXITS_H
-
-#define EX_OK		0
-#define EX_USAGE	64
-#define EX_DATAERR	65
-#define EX_NOINPUT	66
-#define EX_NOUSER	67
-#define EX_NOHOST	68
-#define EX_UNAVAILABLE	69
-#define EX_SOFTWARE	70
-#define EX_OSERR	71
-#define EX_OSFILE	72
-#define EX_CANTCREAT	73
-#define EX_IOERR	74
-#define EX_TEMPFAIL	75
-#define EX_PROTOCOL	76
-#define EX_NOPERM	77
-#define EX_CONFIG	78
-
-#define EX__BASE	64
-#define EX__MAX		78
-
-#endif // _SYSEXITS_H
-- 
cgit v1.2.3