[COMMIT osv master] libc: replace 5 more headers in include/api with musl copies

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

libc: replace 5 more headers in include/api with musl copies

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/include/api/fnmatch.h b/include/api/fnmatch.h
--- a/include/api/fnmatch.h
+++ b/include/api/fnmatch.h
@@ -1,29 +0,0 @@
-#ifndef _FNMATCH_H
-#define _FNMATCH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-#define FNM_PATHNAME 0x1
-#define FNM_NOESCAPE 0x2
-#define FNM_PERIOD 0x4
-#define FNM_LEADING_DIR 0x8
-
-#ifdef _GNU_SOURCE
-#define FNM_CASEFOLD 0x10
-#define FNM_FILE_NAME FNM_PATHNAME
-#endif
-
-#define FNM_NOMATCH 1
-#define FNM_NOSYS (-1)
-
-int fnmatch(const char *, const char *, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/api/fnmatch.h b/include/api/fnmatch.h
--- a/include/api/fnmatch.h
+++ b/include/api/fnmatch.h
@@ -0,0 +1 @@
+../../musl/include/fnmatch.h
\ No newline at end of file
diff --git a/include/api/inttypes.h b/include/api/inttypes.h
--- a/include/api/inttypes.h
+++ b/include/api/inttypes.h
@@ -1,230 +0,0 @@
-#ifndef _INTTYPES_H
-#define _INTTYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-#include <stdint.h>
-
-#define __NEED_wchar_t
-#include <bits/alltypes.h>
-
-typedef struct { intmax_t quot, rem; } imaxdiv_t;
-
-intmax_t imaxabs(intmax_t);
-imaxdiv_t imaxdiv(intmax_t, intmax_t);
-
-intmax_t strtoimax(const char *__restrict, char **__restrict, int);
-uintmax_t strtoumax(const char *__restrict, char **__restrict, int);
-
-intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
-uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
-
-#if !defined __cplusplus || defined __STDC_FORMAT_MACROS
-
-#if UINTPTR_MAX == UINT64_MAX
-#define __PRI64 "l"
-#else
-#define __PRI64 "ll"
-#endif
-
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 __PRI64 "d"
-
-#define PRIdLEAST8 "d"
-#define PRIdLEAST16 "d"
-#define PRIdLEAST32 "d"
-#define PRIdLEAST64 __PRI64 "d"
-
-#define PRIdFAST8 "d"
-#define PRIdFAST16 "d"
-#define PRIdFAST32 "d"
-#define PRIdFAST64 __PRI64 "d"
-
-#define PRIi8 "i"
-#define PRIi16 "i"
-#define PRIi32 "i"
-#define PRIi64 __PRI64 "i"
-
-#define PRIiLEAST8 "i"
-#define PRIiLEAST16 "i"
-#define PRIiLEAST32 "i"
-#define PRIiLEAST64 __PRI64 "i"
-
-#define PRIiFAST8 "i"
-#define PRIiFAST16 "i"
-#define PRIiFAST32 "i"
-#define PRIiFAST64 __PRI64 "i"
-
-#define PRIo8 "o"
-#define PRIo16 "o"
-#define PRIo32 "o"
-#define PRIo64 __PRI64 "o"
-
-#define PRIoLEAST8 "o"
-#define PRIoLEAST16 "o"
-#define PRIoLEAST32 "o"
-#define PRIoLEAST64 __PRI64 "o"
-
-#define PRIoFAST8 "o"
-#define PRIoFAST16 "o"
-#define PRIoFAST32 "o"
-#define PRIoFAST64 __PRI64 "o"
-
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 __PRI64 "u"
-
-#define PRIuLEAST8 "u"
-#define PRIuLEAST16 "u"
-#define PRIuLEAST32 "u"
-#define PRIuLEAST64 __PRI64 "u"
-
-#define PRIuFAST8 "u"
-#define PRIuFAST16 "u"
-#define PRIuFAST32 "u"
-#define PRIuFAST64 __PRI64 "u"
-
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 __PRI64 "x"
-
-#define PRIxLEAST8 "x"
-#define PRIxLEAST16 "x"
-#define PRIxLEAST32 "x"
-#define PRIxLEAST64 __PRI64 "x"
-
-#define PRIxFAST8 "x"
-#define PRIxFAST16 "x"
-#define PRIxFAST32 "x"
-#define PRIxFAST64 __PRI64 "x"
-
-#define PRIX8 "X"
-#define PRIX16 "X"
-#define PRIX32 "X"
-#define PRIX64 __PRI64 "X"
-
-#define PRIXLEAST8 "X"
-#define PRIXLEAST16 "X"
-#define PRIXLEAST32 "X"
-#define PRIXLEAST64 __PRI64 "X"
-
-#define PRIXFAST8 "X"
-#define PRIXFAST16 "X"
-#define PRIXFAST32 "X"
-#define PRIXFAST64 __PRI64 "X"
-
-#define PRIdMAX __PRI64 "d"
-#define PRIiMAX __PRI64 "i"
-#define PRIoMAX __PRI64 "o"
-#define PRIuMAX __PRI64 "u"
-#define PRIxMAX __PRI64 "x"
-#define PRIXMAX __PRI64 "X"
-
-#define PRIdPTR "ld"
-#define PRIiPTR "li"
-#define PRIoPTR "lo"
-#define PRIuPTR "lu"
-#define PRIxPTR "lx"
-#define PRIXPTR "lX"
-
-#define SCNd8 "hhd"
-#define SCNd16 "hd"
-#define SCNd32 "d"
-#define SCNd64 __PRI64 "d"
-
-#define SCNdLEAST8 "hhd"
-#define SCNdLEAST16 "hd"
-#define SCNdLEAST32 "d"
-#define SCNdLEAST64 __PRI64 "d"
-
-#define SCNdFAST8 "hhd"
-#define SCNdFAST16 "d"
-#define SCNdFAST32 "d"
-#define SCNdFAST64 __PRI64 "d"
-
-#define SCNi8 "hhi"
-#define SCNi16 "hi"
-#define SCNi32 "i"
-#define SCNi64 __PRI64 "i"
-
-#define SCNiLEAST8 "hhi"
-#define SCNiLEAST16 "hi"
-#define SCNiLEAST32 "i"
-#define SCNiLEAST64 __PRI64 "i"
-
-#define SCNiFAST8 "hhi"
-#define SCNiFAST16 "i"
-#define SCNiFAST32 "i"
-#define SCNiFAST64 __PRI64 "i"
-
-#define SCNu8 "hhu"
-#define SCNu16 "hu"
-#define SCNu32 "u"
-#define SCNu64 __PRI64 "u"
-
-#define SCNuLEAST8 "hhu"
-#define SCNuLEAST16 "hu"
-#define SCNuLEAST32 "u"
-#define SCNuLEAST64 __PRI64 "u"
-
-#define SCNuFAST8 "hhu"
-#define SCNuFAST16 "u"
-#define SCNuFAST32 "u"
-#define SCNuFAST64 __PRI64 "u"
-
-#define SCNo8 "hho"
-#define SCNo16 "ho"
-#define SCNo32 "o"
-#define SCNo64 __PRI64 "o"
-
-#define SCNoLEAST8 "hho"
-#define SCNoLEAST16 "ho"
-#define SCNoLEAST32 "o"
-#define SCNoLEAST64 __PRI64 "o"
-
-#define SCNoFAST8 "hho"
-#define SCNoFAST16 "o"
-#define SCNoFAST32 "o"
-#define SCNoFAST64 __PRI64 "o"
-
-#define SCNx8 "hhx"
-#define SCNx16 "hx"
-#define SCNx32 "x"
-#define SCNx64 __PRI64 "x"
-
-#define SCNxLEAST8 "hhx"
-#define SCNxLEAST16 "hx"
-#define SCNxLEAST32 "x"
-#define SCNxLEAST64 __PRI64 "x"
-
-#define SCNxFAST8 "hhx"
-#define SCNxFAST16 "x"
-#define SCNxFAST32 "x"
-#define SCNxFAST64 __PRI64 "x"
-
-#define SCNdMAX __PRI64 "d"
-#define SCNiMAX __PRI64 "i"
-#define SCNoMAX __PRI64 "o"
-#define SCNuMAX __PRI64 "u"
-#define SCNxMAX __PRI64 "x"
-
-#define SCNdPTR "ld"
-#define SCNiPTR "li"
-#define SCNoPTR "lo"
-#define SCNuPTR "lu"
-#define SCNxPTR "lx"
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/api/inttypes.h b/include/api/inttypes.h
--- a/include/api/inttypes.h
+++ b/include/api/inttypes.h
@@ -0,0 +1 @@
+../../musl/include/inttypes.h
\ No newline at end of file
diff --git a/include/api/mntent.h b/include/api/mntent.h
--- a/include/api/mntent.h
+++ b/include/api/mntent.h
@@ -1,46 +0,0 @@
-#ifndef _MNTENT_H
-#define _MNTENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define OSV_DYNMOUNTS reinterpret_cast<FILE *>(-1ULL)
-
-#define __NEED_FILE
-#include <bits/alltypes.h>
-
-#define MOUNTED "/etc/mtab"
-
-#define MNTTYPE_IGNORE "ignore"
-#define MNTTYPE_NFS "nfs"
-#define MNTTYPE_SWAP "swap"
-#define MNTOPT_DEFAULTS "defaults"
-#define MNTOPT_RO "ro"
-#define MNTOPT_RW "rw"
-#define MNTOPT_SUID "suid"
-#define MNTOPT_NOSUID "nosuid"
-#define MNTOPT_NOAUTO "noauto"
-
-struct mntent
-{
- char *mnt_fsname;
- char *mnt_dir;
- char *mnt_type;
- char *mnt_opts;
- int mnt_freq;
- int mnt_passno;
-};
-
-FILE *setmntent(const char *, const char *);
-int endmntent(FILE *);
-struct mntent *getmntent(FILE *);
-struct mntent *getmntent_r(FILE *, struct mntent *, char *, int);
-int addmntent(FILE *, const struct mntent *);
-char *hasmntopt(const struct mntent *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/api/mntent.h b/include/api/mntent.h
--- a/include/api/mntent.h
+++ b/include/api/mntent.h
@@ -0,0 +1 @@
+../../musl/include/mntent.h
\ No newline at end of file
diff --git a/include/api/syscall.h b/include/api/syscall.h
--- a/include/api/syscall.h
+++ b/include/api/syscall.h
@@ -1 +0,0 @@
-#include <sys/syscall.h>
diff --git a/include/api/syscall.h b/include/api/syscall.h
--- a/include/api/syscall.h
+++ b/include/api/syscall.h
@@ -0,0 +1 @@
+../../musl/include/syscall.h
\ No newline at end of file
diff --git a/include/api/x64/bits/float.h b/include/api/x64/bits/float.h
--- a/include/api/x64/bits/float.h
+++ b/include/api/x64/bits/float.h
@@ -1,20 +0,0 @@
-#define FLT_ROUNDS 1
-#ifdef __FLT_EVAL_METHOD__
-#define FLT_EVAL_METHOD __FLT_EVAL_METHOD__
-#else
-#define FLT_EVAL_METHOD 0
-#endif
-
-#define LDBL_MIN 3.3621031431120935063e-4932L
-#define LDBL_MAX 1.1897314953572317650e+4932L
-#define LDBL_EPSILON 1.0842021724855044340e-19L
-
-#define LDBL_MANT_DIG 64
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MAX_EXP 16384
-
-#define LDBL_DIG 18
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_10_EXP 4932
-
-#define DECIMAL_DIG 21
diff --git a/include/api/x64/bits/float.h b/include/api/x64/bits/float.h
--- a/include/api/x64/bits/float.h
+++ b/include/api/x64/bits/float.h
@@ -0,0 +1 @@
+../../../../musl/arch/x86_64/bits/float.h
\ No newline at end of file