about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/generic
diff options
context:
space:
mode:
authorAdhemerval Zanella Netto <adhemerval.zanella@linaro.org>2022-10-19 19:14:32 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-12-07 14:41:21 -0300
commit929ea132b43dbec93e5f4d28f316d37ede91a635 (patch)
treef1bf9085e96736710acb133d1b8ff1cb56b0b304 /sysdeps/unix/sysv/linux/generic
parent9d53dc48e885da95b60a12c1cbbce8d3ca5d7598 (diff)
downloadglibc-929ea132b43dbec93e5f4d28f316d37ede91a635.tar.gz
glibc-929ea132b43dbec93e5f4d28f316d37ede91a635.tar.xz
glibc-929ea132b43dbec93e5f4d28f316d37ede91a635.zip
Linux: Consolidate typesizes.h
The generic (sysdeps/unix/sysv/linux/generic/bits/typesizes.h) and
default (bits/typesizes.h) differs in two fields:

                    bits/typesizes.h    Linux generic
__NLINK_T_TYPE      __UWORD_TYPE        __U32_TYPE
__BLKSIZE_T_TYPE    __SLONGWORD_TYPE    __S32_TYPE

Sinceit leads to different C++ mangling names, the default typesize.h
is copied for the requires archtiectures and the generic is make the
default Linux one.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/generic')
-rw-r--r--sysdeps/unix/sysv/linux/generic/bits/typesizes.h107
1 files changed, 0 insertions, 107 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
deleted file mode 100644
index 6b13ff315c..0000000000
--- a/sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* bits/typesizes.h -- underlying types for *_t.  For the generic Linux ABI.
-   Copyright (C) 2011-2022 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _BITS_TYPES_H
-# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef	_BITS_TYPESIZES_H
-#define	_BITS_TYPESIZES_H	1
-
-/* See <bits/types.h> for the meaning of these macros.  This file exists so
-   that <bits/types.h> need not vary across different GNU platforms.  */
-#if __TIMESIZE == 64 && __WORDSIZE == 32
-/* These are the "new" y2038 types defined for architectures added after
-   the 5.1 kernel.  */
-# define __INO_T_TYPE		__UQUAD_TYPE
-# define __OFF_T_TYPE		__SQUAD_TYPE
-# define __RLIM_T_TYPE		__UQUAD_TYPE
-# define __BLKCNT_T_TYPE	__SQUAD_TYPE
-# define __FSBLKCNT_T_TYPE	__UQUAD_TYPE
-# define __FSFILCNT_T_TYPE	__UQUAD_TYPE
-# define __TIME_T_TYPE		__SQUAD_TYPE
-# define __SUSECONDS_T_TYPE	__SQUAD_TYPE
-#else
-# define __INO_T_TYPE		__ULONGWORD_TYPE
-# define __OFF_T_TYPE		__SLONGWORD_TYPE
-# define __RLIM_T_TYPE		__ULONGWORD_TYPE
-# define __BLKCNT_T_TYPE	__SLONGWORD_TYPE
-# define __FSBLKCNT_T_TYPE	__ULONGWORD_TYPE
-# define __FSFILCNT_T_TYPE	__ULONGWORD_TYPE
-# define __TIME_T_TYPE		__SLONGWORD_TYPE
-# define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
-#endif
-
-#define __DEV_T_TYPE		__UQUAD_TYPE
-#define __UID_T_TYPE		__U32_TYPE
-#define __GID_T_TYPE		__U32_TYPE
-#define __INO64_T_TYPE		__UQUAD_TYPE
-#define __MODE_T_TYPE		__U32_TYPE
-#define __NLINK_T_TYPE		__U32_TYPE
-#define __OFF64_T_TYPE		__SQUAD_TYPE
-#define __PID_T_TYPE		__S32_TYPE
-#define __RLIM64_T_TYPE		__UQUAD_TYPE
-#define	__BLKCNT64_T_TYPE	__SQUAD_TYPE
-#define	__FSBLKCNT64_T_TYPE	__UQUAD_TYPE
-#define	__FSFILCNT64_T_TYPE	__UQUAD_TYPE
-#define	__FSWORD_T_TYPE		__SWORD_TYPE
-#define	__ID_T_TYPE		__U32_TYPE
-#define __CLOCK_T_TYPE		__SLONGWORD_TYPE
-#define __USECONDS_T_TYPE	__U32_TYPE
-#define __SUSECONDS64_T_TYPE	__SQUAD_TYPE
-#define __DADDR_T_TYPE		__S32_TYPE
-#define __KEY_T_TYPE		__S32_TYPE
-#define __CLOCKID_T_TYPE	__S32_TYPE
-#define __TIMER_T_TYPE		void *
-#define __BLKSIZE_T_TYPE	__S32_TYPE
-#define __FSID_T_TYPE		struct { int __val[2]; }
-#define __SSIZE_T_TYPE		__SWORD_TYPE
-#define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
-#define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
-#define __CPU_MASK_TYPE 	__ULONGWORD_TYPE
-
-#if defined __LP64__ || (__TIMESIZE == 64 && __WORDSIZE == 32)
-/* Tell the libc code that off_t and off64_t are actually the same type
-   for all ABI purposes, even if possibly expressed as different base types
-   for C type-checking purposes.  */
-# define __OFF_T_MATCHES_OFF64_T	1
-
-/* Same for ino_t and ino64_t.  */
-# define __INO_T_MATCHES_INO64_T	1
-
-/* And for __rlim_t and __rlim64_t.  */
-# define __RLIM_T_MATCHES_RLIM64_T	1
-
-/* And for fsblkcnt_t, fsblkcnt64_t, fsfilcnt_t and fsfilcnt64_t.  */
-# define __STATFS_MATCHES_STATFS64  1
-
-/* And for getitimer, setitimer and rusage  */
-# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 (__WORDSIZE == 64)
-#else
-# define __RLIM_T_MATCHES_RLIM64_T	0
-
-# define __STATFS_MATCHES_STATFS64  0
-
-# define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 0
-#endif
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define	__FD_SETSIZE		1024
-
-
-#endif /* bits/typesizes.h */