diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2012-06-09 11:57:58 +0100 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2012-06-09 17:58:53 +0100 |
commit | 3090e57a7623df3083462032f942f4bb64d46921 (patch) | |
tree | a5d649599f5f17b9f65e0927150257a74cdd0bae /win32 | |
parent | c716620072a2a924157c74219f6e6a9b5c3a8d46 (diff) | |
download | perl-3090e57a7623df3083462032f942f4bb64d46921.tar.gz |
Remove __GNUC__ / _MSC_VER games from win32/config_H.*
The code was added by 465b7da985, based on changes in ActivePerl 816, but
it's not working correctly because the current build process winds up with
a config.h in lib/CORE which doesn't contain that code anyway.
(The appropriate canned config_H.* file is copied to config.h in order to
build miniperl.exe, but then miniperl.exe is used to run config_h.PL to
generate the real config.h from config_h.SH and config.sh. The real
config.h is then used to build perl.exe and is what gets copied into
lib/CORE for later use when building extensions, but it doesn't contain
the support for other compilers because that isn't in config_h.SH...)
Removing the code won't affect ActivePerl since it has not been getting
installed anyway, and Jan Dubois has confirmed that it is possible to
build a Perl extension using e.g. Off_t with MinGW even with the VC
config.h header file. Furthermore, anyone building perl from source
themselves will presumably be able to use the same compiler to build
extensions as they used to build perl itself anyway, so there is no
obvious need for this in the core perl distro.
Therefore, removing it rather than fixing it is better for simplicity.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile | 2 | ||||
-rw-r--r-- | win32/config_H.gc | 49 | ||||
-rw-r--r-- | win32/config_H.gc64 | 68 | ||||
-rw-r--r-- | win32/config_H.gc64nox | 68 | ||||
-rw-r--r-- | win32/config_H.vc | 49 | ||||
-rw-r--r-- | win32/config_H.vc64 | 68 | ||||
-rw-r--r-- | win32/makefile.mk | 2 |
7 files changed, 67 insertions, 239 deletions
diff --git a/win32/Makefile b/win32/Makefile index afc4dce0c8..11cea595cf 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -846,8 +846,6 @@ config.w32 : $(CFGSH_TMPL) # edit config.vc, then make perl in a minimal configuration (i.e. with MULTI, # ITHREADS, IMP_SYS, LARGE_FILES and PERLIO off), then make this target # to regenerate config_H.vc. -# unfortunately, some further manual editing is also then required to restore all -# the special __GNUC__ handling that is otherwise lost. # repeat for config.vc64 and config_H.vc64 if you have a suitable build # environment, otherwise hand-edit them to maintain the same differences with # config.vc and config_H.vc as before. diff --git a/win32/config_H.gc b/win32/config_H.gc index fce9e21f72..846a296358 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -912,15 +912,9 @@ */ #define HAS_QUAD /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define Quad_t long long /**/ -# define Uquad_t unsigned long long /**/ -# define QUADKIND 3 /**/ -# else -# define Quad_t __int64 /**/ -# define Uquad_t unsigned __int64 /**/ -# define QUADKIND 5 /**/ -# endif +# define Quad_t long long /**/ +# define Uquad_t unsigned long long /**/ +# define QUADKIND 3 /**/ # define QUAD_IS_INT 1 # define QUAD_IS_LONG 2 # define QUAD_IS_LONG_LONG 3 @@ -1063,9 +1057,7 @@ * This symbol is defined if the C compiler can cast negative * or large floating point numbers to 32-bit ints. */ -#ifndef _MSC_VER -# define CASTI32 /**/ -#endif +#define CASTI32 /**/ /* CASTNEGFLOAT: * This symbol is defined if the C compiler can cast negative @@ -2237,11 +2229,7 @@ * static (c89 compilers) */ #define HAS_STATIC_INLINE /**/ -#ifndef _MSC_VER -# define PERL_STATIC_INLINE static __inline__ /**/ -#else -# define PERL_STATIC_INLINE static __inline /**/ -#endif +#define PERL_STATIC_INLINE static __inline__ /**/ /* EBCDIC: * This symbol, if defined, indicates that this system uses @@ -2310,15 +2298,9 @@ * This symbol is intended to be used along with CPPRUN in the same manner * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". */ -#ifndef _MSC_VER -# define CPPSTDIN "gcc -E" -# define CPPMINUS "-" -# define CPPRUN "gcc -E" -#else -# define CPPSTDIN "cppstdin" -# define CPPMINUS "" -# define CPPRUN "cl -nologo -E" -#endif +#define CPPSTDIN "gcc -E" +#define CPPMINUS "-" +#define CPPRUN "gcc -E" #define CPPLAST "" /* HAS_ACCESS: @@ -2612,11 +2594,7 @@ */ #define HAS_LONG_DOUBLE /**/ #ifdef HAS_LONG_DOUBLE -# ifndef _MSC_VER -# define LONG_DOUBLESIZE 12 /**/ -# else -# define LONG_DOUBLESIZE 8 /**/ -# endif +# define LONG_DOUBLESIZE 12 /**/ #endif /* HAS_LONG_LONG: @@ -4299,13 +4277,8 @@ #define I32TYPE long /**/ #define U32TYPE unsigned long /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define I64TYPE long long /**/ -# define U64TYPE unsigned long long /**/ -# else -# define I64TYPE __int64 /**/ -# define U64TYPE unsigned __int64 /**/ -# endif +#define I64TYPE long long /**/ +#define U64TYPE unsigned long long /**/ #endif #define NVTYPE double /**/ #define IVSIZE 4 /**/ diff --git a/win32/config_H.gc64 b/win32/config_H.gc64 index 5b20a4c9ea..9242a196c2 100644 --- a/win32/config_H.gc64 +++ b/win32/config_H.gc64 @@ -912,15 +912,9 @@ */ #define HAS_QUAD /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define Quad_t long long /**/ -# define Uquad_t unsigned long long /**/ -# define QUADKIND 3 /**/ -# else -# define Quad_t __int64 /**/ -# define Uquad_t unsigned __int64 /**/ -# define QUADKIND 5 /**/ -# endif +# define Quad_t long long /**/ +# define Uquad_t unsigned long long /**/ +# define QUADKIND 3 /**/ # define QUAD_IS_INT 1 # define QUAD_IS_LONG 2 # define QUAD_IS_LONG_LONG 3 @@ -1063,9 +1057,7 @@ * This symbol is defined if the C compiler can cast negative * or large floating point numbers to 32-bit ints. */ -#ifndef _MSC_VER -# define CASTI32 /**/ -#endif +#define CASTI32 /**/ /* CASTNEGFLOAT: * This symbol is defined if the C compiler can cast negative @@ -2160,11 +2152,7 @@ * to get any typedef'ed information. * We will pick a type such that sizeof(SSize_t) == sizeof(Size_t). */ -#ifndef _MSC_VER -# define SSize_t long long /* signed count of bytes */ -#else -# define SSize_t __int64 /* signed count of bytes */ -#endif +#define SSize_t long long /* signed count of bytes */ /* USE_ITHREADS: * This symbol, if defined, indicates that Perl should be built to @@ -2241,11 +2229,7 @@ * static (c89 compilers) */ #define HAS_STATIC_INLINE /**/ -#ifndef _MSC_VER -# define PERL_STATIC_INLINE static __inline__ /**/ -#else -# define PERL_STATIC_INLINE static __inline /**/ -#endif +#define PERL_STATIC_INLINE static __inline__ /**/ /* EBCDIC: * This symbol, if defined, indicates that this system uses @@ -2314,15 +2298,9 @@ * This symbol is intended to be used along with CPPRUN in the same manner * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". */ -#ifndef _MSC_VER -# define CPPSTDIN "x86_64-w64-mingw32-gcc -E" -# define CPPMINUS "-" -# define CPPRUN "x86_64-w64-mingw32-gcc -E" -#else -# define CPPSTDIN "cppstdin" -# define CPPMINUS "" -# define CPPRUN "cl -nologo -E" -#endif +#define CPPSTDIN "x86_64-w64-mingw32-gcc -E" +#define CPPMINUS "-" +#define CPPRUN "x86_64-w64-mingw32-gcc -E" #define CPPLAST "" /* HAS_ACCESS: @@ -2616,11 +2594,7 @@ */ #define HAS_LONG_DOUBLE /**/ #ifdef HAS_LONG_DOUBLE -# ifndef _MSC_VER -# define LONG_DOUBLESIZE 12 /**/ -# else -# define LONG_DOUBLESIZE 8 /**/ -# endif +# define LONG_DOUBLESIZE 12 /**/ #endif /* HAS_LONG_LONG: @@ -2631,9 +2605,7 @@ * C preprocessor can make decisions based on it. It is only * defined if the system supports long long. */ -#ifndef _MSC_VER -# define HAS_LONG_LONG /**/ -#endif +#define HAS_LONG_LONG /**/ #ifdef HAS_LONG_LONG #define LONGLONGSIZE 8 /**/ #endif @@ -4296,13 +4268,8 @@ * This symbol, if defined, indicates that a variable of type NVTYPE * stores 0.0 in memory as all bits zero. */ -#ifndef _MSC_VER -# define IVTYPE long long /**/ -# define UVTYPE unsigned long long /**/ -#else -# define IVTYPE __int64 /**/ -# define UVTYPE unsigned __int64 /**/ -#endif +#define IVTYPE long long /**/ +#define UVTYPE unsigned long long /**/ #define I8TYPE char /**/ #define U8TYPE unsigned char /**/ #define I16TYPE short /**/ @@ -4310,13 +4277,8 @@ #define I32TYPE long /**/ #define U32TYPE unsigned long /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define I64TYPE long long /**/ -# define U64TYPE unsigned long long /**/ -# else -# define I64TYPE __int64 /**/ -# define U64TYPE unsigned __int64 /**/ -# endif +#define I64TYPE long long /**/ +#define U64TYPE unsigned long long /**/ #endif #define NVTYPE double /**/ #define IVSIZE 8 /**/ diff --git a/win32/config_H.gc64nox b/win32/config_H.gc64nox index 732cd3fc89..60f7e3dce9 100644 --- a/win32/config_H.gc64nox +++ b/win32/config_H.gc64nox @@ -912,15 +912,9 @@ */ #define HAS_QUAD /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define Quad_t long long /**/ -# define Uquad_t unsigned long long /**/ -# define QUADKIND 3 /**/ -# else -# define Quad_t __int64 /**/ -# define Uquad_t unsigned __int64 /**/ -# define QUADKIND 5 /**/ -# endif +# define Quad_t long long /**/ +# define Uquad_t unsigned long long /**/ +# define QUADKIND 3 /**/ # define QUAD_IS_INT 1 # define QUAD_IS_LONG 2 # define QUAD_IS_LONG_LONG 3 @@ -1063,9 +1057,7 @@ * This symbol is defined if the C compiler can cast negative * or large floating point numbers to 32-bit ints. */ -#ifndef _MSC_VER -# define CASTI32 /**/ -#endif +#define CASTI32 /**/ /* CASTNEGFLOAT: * This symbol is defined if the C compiler can cast negative @@ -2160,11 +2152,7 @@ * to get any typedef'ed information. * We will pick a type such that sizeof(SSize_t) == sizeof(Size_t). */ -#ifndef _MSC_VER -# define SSize_t long long /* signed count of bytes */ -#else -# define SSize_t __int64 /* signed count of bytes */ -#endif +#define SSize_t long long /* signed count of bytes */ /* USE_ITHREADS: * This symbol, if defined, indicates that Perl should be built to @@ -2241,11 +2229,7 @@ * static (c89 compilers) */ #define HAS_STATIC_INLINE /**/ -#ifndef _MSC_VER -# define PERL_STATIC_INLINE static __inline__ /**/ -#else -# define PERL_STATIC_INLINE static __inline /**/ -#endif +#define PERL_STATIC_INLINE static __inline__ /**/ /* EBCDIC: * This symbol, if defined, indicates that this system uses @@ -2314,15 +2298,9 @@ * This symbol is intended to be used along with CPPRUN in the same manner * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". */ -#ifndef _MSC_VER -# define CPPSTDIN "gcc -E" -# define CPPMINUS "-" -# define CPPRUN "gcc -E" -#else -# define CPPSTDIN "cppstdin" -# define CPPMINUS "" -# define CPPRUN "cl -nologo -E" -#endif +#define CPPSTDIN "gcc -E" +#define CPPMINUS "-" +#define CPPRUN "gcc -E" #define CPPLAST "" /* HAS_ACCESS: @@ -2616,11 +2594,7 @@ */ #define HAS_LONG_DOUBLE /**/ #ifdef HAS_LONG_DOUBLE -# ifndef _MSC_VER -# define LONG_DOUBLESIZE 12 /**/ -# else -# define LONG_DOUBLESIZE 8 /**/ -# endif +# define LONG_DOUBLESIZE 12 /**/ #endif /* HAS_LONG_LONG: @@ -2631,9 +2605,7 @@ * C preprocessor can make decisions based on it. It is only * defined if the system supports long long. */ -#ifndef _MSC_VER -# define HAS_LONG_LONG /**/ -#endif +#define HAS_LONG_LONG /**/ #ifdef HAS_LONG_LONG #define LONGLONGSIZE 8 /**/ #endif @@ -4296,13 +4268,8 @@ * This symbol, if defined, indicates that a variable of type NVTYPE * stores 0.0 in memory as all bits zero. */ -#ifndef _MSC_VER -# define IVTYPE long long /**/ -# define UVTYPE unsigned long long /**/ -#else -# define IVTYPE __int64 /**/ -# define UVTYPE unsigned __int64 /**/ -#endif +#define IVTYPE long long /**/ +#define UVTYPE unsigned long long /**/ #define I8TYPE char /**/ #define U8TYPE unsigned char /**/ #define I16TYPE short /**/ @@ -4310,13 +4277,8 @@ #define I32TYPE long /**/ #define U32TYPE unsigned long /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define I64TYPE long long /**/ -# define U64TYPE unsigned long long /**/ -# else -# define I64TYPE __int64 /**/ -# define U64TYPE unsigned __int64 /**/ -# endif +#define I64TYPE long long /**/ +#define U64TYPE unsigned long long /**/ #endif #define NVTYPE double /**/ #define IVSIZE 8 /**/ diff --git a/win32/config_H.vc b/win32/config_H.vc index ddd93aad3e..9c488e4fbb 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -912,15 +912,9 @@ */ #define HAS_QUAD /**/ #ifdef HAS_QUAD -# ifndef __GNUC__ -# define Quad_t __int64 /**/ -# define Uquad_t unsigned __int64 /**/ -# define QUADKIND 5 /**/ -# else -# define Quad_t long long /**/ -# define Uquad_t unsigned long long /**/ -# define QUADKIND 3 /**/ -# endif +# define Quad_t __int64 /**/ +# define Uquad_t unsigned __int64 /**/ +# define QUADKIND 5 /**/ # define QUAD_IS_INT 1 # define QUAD_IS_LONG 2 # define QUAD_IS_LONG_LONG 3 @@ -1063,9 +1057,7 @@ * This symbol is defined if the C compiler can cast negative * or large floating point numbers to 32-bit ints. */ -#ifdef __GNUC__ -# define CASTI32 /**/ -#endif +/*#define CASTI32 /**/ /* CASTNEGFLOAT: * This symbol is defined if the C compiler can cast negative @@ -2237,11 +2229,7 @@ * static (c89 compilers) */ #define HAS_STATIC_INLINE /**/ -#ifndef __GNUC__ -# define PERL_STATIC_INLINE static __inline /**/ -#else -# define PERL_STATIC_INLINE static __inline__ /**/ -#endif +#define PERL_STATIC_INLINE static __inline /**/ /* EBCDIC: * This symbol, if defined, indicates that this system uses @@ -2308,15 +2296,9 @@ * This symbol is intended to be used along with CPPRUN in the same manner * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". */ -#ifndef __GNUC__ -# define CPPSTDIN "cppstdin" -# define CPPMINUS "" -# define CPPRUN "cl -nologo -E" -#else -# define CPPSTDIN "gcc -E" -# define CPPMINUS "-" -# define CPPRUN "gcc -E" -#endif +#define CPPSTDIN "cppstdin" +#define CPPMINUS "" +#define CPPRUN "cl -nologo -E" #define CPPLAST "" /* HAS_ACCESS: @@ -2606,11 +2588,7 @@ */ #define HAS_LONG_DOUBLE /**/ #ifdef HAS_LONG_DOUBLE -# ifndef __GNUC__ -# define LONG_DOUBLESIZE 8 /**/ -# else -# define LONG_DOUBLESIZE 12 /**/ -# endif +# define LONG_DOUBLESIZE 8 /**/ #endif /* HAS_LONG_LONG: @@ -4293,13 +4271,8 @@ #define I32TYPE long /**/ #define U32TYPE unsigned long /**/ #ifdef HAS_QUAD -# ifndef __GNUC__ -# define I64TYPE __int64 /**/ -# define U64TYPE unsigned __int64 /**/ -# else -# define I64TYPE long long /**/ -# define U64TYPE unsigned long long /**/ -# endif +#define I64TYPE __int64 /**/ +#define U64TYPE unsigned __int64 /**/ #endif #define NVTYPE double /**/ #define IVSIZE 4 /**/ diff --git a/win32/config_H.vc64 b/win32/config_H.vc64 index 0c015a44e7..72774f0890 100644 --- a/win32/config_H.vc64 +++ b/win32/config_H.vc64 @@ -912,15 +912,9 @@ */ #define HAS_QUAD /**/ #ifdef HAS_QUAD -# ifndef __GNUC__ -# define Quad_t __int64 /**/ -# define Uquad_t unsigned __int64 /**/ -# define QUADKIND 5 /**/ -# else -# define Quad_t long long /**/ -# define Uquad_t unsigned long long /**/ -# define QUADKIND 3 /**/ -# endif +# define Quad_t __int64 /**/ +# define Uquad_t unsigned __int64 /**/ +# define QUADKIND 5 /**/ # define QUAD_IS_INT 1 # define QUAD_IS_LONG 2 # define QUAD_IS_LONG_LONG 3 @@ -1063,9 +1057,7 @@ * This symbol is defined if the C compiler can cast negative * or large floating point numbers to 32-bit ints. */ -#ifdef __GNUC__ -# define CASTI32 /**/ -#endif +/*#define CASTI32 /**/ /* CASTNEGFLOAT: * This symbol is defined if the C compiler can cast negative @@ -2160,11 +2152,7 @@ * to get any typedef'ed information. * We will pick a type such that sizeof(SSize_t) == sizeof(Size_t). */ -#ifndef __GNUC__ -# define SSize_t __int64 /* signed count of bytes */ -#else -# define SSize_t long long /* signed count of bytes */ -#endif +#define SSize_t __int64 /* signed count of bytes */ /* USE_ITHREADS: * This symbol, if defined, indicates that Perl should be built to @@ -2241,11 +2229,7 @@ * static (c89 compilers) */ #define HAS_STATIC_INLINE /**/ -#ifndef __GNUC__ -# define PERL_STATIC_INLINE static __inline /**/ -#else -# define PERL_STATIC_INLINE static __inline__ /**/ -#endif +#define PERL_STATIC_INLINE static __inline /**/ /* EBCDIC: * This symbol, if defined, indicates that this system uses @@ -2312,15 +2296,9 @@ * This symbol is intended to be used along with CPPRUN in the same manner * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". */ -#ifndef __GNUC__ -# define CPPSTDIN "cppstdin" -# define CPPMINUS "" -# define CPPRUN "cl -nologo -E" -#else -# define CPPSTDIN "gcc -E" -# define CPPMINUS "-" -# define CPPRUN "gcc -E" -#endif +#define CPPSTDIN "cppstdin" +#define CPPMINUS "" +#define CPPRUN "cl -nologo -E" #define CPPLAST "" /* HAS_ACCESS: @@ -2610,11 +2588,7 @@ */ #define HAS_LONG_DOUBLE /**/ #ifdef HAS_LONG_DOUBLE -# ifndef __GNUC__ -# define LONG_DOUBLESIZE 8 /**/ -# else -# define LONG_DOUBLESIZE 12 /**/ -# endif +# define LONG_DOUBLESIZE 8 /**/ #endif /* HAS_LONG_LONG: @@ -2625,9 +2599,7 @@ * C preprocessor can make decisions based on it. It is only * defined if the system supports long long. */ -#ifdef __GNUC__ -# define HAS_LONG_LONG /**/ -#endif +/*#define HAS_LONG_LONG /**/ #ifdef HAS_LONG_LONG #define LONGLONGSIZE 8 /**/ #endif @@ -4290,13 +4262,8 @@ * This symbol, if defined, indicates that a variable of type NVTYPE * stores 0.0 in memory as all bits zero. */ -#ifndef __GNUC__ -# define IVTYPE __int64 /**/ -# define UVTYPE unsigned __int64 /**/ -#else -# define IVTYPE long long /**/ -# define UVTYPE unsigned long long /**/ -#endif +#define IVTYPE __int64 /**/ +#define UVTYPE unsigned __int64 /**/ #define I8TYPE char /**/ #define U8TYPE unsigned char /**/ #define I16TYPE short /**/ @@ -4304,13 +4271,8 @@ #define I32TYPE long /**/ #define U32TYPE unsigned long /**/ #ifdef HAS_QUAD -# ifndef __GNUC__ -# define I64TYPE __int64 /**/ -# define U64TYPE unsigned __int64 /**/ -# else -# define I64TYPE long long /**/ -# define U64TYPE unsigned long long /**/ -# endif +#define I64TYPE __int64 /**/ +#define U64TYPE unsigned __int64 /**/ #endif #define NVTYPE double /**/ #define IVSIZE 8 /**/ diff --git a/win32/makefile.mk b/win32/makefile.mk index 5914486ec9..0a9560d845 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -975,8 +975,6 @@ config.w32 : $(CFGSH_TMPL) # edit config.gc, then make perl using GCC in a minimal configuration (i.e. # with MULTI, ITHREADS, IMP_SYS, LARGE_FILES and PERLIO off), then make # this target to regenerate config_H.gc. -# unfortunately, some further manual editing is also then required to restore all -# the special _MSC_VER handling that is otherwise lost. # repeat for config.gc64 and config_H.gc64, and again for config.gc64nox and # config_H.gc64nox, if you have suitable build environments, otherwise hand-edit # them to maintain the same differences with config.gc and config_H.gc as before. |