3 files changed, 32 insertions, 133 deletions
diff --git a/arch/x86_64/bits/alltypes.h.in b/arch/x86_64/bits/alltypes.h.in
new file mode 100644
index 00000000..e931d114
--- /dev/null
+++ b/arch/x86_64/bits/alltypes.h.in
@@ -0,0 +1,27 @@
+#define _Addr long
+#define _Int64 long
+
+TYPEDEF __builtin_va_list va_list;
+TYPEDEF __builtin_va_list __isoc_va_list;
+
+#ifndef __cplusplus
+TYPEDEF int wchar_t;
+#endif
+TYPEDEF int wint_t;
+
+#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 2
+TYPEDEF long double float_t;
+TYPEDEF long double double_t;
+#else
+TYPEDEF float float_t;
+TYPEDEF double double_t;
+#endif
+
+TYPEDEF long time_t;
+TYPEDEF long suseconds_t;
+
+TYPEDEF struct { union { int __i[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
+TYPEDEF struct { union { int __i[10]; void *__p[5]; } __u; } pthread_mutex_t;
+TYPEDEF struct { union { int __i[12]; void *__p[6]; } __u; } pthread_cond_t;
+TYPEDEF struct { union { int __i[14]; void *__p[7]; } __u; } pthread_rwlock_t;
+TYPEDEF struct { union { int __i[8]; void *__p[4]; } __u; } pthread_barrier_t;
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
deleted file mode 100755
index 8f122c32..00000000
--- a/arch/x86_64/bits/alltypes.h.sh
+++ /dev/null
@@ -1,127 +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 long size_t;
-TYPEDEF long ssize_t;
-TYPEDEF long ptrdiff_t;
-
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
-
-#ifndef __cplusplus
-TYPEDEF int wchar_t;
-#endif
-TYPEDEF int 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        int64_t;
-
-TYPEDEF unsigned char      uint8_t;
-TYPEDEF unsigned short     uint16_t;
-TYPEDEF unsigned int       uint32_t;
-TYPEDEF unsigned long      uint64_t;
-
-TYPEDEF unsigned short     __uint16_t;
-TYPEDEF unsigned int       __uint32_t;
-TYPEDEF unsigned 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          intmax_t;
-TYPEDEF unsigned long uintmax_t;
-
-TYPEDEF float float_t;
-TYPEDEF double double_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-TYPEDEF unsigned useconds_t;
-STRUCT timeval { time_t tv_sec; long 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[14]; size_t __s[7]; } __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[10]; void *__p[5]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[12]; void *__p[6]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[14]; void *__p[7]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[8]; void *__p[4]; } __u; } pthread_barrier_t;
-
-TYPEDEF long off_t;
-
-TYPEDEF unsigned int mode_t;
-
-TYPEDEF unsigned long nlink_t;
-TYPEDEF unsigned long ino_t;
-TYPEDEF unsigned long dev_t;
-TYPEDEF long blksize_t;
-TYPEDEF long blkcnt_t;
-TYPEDEF unsigned long fsblkcnt_t;
-TYPEDEF unsigned 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
diff --git a/arch/x86_64/bits/stdint.h b/arch/x86_64/bits/stdint.h
index 878e4de2..495e1e42 100644
--- a/arch/x86_64/bits/stdint.h
+++ b/arch/x86_64/bits/stdint.h
@@ -1,17 +1,16 @@
-#define INT_FAST8_MIN   INT8_MIN
+typedef int32_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef uint32_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+
 #define INT_FAST16_MIN  INT32_MIN
 #define INT_FAST32_MIN  INT32_MIN
-#define INT_FAST64_MIN  INT64_MIN
 
-#define INT_FAST8_MAX   INT8_MAX
 #define INT_FAST16_MAX  INT32_MAX
 #define INT_FAST32_MAX  INT32_MAX
-#define INT_FAST64_MAX  INT64_MAX
 
-#define UINT_FAST8_MAX  UINT8_MAX
 #define UINT_FAST16_MAX UINT32_MAX
 #define UINT_FAST32_MAX UINT32_MAX
-#define UINT_FAST64_MAX UINT64_MAX
 
 #define INTPTR_MIN      INT64_MIN
 #define INTPTR_MAX      INT64_MAX