コミット: 560415ce8a972a143e63aed5ce636c4fa1398439 - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

コミットメタ情報

• リビジョン: 560415ce8a972a143e63aed5ce636c4fa1398439 (tree)
• 日時: 2012-08-28 21:58:25
• 作者: Earnie Boyd <earnie@user...>
• コミッター: Earnie Boyd

ログメッセージ

We are going to assume that MinGW is using GCC version greater than or equal to 3.5.4 and remove any filters related to earlier versions. We are also going to remove any possibility of using a compiler other than GCC.

変更サマリ

• modified: ChangeLog
• modified: include/_mingw.h
• modified: include/accctrl.h
• modified: include/aclapi.h
• modified: include/aclui.h
• modified: include/adsprop.h
• modified: include/afxres.h
• modified: include/amaudio.h
• modified: include/amvideo.h
• modified: include/audevcod.h
• modified: include/aviriff.h
• modified: include/aygshell.h
• modified: include/basetsd.h
• modified: include/wtsapi32.h
• modified: include/wtypes.h
• modified: include/xprtdefs.h
• modified: include/zmouse.h
• modified: src/libcrt/crt/CRT_fp10.c
• modified: src/libcrt/crt/CRT_fp8.c
• modified: src/libcrt/crt/dllcrt1.c
• modified: src/libcrt/crt/pseudo-reloc.c

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
[phone]  Earnie Boyd  <[e-mail]>
+
+	We are going to assume that MinGW is using GCC version greater than or
+	equal to 3.5.4 and remove any filters related to earlier versions. We
+	are also going to remove any possibility of using a compiler other than
+	GCC.
+
+	* include/_mingw.h: Remove filters for __GNUC__ >=3, remove the
+	possibility of using a compiler other than GCC and remove any other
+	needless filters.
+	* include/acccrtl.h: Ditto.
+	* include/aclapi.h: Ditto.
+	* include/aclui.h: Ditto.
+	* include/adsprop.h: Ditto.
+	* include/afxres.h: Ditto.
+	* include/amaudio.h: Ditto.
+	* include/amvideo.h: Ditto.
+	* include/audevcod.h: Ditto.
+	* include/aygshell.h: Ditto.
+	* include/basetsd.h: Ditto.
+	* include/wtsapi32.h: Ditto.
+	* include/wtypes.h: Ditto.
+	* include/xprtdefs.h: Ditto.
+	* include/zmouse.h: Ditto.
+	* include/aviriff.h: Ditto.
+	* src/libcrt/crt/CRT_fp10.c: Ditto.
+	* src/libcrt/crt/CRT_fp8.c: Ditto.
+	* src/libcrt/crt/dllcrt1.c: Ditto.
+	* src/libcrt/crt/pseudo-reloc.c: Ditto.
+
 2012-08-23  Earnie Boyd  <[e-mail]>
 
 	* configure.ac: Set AC_CONFIG_AUX_DIR, AC_PREFIX_DEFAULT and call

--- a/include/_mingw.h
+++ b/include/_mingw.h
@@ -34,11 +34,7 @@
 #define __MINGW32_MINOR_VERSION     20
 #define __MINGW32_PATCHLEVEL        0
 
-#if __GNUC__ >= 3
-#ifndef __PCC__
 #pragma GCC system_header
-#endif
-#endif
 
 /* These are defined by the user (or the compiler)
    to specify how identifiers are imported from a DLL.
@@ -85,114 +81,60 @@
 /* Try to avoid problems with outdated checks for GCC __attribute__ support.  */
 #undef __attribute__
 
-#if defined (__PCC__)
-#  undef __DECLSPEC_SUPPORTED
+#ifdef __declspec
 # ifndef __MINGW_IMPORT
-#  define __MINGW_IMPORT extern
+  /* Note the extern. This is needed to work around GCC's
+     limitations in handling dllimport attribute.  */
+#  define __MINGW_IMPORT  extern __attribute__ ((__dllimport__))
 # endif
 # ifndef _CRTIMP
-#  define _CRTIMP
-# endif
-# ifndef __cdecl 
-#  define __cdecl  _Pragma("cdecl")
-# endif
-# ifndef __stdcall
-#  define __stdcall _Pragma("stdcall")
-# endif
-# ifndef __int64
-#  define __int64 long long
-# endif
-# ifndef __int32
-#  define __int32 long
-# endif
-# ifndef __int16
-#  define __int16 short
-# endif
-# ifndef __int8
-#  define __int8 char
-# endif
-# ifndef __small
-#  define __small char
-# endif
-# ifndef __hyper
-#  define __hyper long long
-# endif
-# ifndef __volatile__
-#  define __volatile__ volatile
-# endif
-# ifndef __restrict__
-#  define __restrict__ restrict
-# endif
-# define NONAMELESSUNION
-#elif defined(__GNUC__)
-# ifdef __declspec
-#  ifndef __MINGW_IMPORT
-   /* Note the extern. This is needed to work around GCC's
-      limitations in handling dllimport attribute.  */
-#   define __MINGW_IMPORT  extern __attribute__ ((__dllimport__))
-#  endif
-#  ifndef _CRTIMP
-#   ifdef __USE_CRTIMP
-#    define _CRTIMP  __attribute__ ((dllimport))
-#   else
-#    define _CRTIMP
-#   endif
-#  endif
-#  define __DECLSPEC_SUPPORTED
-# else /* __declspec */
-#  undef __DECLSPEC_SUPPORTED
-#  undef __MINGW_IMPORT
-#  ifndef _CRTIMP
+#  ifdef __USE_CRTIMP
+#   define _CRTIMP  __attribute__ ((dllimport))
+#  else
 #   define _CRTIMP
 #  endif
-# endif /* __declspec */
+# endif
+# define __DECLSPEC_SUPPORTED
+#else /* __declspec */
+# undef __DECLSPEC_SUPPORTED
+# undef __MINGW_IMPORT
+# ifndef _CRTIMP
+#  define _CRTIMP
+# endif
+#endif /* __declspec */
 /*
  * The next two defines can cause problems if user code adds the
  * __cdecl attribute like so:
  * void __attribute__ ((__cdecl)) foo(void); 
  */
-# ifndef __cdecl 
-#  define __cdecl  __attribute__ ((__cdecl__))
-# endif
-# ifndef __stdcall
-#  define __stdcall __attribute__ ((__stdcall__))
-# endif
-# ifndef __int64
-#  define __int64 long long
-# endif
-# ifndef __int32
-#  define __int32 long
-# endif
-# ifndef __int16
-#  define __int16 short
-# endif
-# ifndef __int8
-#  define __int8 char
-# endif
-# ifndef __small
-#  define __small char
-# endif
-# ifndef __hyper
-#  define __hyper long long
-# endif
-#else /* ! __GNUC__ && ! __PCC__ */
-# ifndef __MINGW_IMPORT
-#  define __MINGW_IMPORT  __declspec(dllimport)
-# endif
-# ifndef _CRTIMP
-#  define _CRTIMP  __declspec(dllimport)
-# endif
-# define __DECLSPEC_SUPPORTED
-# define __attribute__(x) /* nothing */
+#ifndef __cdecl 
+# define __cdecl  __attribute__ ((__cdecl__))
+#endif
+#ifndef __stdcall
+# define __stdcall __attribute__ ((__stdcall__))
+#endif
+#ifndef __int64
+# define __int64 long long
+#endif
+#ifndef __int32
+# define __int32 long
+#endif
+#ifndef __int16
+# define __int16 short
+#endif
+#ifndef __int8
+# define __int8 char
+#endif
+#ifndef __small
+# define __small char
+#endif
+#ifndef __hyper
+# define __hyper long long
 #endif
 
-#if defined (__GNUC__) && defined (__GNUC_MINOR__)
 #define __MINGW_GNUC_PREREQ(major, minor) \
   (__GNUC__ > (major) \
    || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
-#else
-#define __MINGW_GNUC_PREREQ(major, minor)  0
-#endif
 
 #ifdef __cplusplus
 # define __CRT_INLINE inline
@@ -204,58 +146,21 @@
 # endif
 #endif
 
-# ifdef __GNUC__
-#  define _CRTALIAS __CRT_INLINE __attribute__ ((__always_inline__))
-# else
-#  define _CRTALIAS __CRT_INLINE
-# endif
+#define _CRTALIAS __CRT_INLINE __attribute__ ((__always_inline__))
 
 #ifdef __cplusplus
 # define __UNUSED_PARAM(x)
 #else
-# ifdef __GNUC__
-#  define __UNUSED_PARAM(x) x __attribute__ ((__unused__))
-# else
-#  define __UNUSED_PARAM(x) x
-# endif
+# define __UNUSED_PARAM(x) x __attribute__ ((__unused__))
 #endif
 
-#ifdef __GNUC__
 #define __MINGW_ATTRIB_NORETURN __attribute__ ((__noreturn__))
 #define __MINGW_ATTRIB_CONST __attribute__ ((__const__))
-#else
-#define __MINGW_ATTRIB_NORETURN
-#define __MINGW_ATTRIB_CONST
-#endif
-
-#if __MINGW_GNUC_PREREQ (3, 0)
 #define __MINGW_ATTRIB_MALLOC __attribute__ ((__malloc__))
 #define __MINGW_ATTRIB_PURE __attribute__ ((__pure__))
-#else
-#define __MINGW_ATTRIB_MALLOC
-#define __MINGW_ATTRIB_PURE
-#endif
-
-/* Attribute `nonnull' was valid as of gcc 3.3.  We don't use GCC's
-   variadiac macro facility, because variadic macros cause syntax
-   errors with  --traditional-cpp.  */
-#if  __MINGW_GNUC_PREREQ (3, 3)
 #define __MINGW_ATTRIB_NONNULL(arg) __attribute__ ((__nonnull__ (arg)))
-#else
-#define __MINGW_ATTRIB_NONNULL(arg)
-#endif /* GNUC >= 3.3 */
-
-#if  __MINGW_GNUC_PREREQ (3, 1)
 #define __MINGW_ATTRIB_DEPRECATED __attribute__ ((__deprecated__))
-#else
-#define __MINGW_ATTRIB_DEPRECATED
-#endif /* GNUC >= 3.1 */
- 
-#if  __MINGW_GNUC_PREREQ (3, 3)
 #define __MINGW_NOTHROW __attribute__ ((__nothrow__))
-#else
-#define __MINGW_NOTHROW
-#endif /* GNUC >= 3.3 */
 
 
 /* TODO: Mark (almost) all CRT functions as __MINGW_NOTHROW.  This will

--- a/include/accctrl.h
+++ b/include/accctrl.h
@@ -1,8 +1,6 @@
 #ifndef _ACCCTRL_H
 #define _ACCCTRL_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/aclapi.h
+++ b/include/aclapi.h
@@ -1,8 +1,6 @@
 #ifndef _ACLAPI_H
 #define _ACLAPI_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #include <windows.h>
 #include <accctrl.h>

--- a/include/aclui.h
+++ b/include/aclui.h
@@ -1,8 +1,6 @@
 #ifndef _ACLUI_H
 #define _ACLUI_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifndef _OBJC_NO_COM
 #include <objbase.h>

--- a/include/adsprop.h
+++ b/include/adsprop.h
@@ -14,9 +14,7 @@
  */
 #ifndef _ADSPROP_H
 #define _ADSPROP_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/afxres.h
+++ b/include/afxres.h
@@ -1,8 +1,6 @@
 #ifndef _AFXRES_H
 #define _AFXRES_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/amaudio.h
+++ b/include/amaudio.h
@@ -1,8 +1,6 @@
 #ifndef _AMAUDIO_H
 #define _AMAUDIO_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #include <dsound.h>
 

--- a/include/amvideo.h
+++ b/include/amvideo.h
@@ -1,8 +1,6 @@
 #ifndef _AMVIDEO_H
 #define _AMVIDEO_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #include <ddraw.h>
 #include <strmif.h>

--- a/include/audevcod.h
+++ b/include/audevcod.h
@@ -1,8 +1,6 @@
 #ifndef _AUDEVCOD_H
 #define _AUDEVCOD_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/aviriff.h
+++ b/include/aviriff.h
@@ -1,15 +1,9 @@
 #ifndef _AVIRIFF_H
 #define _AVIRIFF_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
-#ifndef _MMSYSTEM_H
 #include <mmsystem.h>
-#endif
-#ifndef _WINGDI_H
 #include <wingdi.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/aygshell.h
+++ b/include/aygshell.h
@@ -1,8 +1,6 @@
 #ifndef _AYGSHELL_H
 #define _AYGSHELL_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #if _WIN32_WCE >= 400
 

--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -1,14 +1,10 @@
 #ifndef _BASETSD_H
 #define _BASETSD_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
-#ifdef __GNUC__
 #ifndef __int64
 #define __int64 long long
 #endif
-#endif
 
 #if defined(_WIN64)
 #define __int3264   __int64
@@ -16,6 +12,8 @@
 #else /*  !_WIN64 */
 #define __int3264   __int32
 #define ADDRESS_TAG_BIT 0x80000000UL
+#endif /* !_WIN64 */
+
 #define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) )
 #define HandleToLong( h ) ((LONG)(LONG_PTR) (h) )
 #define LongToHandle( h) ((HANDLE)(LONG_PTR) (h))
@@ -29,7 +27,6 @@
 #define UIntToPtr( ui )  ((VOID*)(UINT_PTR)((unsigned int)ui))
 #define LongToPtr( l )   ((VOID*)(LONG_PTR)((long)l))
 #define ULongToPtr( ul )  ((VOID*)(ULONG_PTR)((unsigned long)ul))
-#endif /* !_WIN64 */
 
 #define UlongToPtr(ul) ULongToPtr(ul)
 #define UintToPtr(ui) UIntToPtr(ui)
@@ -50,9 +47,7 @@ extern "C" {
 typedef signed char INT8;
 typedef signed short INT16;
 typedef int LONG32, *PLONG32;
-#ifndef XFree86Server
 typedef int INT32, *PINT32;
-#endif /* ndef XFree86Server */
 typedef unsigned char UINT8;
 typedef unsigned short UINT16;
 typedef unsigned int ULONG32, *PULONG32;

--- a/include/wtsapi32.h
+++ b/include/wtsapi32.h
@@ -1,8 +1,6 @@
 #ifndef _WTSAPI32_H
 #define _WTSAPI32_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/wtypes.h
+++ b/include/wtypes.h
@@ -3,9 +3,7 @@
 
 #ifndef _WTYPES_H
 #define _WTYPES_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifdef __cplusplus
 extern "C" {

--- a/include/xprtdefs.h
+++ b/include/xprtdefs.h
@@ -1,8 +1,6 @@
 #ifndef _XPTRDEFS_H
 #define _XPTRDEFS_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
 /*--- DirectShow Reference - DirectShow Structures - TIMECODE_SAMPLE Structure */
 #define ED_DEVCAP_ATN_READ 0x13B7

--- a/include/zmouse.h
+++ b/include/zmouse.h
@@ -13,9 +13,7 @@
 
 #ifndef _ZMOUSE_H
 #define _ZMOUSE_H
-#if __GNUC__ >=3
 #pragma GCC system_header
-#endif
 
 #ifndef WM_MOUSEWHEEL
 # define WM_MOUSEWHEEL (WM_MOUSELAST + 1)

--- a/src/libcrt/crt/CRT_fp10.c
+++ b/src/libcrt/crt/CRT_fp10.c
@@ -13,8 +13,4 @@
 void _fpreset (void)
   { __asm__ ( "fninit" ) ;}
 
-#if defined(__PCC__)
-void _Pragma("alias _fpreset") fpreset(void);
-#else
 void __attribute__ ((alias ("_fpreset"))) fpreset(void);
-#endif

--- a/src/libcrt/crt/CRT_fp8.c
+++ b/src/libcrt/crt/CRT_fp8.c
@@ -15,8 +15,4 @@ extern void (*_imp___fpreset)(void) ;
 void _fpreset (void)
 {  (*_imp___fpreset)(); }
 
-#if defined(__PCC__)
-void _Pragma("alias _fpreset") fpreset(void);
-#else
 void __attribute__ ((alias ("_fpreset"))) fpreset(void);
-#endif

--- a/src/libcrt/crt/dllcrt1.c
+++ b/src/libcrt/crt/dllcrt1.c
@@ -21,10 +21,8 @@ extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;
  * should have done that already. I also don't set the file handle modes,
  * because that would be rude. */
 
-#ifdef	__GNUC__
 extern void __main ();
 extern void __do_global_dtors ();
-#endif
 
 typedef void (* p_atexit_fn )(void);
 static p_atexit_fn* first_atexit;
@@ -75,14 +73,12 @@ DllMainCRTStartup (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
 	 that have non-zero offsets.  */ 
       _pei386_runtime_relocator ();
 
-#ifdef	__GNUC__
       /* From libgcc.a, __main calls global class constructors,
 	 __do_global_ctors, which registers __do_global_dtors
 	 as the first entry of the private atexit table we
 	 have just initialised  */
       __main ();
       	
-#endif
    }
 
   /*

--- a/src/libcrt/crt/pseudo-reloc.c
+++ b/src/libcrt/crt/pseudo-reloc.c
@@ -34,11 +34,7 @@
 # define NO_COPY
 #endif
 
-#ifdef __GNUC__
 #define ATTRIBUTE_NORETURN __attribute__ ((noreturn))
-#else
-#define ATTRIBUTE_NORETURN
-#endif
 
 #ifndef __MINGW_LSYMBOL
 #define __MINGW_LSYMBOL(sym) sym