From 9448b0513e2eec020fbca9c10412b83df5027a16 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 22 Jul 2013 11:22:36 -0400 Subject: refactor headers, especially alltypes.h, and improve C++ ABI compat the arch-specific bits/alltypes.h.sh has been replaced with a generic alltypes.h.in and minimal arch-specific bits/alltypes.h.in. this commit is intended to have no functional changes except: - exposing additional symbols that POSIX allows but does not require - changing the C++ name mangling for some types - fixing the signedness of blksize_t on powerpc (POSIX requires signed) - fixing the limit macros for sig_atomic_t on x86_64 - making dev_t an unsigned type (ABI matching goal, and more logical) in addition, some types that were wrongly defined with long on 32-bit archs were changed to int, and vice versa; this change is non-functional except for the possibility of making pointer types mismatch, and only affects programs that were using them incorrectly, and only at build-time, not runtime. the following changes were made in the interest of moving non-arch-specific types out of the alltypes system and into the headers they're associated with, and also will tend to improve application compatibility: - netdb.h now includes netinet/in.h (for socklen_t and uint32_t) - netinet/in.h now includes sys/socket.h and inttypes.h - sys/resource.h now includes sys/time.h (for struct timeval) - sys/wait.h now includes signal.h (for siginfo_t) - langinfo.h now includes nl_types.h (for nl_item) for the types in stdint.h: - types which are of no interest to other headers were moved out of the alltypes system. - fast types for 8- and 64-bit are hard-coded (at least for now); only the 16- and 32-bit ones have reason to vary by arch. and the following types have been changed for C++ ABI purposes; - mbstate_t now has a struct tag, __mbstate_t - FILE's struct tag has been changed to _IO_FILE - DIR's struct tag has been changed to __dirstream - locale_t's struct tag has been changed to __locale_struct - pthread_t is defined as unsigned long in C++ mode only - fpos_t now has a struct tag, _G_fpos64_t - fsid_t's struct tag has been changed to __fsid_t - idtype_t has been made an enum type (also required by POSIX) - nl_catd has been changed from long to void * - siginfo_t's struct tag has been removed - sigset_t's has been given a struct tag, __sigset_t - stack_t has been given a struct tag, sigaltstack - suseconds_t has been changed to long on 32-bit archs - [u]intptr_t have been changed from long to int rank on 32-bit archs - dev_t has been made unsigned summary of tests that have been performed against these changes: - nsz's libc-test (diff -u before and after) - C++ ABI check symbol dump (diff -u before, after, glibc) - grepped for __NEED, made sure types needed are still in alltypes - built gcc 3.4.6 --- arch/i386/bits/alltypes.h.sh | 141 ------------------------------------------- 1 file changed, 141 deletions(-) delete mode 100755 arch/i386/bits/alltypes.h.sh (limited to 'arch/i386/bits/alltypes.h.sh') diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh deleted file mode 100755 index 381e2c9b..00000000 --- a/arch/i386/bits/alltypes.h.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -sed -e << EOF \ -'/^TYPEDEF/s/TYPEDEF \(.*\) \([^ ]*\);$/#if defined(__NEED_\2) \&\& !defined(__DEFINED_\2)\ -typedef \1 \2;\ -#define __DEFINED_\2\ -#endif\ -/ -/^STRUCT/s/STRUCT * \([^ ]*\) \(.*\);$/#if defined(__NEED_struct_\1) \&\& !defined(__DEFINED_struct_\1)\ -struct \1 \2;\ -#define __DEFINED_struct_\1\ -#endif\ -/ -/^UNION/s/UNION * \([^ ]*\) \(.*\);$/#if defined(__NEED_union_\1) \&\& !defined(__DEFINED_union_\1)\ -union \1 \2;\ -#define __DEFINED_union_\1\ -#endif\ -/' - -TYPEDEF unsigned size_t; -TYPEDEF int ssize_t; -TYPEDEF int ptrdiff_t; - -#if __GNUC__ >= 3 -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; -#else -TYPEDEF struct __va_list * va_list; -TYPEDEF struct __va_list * __isoc_va_list; -#endif - -#ifndef __cplusplus -#ifdef __WCHAR_TYPE__ -TYPEDEF __WCHAR_TYPE__ wchar_t; -#else -TYPEDEF long wchar_t; -#endif -#endif -TYPEDEF long wint_t; -TYPEDEF const int * wctrans_t; -TYPEDEF unsigned long wctype_t; - -TYPEDEF signed char int8_t; -TYPEDEF short int16_t; -TYPEDEF int int32_t; -TYPEDEF long long int64_t; - -TYPEDEF unsigned char uint8_t; -TYPEDEF unsigned short uint16_t; -TYPEDEF unsigned int uint32_t; -TYPEDEF unsigned long long uint64_t; - -TYPEDEF unsigned short __uint16_t; -TYPEDEF unsigned int __uint32_t; -TYPEDEF unsigned long long __uint64_t; - -TYPEDEF int8_t int_fast8_t; -TYPEDEF int int_fast16_t; -TYPEDEF int int_fast32_t; -TYPEDEF int64_t int_fast64_t; - -TYPEDEF unsigned char uint_fast8_t; -TYPEDEF unsigned int uint_fast16_t; -TYPEDEF unsigned int uint_fast32_t; -TYPEDEF uint64_t uint_fast64_t; - -TYPEDEF long intptr_t; -TYPEDEF unsigned long uintptr_t; - -TYPEDEF long long intmax_t; -TYPEDEF unsigned long long uintmax_t; - -#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0 -TYPEDEF float float_t; -TYPEDEF double double_t; -#else -TYPEDEF long double float_t; -TYPEDEF long double double_t; -#endif - -TYPEDEF long time_t; -TYPEDEF int suseconds_t; -TYPEDEF unsigned useconds_t; -STRUCT timeval { time_t tv_sec; int tv_usec; }; -STRUCT timespec { time_t tv_sec; long tv_nsec; }; - -TYPEDEF int pid_t; -TYPEDEF unsigned id_t; -TYPEDEF unsigned uid_t; -TYPEDEF unsigned gid_t; -TYPEDEF int key_t; - -TYPEDEF struct __pthread * pthread_t; -TYPEDEF int pthread_once_t; -TYPEDEF int pthread_key_t; -TYPEDEF int pthread_spinlock_t; - -TYPEDEF struct { union { int __i[9]; size_t __s[9]; } __u; } pthread_attr_t; -TYPEDEF unsigned pthread_mutexattr_t; -TYPEDEF unsigned pthread_condattr_t; -TYPEDEF unsigned pthread_barrierattr_t; -TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t; - -TYPEDEF struct { union { int __i[6]; void *__p[6]; } __u; } pthread_mutex_t; -TYPEDEF struct { union { int __i[12]; void *__p[12]; } __u; } pthread_cond_t; -TYPEDEF struct { union { int __i[8]; void *__p[8]; } __u; } pthread_rwlock_t; -TYPEDEF struct { union { int __i[5]; void *__p[5]; } __u; } pthread_barrier_t; - -TYPEDEF long long off_t; - -TYPEDEF unsigned int mode_t; - -TYPEDEF unsigned int nlink_t; -TYPEDEF unsigned long long ino_t; -TYPEDEF long long dev_t; -TYPEDEF long blksize_t; -TYPEDEF long long blkcnt_t; -TYPEDEF unsigned long long fsblkcnt_t; -TYPEDEF unsigned long long fsfilcnt_t; - -TYPEDEF void * timer_t; -TYPEDEF int clockid_t; -TYPEDEF long clock_t; - -TYPEDEF struct { unsigned long __bits[128/sizeof(long)]; } sigset_t; -TYPEDEF struct __siginfo siginfo_t; - -TYPEDEF unsigned int socklen_t; -TYPEDEF unsigned short sa_family_t; -TYPEDEF unsigned short in_port_t; -TYPEDEF unsigned int in_addr_t; -STRUCT in_addr { in_addr_t s_addr; }; - -TYPEDEF struct __FILE_s FILE; - -TYPEDEF int nl_item; - -TYPEDEF struct __locale * locale_t; - -STRUCT iovec { void *iov_base; size_t iov_len; }; - -EOF -- cgit v1.2.1