Merge pull request #24025 from alexrp/glibc-deduplication

`libc`: Merge header directories for glibc and NetBSD libc where applicable

4 files changed, 0 insertions, 75 deletions

diff --git a/lib/libc/include/x86_64-linux-gnu/gnu/lib-names-64.h b/lib/libc/include/x86_64-linux-gnu/gnu/lib-names-64.h
deleted file mode 100644
index 26bcb6482e..0000000000
--- a/lib/libc/include/x86_64-linux-gnu/gnu/lib-names-64.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file is automatically generated.  */
-#ifndef __GNU_LIB_NAMES_H
-# error "Never use <gnu/lib-names-64.h> directly; include <gnu/lib-names.h> instead."
-#endif
-
-#define LD_LINUX_X86_64_SO              "ld-linux-x86-64.so.2"
-#define LD_SO                           "ld-linux-x86-64.so.2"
-#define LIBANL_SO                       "libanl.so.1"
-#define LIBBROKENLOCALE_SO              "libBrokenLocale.so.1"
-#define LIBC_MALLOC_DEBUG_SO            "libc_malloc_debug.so.0"
-#define LIBC_SO                         "libc.so.6"
-#define LIBDL_SO                        "libdl.so.2"
-#define LIBGCC_S_SO                     "libgcc_s.so.1"
-#define LIBMVEC_SO                      "libmvec.so.1"
-#define LIBM_SO                         "libm.so.6"
-#define LIBNSL_SO                       "libnsl.so.1"
-#define LIBNSS_COMPAT_SO                "libnss_compat.so.2"
-#define LIBNSS_DB_SO                    "libnss_db.so.2"
-#define LIBNSS_DNS_SO                   "libnss_dns.so.2"
-#define LIBNSS_FILES_SO                 "libnss_files.so.2"
-#define LIBNSS_HESIOD_SO                "libnss_hesiod.so.2"
-#define LIBNSS_LDAP_SO                  "libnss_ldap.so.2"
-#define LIBPTHREAD_SO                   "libpthread.so.0"
-#define LIBRESOLV_SO                    "libresolv.so.2"
-#define LIBRT_SO                        "librt.so.1"
-#define LIBTHREAD_DB_SO                 "libthread_db.so.1"
-#define LIBUTIL_SO                      "libutil.so.1"
\ No newline at end of file
diff --git a/lib/libc/include/x86_64-linux-gnu/gnu/lib-names.h b/lib/libc/include/x86_64-linux-gnu/gnu/lib-names.h
deleted file mode 100644
index aafc03bf7e..0000000000
--- a/lib/libc/include/x86_64-linux-gnu/gnu/lib-names.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This file is automatically generated.
-   It defines macros to allow user program to find the shared
-   library files which come as part of GNU libc.  */
-#ifndef __GNU_LIB_NAMES_H
-#define __GNU_LIB_NAMES_H	1
-
-#if !defined __x86_64__
-# include <gnu/lib-names-32.h>
-#endif
-#if defined __x86_64__ && defined __LP64__
-# include <gnu/lib-names-64.h>
-#endif
-#if defined __x86_64__ && defined __ILP32__
-# include <gnu/lib-names-x32.h>
-#endif
-
-#endif	/* gnu/lib-names.h */
\ No newline at end of file
diff --git a/lib/libc/include/x86_64-linux-gnu/gnu/stubs-64.h b/lib/libc/include/x86_64-linux-gnu/gnu/stubs-64.h
deleted file mode 100644
index d4b87af1a5..0000000000
--- a/lib/libc/include/x86_64-linux-gnu/gnu/stubs-64.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This file is automatically generated.
-   It defines a symbol `__stub_FUNCTION' for each function
-   in the C library which is a stub, meaning it will fail
-   every time called, usually setting errno to ENOSYS.  */
-
-#ifdef _LIBC
- #error Applications may not define the macro _LIBC
-#endif
-
-#define __stub___compat_bdflush
-#define __stub_chflags
-#define __stub_fchflags
-#define __stub_gtty
-#define __stub_revoke
-#define __stub_setlogin
-#define __stub_sigreturn
-#define __stub_stty
\ No newline at end of file
diff --git a/lib/libc/include/x86_64-linux-gnu/gnu/stubs.h b/lib/libc/include/x86_64-linux-gnu/gnu/stubs.h
deleted file mode 100644
index a4c9b5f097..0000000000
--- a/lib/libc/include/x86_64-linux-gnu/gnu/stubs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This file is automatically generated.
-   This file selects the right generated file of `__stub_FUNCTION' macros
-   based on the architecture being compiled for.  */
-
-
-#if !defined __x86_64__
-# include <gnu/stubs-32.h>
-#endif
-#if defined __x86_64__ && defined __LP64__
-# include <gnu/stubs-64.h>
-#endif
-#if defined __x86_64__ && defined __ILP32__
-# include <gnu/stubs-x32.h>
-#endif
\ No newline at end of file