From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10303 Path: news.gmane.org!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH 4/5] create 32-/64-bit generic bits overlays Date: Wed, 6 Jul 2016 00:29:52 -0400 Message-ID: <20160706042951.GW15995@brightrain.aerifal.cx> References: <20160706035414.10083-1-koorogi@koorogi.info> <20160706035414.10083-4-koorogi@koorogi.info> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1467779414 10060 80.91.229.3 (6 Jul 2016 04:30:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Jul 2016 04:30:14 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-10316-gllmg-musl=m.gmane.org@lists.openwall.com Wed Jul 06 06:30:10 2016 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1bKeTQ-000548-9p for gllmg-musl@m.gmane.org; Wed, 06 Jul 2016 06:30:08 +0200 Original-Received: (qmail 3791 invoked by uid 550); 6 Jul 2016 04:30:06 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 3770 invoked from network); 6 Jul 2016 04:30:05 -0000 Content-Disposition: inline In-Reply-To: <20160706035414.10083-4-koorogi@koorogi.info> User-Agent: Mutt/1.5.21 (2010-09-15) Original-Sender: Rich Felker Xref: news.gmane.org gmane.linux.lib.musl.general:10303 Archived-At: Before committing this I'd like to consider whether it might make more sense to remove even more. By having the arch's alltypes.h.in define one or more simple internal-use macros for word-size, I think most/all of these definitions could go in the top-level headers directly, letting us actually remove entire files (posix.h, limits.h, stdint.h, maybe others) from bits. One thing I'd particularly like to do is get the duplicate pthread type definitions out of the individual archs' alltypes.h.in files and into the generic alltypes.h.in, so that there's no risk of introducing inconsistency when new archs are added. This could be done with such a macro, but it could also be done with an approach like what you have now, using multiple bits fallback dirs to produce alltypes.h. Rich On Tue, Jul 05, 2016 at 10:54:13PM -0500, Bobby Bingham wrote: > --- > arch/aarch64/arch.mak | 2 +- > arch/aarch64/bits/limits.h | 7 ------- > arch/arm/arch.mak | 2 +- > arch/{microblaze => generic-32}/bits/limits.h | 0 > arch/{arm => generic-32}/bits/posix.h | 0 > arch/{arm => generic-32}/bits/reg.h | 1 - > arch/{arm => generic-32}/bits/stdint.h | 0 > arch/{mips64 => generic-64}/bits/limits.h | 0 > arch/{aarch64 => generic-64}/bits/posix.h | 0 > arch/{aarch64 => generic-64}/bits/reg.h | 0 > arch/{aarch64 => generic-64}/bits/stdint.h | 0 > arch/i386/arch.mak | 2 +- > arch/i386/bits/posix.h | 2 -- > arch/i386/bits/stdint.h | 20 -------------------- > arch/microblaze/arch.mak | 2 +- > arch/microblaze/bits/posix.h | 2 -- > arch/microblaze/bits/reg.h | 3 --- > arch/microblaze/bits/stdint.h | 20 -------------------- > arch/mips/arch.mak | 2 +- > arch/mips/bits/limits.h | 7 ------- > arch/mips/bits/posix.h | 2 -- > arch/mips/bits/stdint.h | 20 -------------------- > arch/mips64/arch.mak | 2 +- > arch/mips64/bits/stdint.h | 20 -------------------- > arch/mipsn32/arch.mak | 2 +- > arch/mipsn32/bits/limits.h | 7 ------- > arch/mipsn32/bits/posix.h | 2 -- > arch/mipsn32/bits/stdint.h | 20 -------------------- > arch/or1k/arch.mak | 2 +- > arch/or1k/bits/posix.h | 2 -- > arch/or1k/bits/reg.h | 3 --- > arch/or1k/bits/stdint.h | 20 -------------------- > arch/powerpc/arch.mak | 2 +- > arch/powerpc/bits/limits.h | 7 ------- > arch/powerpc/bits/posix.h | 2 -- > arch/powerpc/bits/reg.h | 3 --- > arch/powerpc/bits/stdint.h | 20 -------------------- > arch/powerpc64/arch.mak | 2 +- > arch/powerpc64/bits/limits.h | 7 ------- > arch/powerpc64/bits/posix.h | 2 -- > arch/powerpc64/bits/reg.h | 3 --- > arch/powerpc64/bits/stdint.h | 20 -------------------- > arch/sh/arch.mak | 2 +- > arch/sh/bits/posix.h | 2 -- > arch/sh/bits/stdint.h | 20 -------------------- > arch/x32/arch.mak | 2 +- > arch/x32/bits/posix.h | 2 -- > arch/x32/bits/stdint.h | 20 -------------------- > arch/x86_64/arch.mak | 2 +- > arch/x86_64/bits/posix.h | 2 -- > arch/x86_64/bits/stdint.h | 20 -------------------- > 51 files changed, 13 insertions(+), 301 deletions(-) > delete mode 100644 arch/aarch64/bits/limits.h > rename arch/{microblaze => generic-32}/bits/limits.h (100%) > rename arch/{arm => generic-32}/bits/posix.h (100%) > rename arch/{arm => generic-32}/bits/reg.h (76%) > rename arch/{arm => generic-32}/bits/stdint.h (100%) > rename arch/{mips64 => generic-64}/bits/limits.h (100%) > rename arch/{aarch64 => generic-64}/bits/posix.h (100%) > rename arch/{aarch64 => generic-64}/bits/reg.h (100%) > rename arch/{aarch64 => generic-64}/bits/stdint.h (100%) > delete mode 100644 arch/i386/bits/posix.h > delete mode 100644 arch/i386/bits/stdint.h > delete mode 100644 arch/microblaze/bits/posix.h > delete mode 100644 arch/microblaze/bits/reg.h > delete mode 100644 arch/microblaze/bits/stdint.h > delete mode 100644 arch/mips/bits/limits.h > delete mode 100644 arch/mips/bits/posix.h > delete mode 100644 arch/mips/bits/stdint.h > delete mode 100644 arch/mips64/bits/stdint.h > delete mode 100644 arch/mipsn32/bits/limits.h > delete mode 100644 arch/mipsn32/bits/posix.h > delete mode 100644 arch/mipsn32/bits/stdint.h > delete mode 100644 arch/or1k/bits/posix.h > delete mode 100644 arch/or1k/bits/reg.h > delete mode 100644 arch/or1k/bits/stdint.h > delete mode 100644 arch/powerpc/bits/limits.h > delete mode 100644 arch/powerpc/bits/posix.h > delete mode 100644 arch/powerpc/bits/reg.h > delete mode 100644 arch/powerpc/bits/stdint.h > delete mode 100644 arch/powerpc64/bits/limits.h > delete mode 100644 arch/powerpc64/bits/posix.h > delete mode 100644 arch/powerpc64/bits/reg.h > delete mode 100644 arch/powerpc64/bits/stdint.h > delete mode 100644 arch/sh/bits/posix.h > delete mode 100644 arch/sh/bits/stdint.h > delete mode 100644 arch/x32/bits/posix.h > delete mode 100644 arch/x32/bits/stdint.h > delete mode 100644 arch/x86_64/bits/posix.h > delete mode 100644 arch/x86_64/bits/stdint.h > > diff --git a/arch/aarch64/arch.mak b/arch/aarch64/arch.mak > index 20b4b2e..08bfbe7 100644 > --- a/arch/aarch64/arch.mak > +++ b/arch/aarch64/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = aarch64 generic-ld128 generic > +ARCH_FALLBACKS = aarch64 generic-64 generic-ld128 generic > diff --git a/arch/aarch64/bits/limits.h b/arch/aarch64/bits/limits.h > deleted file mode 100644 > index 0226588..0000000 > --- a/arch/aarch64/bits/limits.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ > - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > -#define LONG_BIT 64 > -#endif > - > -#define LONG_MAX 0x7fffffffffffffffL > -#define LLONG_MAX 0x7fffffffffffffffLL > diff --git a/arch/arm/arch.mak b/arch/arm/arch.mak > index 3d51073..fb84cd9 100644 > --- a/arch/arm/arch.mak > +++ b/arch/arm/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = arm generic-ld64 generic > +ARCH_FALLBACKS = arm generic-32 generic-ld64 generic > diff --git a/arch/microblaze/bits/limits.h b/arch/generic-32/bits/limits.h > similarity index 100% > rename from arch/microblaze/bits/limits.h > rename to arch/generic-32/bits/limits.h > diff --git a/arch/arm/bits/posix.h b/arch/generic-32/bits/posix.h > similarity index 100% > rename from arch/arm/bits/posix.h > rename to arch/generic-32/bits/posix.h > diff --git a/arch/arm/bits/reg.h b/arch/generic-32/bits/reg.h > similarity index 76% > rename from arch/arm/bits/reg.h > rename to arch/generic-32/bits/reg.h > index 0c7bffc..0192a29 100644 > --- a/arch/arm/bits/reg.h > +++ b/arch/generic-32/bits/reg.h > @@ -1,3 +1,2 @@ > #undef __WORDSIZE > #define __WORDSIZE 32 > -/* FIXME */ > diff --git a/arch/arm/bits/stdint.h b/arch/generic-32/bits/stdint.h > similarity index 100% > rename from arch/arm/bits/stdint.h > rename to arch/generic-32/bits/stdint.h > diff --git a/arch/mips64/bits/limits.h b/arch/generic-64/bits/limits.h > similarity index 100% > rename from arch/mips64/bits/limits.h > rename to arch/generic-64/bits/limits.h > diff --git a/arch/aarch64/bits/posix.h b/arch/generic-64/bits/posix.h > similarity index 100% > rename from arch/aarch64/bits/posix.h > rename to arch/generic-64/bits/posix.h > diff --git a/arch/aarch64/bits/reg.h b/arch/generic-64/bits/reg.h > similarity index 100% > rename from arch/aarch64/bits/reg.h > rename to arch/generic-64/bits/reg.h > diff --git a/arch/aarch64/bits/stdint.h b/arch/generic-64/bits/stdint.h > similarity index 100% > rename from arch/aarch64/bits/stdint.h > rename to arch/generic-64/bits/stdint.h > diff --git a/arch/i386/arch.mak b/arch/i386/arch.mak > index 9ed39c4..3d760cf 100644 > --- a/arch/i386/arch.mak > +++ b/arch/i386/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = i386 generic-le generic > +ARCH_FALLBACKS = i386 generic-32 generic-le generic > diff --git a/arch/i386/bits/posix.h b/arch/i386/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/i386/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/i386/bits/stdint.h b/arch/i386/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/i386/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/microblaze/arch.mak b/arch/microblaze/arch.mak > index 2d907b7..42d96fc 100644 > --- a/arch/microblaze/arch.mak > +++ b/arch/microblaze/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = microblaze generic-ld64 generic > +ARCH_FALLBACKS = microblaze generic-32 generic-ld64 generic > diff --git a/arch/microblaze/bits/posix.h b/arch/microblaze/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/microblaze/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/microblaze/bits/reg.h b/arch/microblaze/bits/reg.h > deleted file mode 100644 > index 0c7bffc..0000000 > --- a/arch/microblaze/bits/reg.h > +++ /dev/null > @@ -1,3 +0,0 @@ > -#undef __WORDSIZE > -#define __WORDSIZE 32 > -/* FIXME */ > diff --git a/arch/microblaze/bits/stdint.h b/arch/microblaze/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/microblaze/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/mips/arch.mak b/arch/mips/arch.mak > index 3d9f55e..7f288cb 100644 > --- a/arch/mips/arch.mak > +++ b/arch/mips/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = mips generic-ld64 generic > +ARCH_FALLBACKS = mips generic-32 generic-ld64 generic > diff --git a/arch/mips/bits/limits.h b/arch/mips/bits/limits.h > deleted file mode 100644 > index fbc6d23..0000000 > --- a/arch/mips/bits/limits.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ > - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > -#define LONG_BIT 32 > -#endif > - > -#define LONG_MAX 0x7fffffffL > -#define LLONG_MAX 0x7fffffffffffffffLL > diff --git a/arch/mips/bits/posix.h b/arch/mips/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/mips/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/mips/bits/stdint.h b/arch/mips/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/mips/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/mips64/arch.mak b/arch/mips64/arch.mak > index eb9c4bf..abd5432 100644 > --- a/arch/mips64/arch.mak > +++ b/arch/mips64/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = mips64 generic-ld128 generic > +ARCH_FALLBACKS = mips64 generic-64 generic-ld128 generic > diff --git a/arch/mips64/bits/stdint.h b/arch/mips64/bits/stdint.h > deleted file mode 100644 > index 1bb147f..0000000 > --- a/arch/mips64/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT64_MIN > -#define INTPTR_MAX INT64_MAX > -#define UINTPTR_MAX UINT64_MAX > -#define PTRDIFF_MIN INT64_MIN > -#define PTRDIFF_MAX INT64_MAX > -#define SIZE_MAX UINT64_MAX > diff --git a/arch/mipsn32/arch.mak b/arch/mipsn32/arch.mak > index 7219df3..21ea05e 100644 > --- a/arch/mipsn32/arch.mak > +++ b/arch/mipsn32/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = mipsn32 generic-ld128 generic > +ARCH_FALLBACKS = mipsn32 generic-32 generic-ld128 generic > diff --git a/arch/mipsn32/bits/limits.h b/arch/mipsn32/bits/limits.h > deleted file mode 100644 > index fbc6d23..0000000 > --- a/arch/mipsn32/bits/limits.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ > - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > -#define LONG_BIT 32 > -#endif > - > -#define LONG_MAX 0x7fffffffL > -#define LLONG_MAX 0x7fffffffffffffffLL > diff --git a/arch/mipsn32/bits/posix.h b/arch/mipsn32/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/mipsn32/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/mipsn32/bits/stdint.h b/arch/mipsn32/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/mipsn32/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/or1k/arch.mak b/arch/or1k/arch.mak > index 6dba423..e602974 100644 > --- a/arch/or1k/arch.mak > +++ b/arch/or1k/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = or1k generic-be generic-ld64 generic > +ARCH_FALLBACKS = or1k generic-32 generic-be generic-ld64 generic > diff --git a/arch/or1k/bits/posix.h b/arch/or1k/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/or1k/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/or1k/bits/reg.h b/arch/or1k/bits/reg.h > deleted file mode 100644 > index 0c7bffc..0000000 > --- a/arch/or1k/bits/reg.h > +++ /dev/null > @@ -1,3 +0,0 @@ > -#undef __WORDSIZE > -#define __WORDSIZE 32 > -/* FIXME */ > diff --git a/arch/or1k/bits/stdint.h b/arch/or1k/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/or1k/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/powerpc/arch.mak b/arch/powerpc/arch.mak > index 71389fd..cc6ba13 100644 > --- a/arch/powerpc/arch.mak > +++ b/arch/powerpc/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = powerpc generic-ld64 generic > +ARCH_FALLBACKS = powerpc generic-32 generic-ld64 generic > diff --git a/arch/powerpc/bits/limits.h b/arch/powerpc/bits/limits.h > deleted file mode 100644 > index fbc6d23..0000000 > --- a/arch/powerpc/bits/limits.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ > - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > -#define LONG_BIT 32 > -#endif > - > -#define LONG_MAX 0x7fffffffL > -#define LLONG_MAX 0x7fffffffffffffffLL > diff --git a/arch/powerpc/bits/posix.h b/arch/powerpc/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/powerpc/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/powerpc/bits/reg.h b/arch/powerpc/bits/reg.h > deleted file mode 100644 > index 0c7bffc..0000000 > --- a/arch/powerpc/bits/reg.h > +++ /dev/null > @@ -1,3 +0,0 @@ > -#undef __WORDSIZE > -#define __WORDSIZE 32 > -/* FIXME */ > diff --git a/arch/powerpc/bits/stdint.h b/arch/powerpc/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/powerpc/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/powerpc64/arch.mak b/arch/powerpc64/arch.mak > index 939ccc2..85d9f35 100644 > --- a/arch/powerpc64/arch.mak > +++ b/arch/powerpc64/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = powerpc64 generic-ld64 generic > +ARCH_FALLBACKS = powerpc64 generic-64 generic-ld64 generic > diff --git a/arch/powerpc64/bits/limits.h b/arch/powerpc64/bits/limits.h > deleted file mode 100644 > index 0226588..0000000 > --- a/arch/powerpc64/bits/limits.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ > - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) > -#define LONG_BIT 64 > -#endif > - > -#define LONG_MAX 0x7fffffffffffffffL > -#define LLONG_MAX 0x7fffffffffffffffLL > diff --git a/arch/powerpc64/bits/posix.h b/arch/powerpc64/bits/posix.h > deleted file mode 100644 > index c37b94c..0000000 > --- a/arch/powerpc64/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_LP64_OFF64 1 > -#define _POSIX_V7_LP64_OFF64 1 > diff --git a/arch/powerpc64/bits/reg.h b/arch/powerpc64/bits/reg.h > deleted file mode 100644 > index 49382c8..0000000 > --- a/arch/powerpc64/bits/reg.h > +++ /dev/null > @@ -1,3 +0,0 @@ > -#undef __WORDSIZE > -#define __WORDSIZE 64 > -/* FIXME */ > diff --git a/arch/powerpc64/bits/stdint.h b/arch/powerpc64/bits/stdint.h > deleted file mode 100644 > index 1bb147f..0000000 > --- a/arch/powerpc64/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT64_MIN > -#define INTPTR_MAX INT64_MAX > -#define UINTPTR_MAX UINT64_MAX > -#define PTRDIFF_MIN INT64_MIN > -#define PTRDIFF_MAX INT64_MAX > -#define SIZE_MAX UINT64_MAX > diff --git a/arch/sh/arch.mak b/arch/sh/arch.mak > index 54c4951..0f26a00 100644 > --- a/arch/sh/arch.mak > +++ b/arch/sh/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = sh generic-ld64 generic > +ARCH_FALLBACKS = sh generic-32 generic-ld64 generic > diff --git a/arch/sh/bits/posix.h b/arch/sh/bits/posix.h > deleted file mode 100644 > index 30a3871..0000000 > --- a/arch/sh/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_ILP32_OFFBIG 1 > -#define _POSIX_V7_ILP32_OFFBIG 1 > diff --git a/arch/sh/bits/stdint.h b/arch/sh/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/sh/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/x32/arch.mak b/arch/x32/arch.mak > index f1c9ec5..e444e14 100644 > --- a/arch/x32/arch.mak > +++ b/arch/x32/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = x32 generic-le generic > +ARCH_FALLBACKS = x32 generic-32 generic-le generic > diff --git a/arch/x32/bits/posix.h b/arch/x32/bits/posix.h > deleted file mode 100644 > index c37b94c..0000000 > --- a/arch/x32/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_LP64_OFF64 1 > -#define _POSIX_V7_LP64_OFF64 1 > diff --git a/arch/x32/bits/stdint.h b/arch/x32/bits/stdint.h > deleted file mode 100644 > index d1b2712..0000000 > --- a/arch/x32/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT32_MIN > -#define INTPTR_MAX INT32_MAX > -#define UINTPTR_MAX UINT32_MAX > -#define PTRDIFF_MIN INT32_MIN > -#define PTRDIFF_MAX INT32_MAX > -#define SIZE_MAX UINT32_MAX > diff --git a/arch/x86_64/arch.mak b/arch/x86_64/arch.mak > index a9dace7..a71afe3 100644 > --- a/arch/x86_64/arch.mak > +++ b/arch/x86_64/arch.mak > @@ -1 +1 @@ > -ARCH_FALLBACKS = x86_64 generic-le generic > +ARCH_FALLBACKS = x86_64 generic-64 generic-le generic > diff --git a/arch/x86_64/bits/posix.h b/arch/x86_64/bits/posix.h > deleted file mode 100644 > index c37b94c..0000000 > --- a/arch/x86_64/bits/posix.h > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define _POSIX_V6_LP64_OFF64 1 > -#define _POSIX_V7_LP64_OFF64 1 > diff --git a/arch/x86_64/bits/stdint.h b/arch/x86_64/bits/stdint.h > deleted file mode 100644 > index 1bb147f..0000000 > --- a/arch/x86_64/bits/stdint.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -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_FAST16_MAX INT32_MAX > -#define INT_FAST32_MAX INT32_MAX > - > -#define UINT_FAST16_MAX UINT32_MAX > -#define UINT_FAST32_MAX UINT32_MAX > - > -#define INTPTR_MIN INT64_MIN > -#define INTPTR_MAX INT64_MAX > -#define UINTPTR_MAX UINT64_MAX > -#define PTRDIFF_MIN INT64_MIN > -#define PTRDIFF_MAX INT64_MAX > -#define SIZE_MAX UINT64_MAX > -- > 2.9.0