From 00ec11d19e7c5fc99b5383233510c60a565cb01b Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Oct 2019 15:27:00 -0400 Subject: remove per-arch definitions for va_list now that commit f7f1079796abc6f97c69521d2334e9c7d3945dd8 removed the legacy i386 conditional definition, va_list is in no way arch-specific, and has no reason to be in the future. move it to the shared part of alltypes.h.in --- arch/aarch64/bits/alltypes.h.in | 3 --- arch/arm/bits/alltypes.h.in | 3 --- arch/i386/bits/alltypes.h.in | 3 --- arch/m68k/bits/alltypes.h.in | 3 --- arch/microblaze/bits/alltypes.h.in | 3 --- arch/mips/bits/alltypes.h.in | 3 --- arch/mips64/bits/alltypes.h.in | 3 --- arch/mipsn32/bits/alltypes.h.in | 3 --- arch/or1k/bits/alltypes.h.in | 3 --- arch/powerpc/bits/alltypes.h.in | 3 --- arch/powerpc64/bits/alltypes.h.in | 3 --- arch/riscv64/bits/alltypes.h.in | 3 --- arch/s390x/bits/alltypes.h.in | 3 --- arch/sh/bits/alltypes.h.in | 3 --- arch/x32/bits/alltypes.h.in | 3 --- arch/x86_64/bits/alltypes.h.in | 3 --- include/alltypes.h.in | 3 +++ 17 files changed, 3 insertions(+), 48 deletions(-) diff --git a/arch/aarch64/bits/alltypes.h.in b/arch/aarch64/bits/alltypes.h.in index d56abdac..cb2f4b05 100644 --- a/arch/aarch64/bits/alltypes.h.in +++ b/arch/aarch64/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long #define _Reg long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF unsigned wchar_t; #endif diff --git a/arch/arm/bits/alltypes.h.in b/arch/arm/bits/alltypes.h.in index 667963c7..b92ca732 100644 --- a/arch/arm/bits/alltypes.h.in +++ b/arch/arm/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF unsigned wchar_t; #endif diff --git a/arch/i386/bits/alltypes.h.in b/arch/i386/bits/alltypes.h.in index 2a7fb54b..c852313c 100644 --- a/arch/i386/bits/alltypes.h.in +++ b/arch/i386/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; diff --git a/arch/m68k/bits/alltypes.h.in b/arch/m68k/bits/alltypes.h.in index bd37a631..6e9ee3fb 100644 --- a/arch/m68k/bits/alltypes.h.in +++ b/arch/m68k/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; diff --git a/arch/microblaze/bits/alltypes.h.in b/arch/microblaze/bits/alltypes.h.in index 66ca18ad..0c7d4917 100644 --- a/arch/microblaze/bits/alltypes.h.in +++ b/arch/microblaze/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/mips/bits/alltypes.h.in b/arch/mips/bits/alltypes.h.in index 66ca18ad..0c7d4917 100644 --- a/arch/mips/bits/alltypes.h.in +++ b/arch/mips/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/mips64/bits/alltypes.h.in b/arch/mips64/bits/alltypes.h.in index 2b2e34a8..c3ab9676 100644 --- a/arch/mips64/bits/alltypes.h.in +++ b/arch/mips64/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long #define _Reg long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/mipsn32/bits/alltypes.h.in b/arch/mipsn32/bits/alltypes.h.in index 66ca18ad..0c7d4917 100644 --- a/arch/mipsn32/bits/alltypes.h.in +++ b/arch/mipsn32/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/or1k/bits/alltypes.h.in b/arch/or1k/bits/alltypes.h.in index 667963c7..b92ca732 100644 --- a/arch/or1k/bits/alltypes.h.in +++ b/arch/or1k/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF unsigned wchar_t; #endif diff --git a/arch/powerpc/bits/alltypes.h.in b/arch/powerpc/bits/alltypes.h.in index 8e687ef1..618f374c 100644 --- a/arch/powerpc/bits/alltypes.h.in +++ b/arch/powerpc/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; diff --git a/arch/powerpc64/bits/alltypes.h.in b/arch/powerpc64/bits/alltypes.h.in index 5b205851..d525bdc8 100644 --- a/arch/powerpc64/bits/alltypes.h.in +++ b/arch/powerpc64/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long #define _Reg long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/riscv64/bits/alltypes.h.in b/arch/riscv64/bits/alltypes.h.in index ae9ba41d..70c4fe76 100644 --- a/arch/riscv64/bits/alltypes.h.in +++ b/arch/riscv64/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long #define _Reg long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/s390x/bits/alltypes.h.in b/arch/s390x/bits/alltypes.h.in index 1a838462..92845ce0 100644 --- a/arch/s390x/bits/alltypes.h.in +++ b/arch/s390x/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long #define _Reg long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/arch/sh/bits/alltypes.h.in b/arch/sh/bits/alltypes.h.in index 8e687ef1..618f374c 100644 --- a/arch/sh/bits/alltypes.h.in +++ b/arch/sh/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg int -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; diff --git a/arch/x32/bits/alltypes.h.in b/arch/x32/bits/alltypes.h.in index c612eec0..c71f2468 100644 --- a/arch/x32/bits/alltypes.h.in +++ b/arch/x32/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long long #define _Reg long long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; diff --git a/arch/x86_64/bits/alltypes.h.in b/arch/x86_64/bits/alltypes.h.in index dc551d47..a484f177 100644 --- a/arch/x86_64/bits/alltypes.h.in +++ b/arch/x86_64/bits/alltypes.h.in @@ -2,9 +2,6 @@ #define _Int64 long #define _Reg long -TYPEDEF __builtin_va_list va_list; -TYPEDEF __builtin_va_list __isoc_va_list; - #ifndef __cplusplus TYPEDEF int wchar_t; #endif diff --git a/include/alltypes.h.in b/include/alltypes.h.in index 4cc879b1..8e76c839 100644 --- a/include/alltypes.h.in +++ b/include/alltypes.h.in @@ -60,6 +60,9 @@ TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t; STRUCT _IO_FILE { char __x; }; TYPEDEF struct _IO_FILE FILE; +TYPEDEF __builtin_va_list va_list; +TYPEDEF __builtin_va_list __isoc_va_list; + TYPEDEF struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t; TYPEDEF struct __locale_struct * locale_t; -- cgit 1.4.1