2000-05-04 Mumit Khan <khan@xraylith.wisc.edu>
+ * i386/cygwin.h (CPP_PREDEFINES): Don't define __STDC__. Move
+ attribute macros from here ...
+ (CPP_SPEC): to here.
+ * i386/mingw32.h (CPP_PREDEFINES): Likewise.
+ (CPP_SPEC): Likewise.
+ * i386/crtdll.h (CPP_PREDEFINES): Delete attribute macros.
+
* Makefile.in ($(HOST_PREFIX_1)gensupport.o): Add build rule.
(libgcc.a): Pass LIB1ASMSRC to libgcc.mk.
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-D_WIN32 -DWIN32 \
- -D__MINGW32__=0.2 -DWINNT -D_X86_=1 -D__STDC__=1\
- -D__stdcall=__attribute__((__stdcall__)) \
- -D_stdcall=__attribute__((__stdcall__)) \
- -D__cdecl=__attribute__((__cdecl__)) \
- -D__declspec(x)=__attribute__((x)) \
+ -D__MINGW32__=0.2 -DWINNT -D_X86_=1 \
-Asystem(winnt)"
#undef LIBGCC_SPEC
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-D_WIN32 \
- -DWINNT -D_X86_=1 -D__STDC__=1\
- -D__stdcall=__attribute__((__stdcall__)) \
- -D__cdecl=__attribute__((__cdecl__)) \
- -D__declspec(x)=__attribute__((x)) \
+ -DWINNT -D_X86_=1 \
-Asystem(winnt)"
/* Normally, -lgcc is not needed since everything in it is in the DLL, but we
#undef CPP_SPEC
#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
+ -D__stdcall=__attribute__((__stdcall__)) \
+ -D__cdecl=__attribute__((__cdecl__)) \
+ %{!ansi:-D_stdcall=__attribute__((__stdcall__)) \
+ -D_cdecl=__attribute__((__cdecl__))} \
+ -D__declspec(x)=__attribute__((x)) \
%{!mno-cygwin:-D__CYGWIN32__ -D__CYGWIN__} \
%{mno-cygwin:-iwithprefixbefore \
../../../../%(mingw_include_path)/include/mingw32 -D__MINGW32__=0.2}"
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-D_WIN32 -DWIN32 \
-D__MINGW32__=0.2 -D__MSVCRT__ -DWINNT -D_X86_=1 \
- -D__stdcall=__attribute__((__stdcall__)) \
- -D_stdcall=__attribute__((__stdcall__)) \
- -D__cdecl=__attribute__((__cdecl__)) \
- -D__declspec(x)=__attribute__((x)) \
-Asystem(winnt)"
/* Specific a different directory for the standard include files. */
#undef CPP_SPEC
#define CPP_SPEC \
- "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{mthreads:-D_MT}"
+ "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{mthreads:-D_MT} \
+ -D__stdcall=__attribute__((__stdcall__)) \
+ -D__cdecl=__attribute__((__cdecl__)) \
+ %{!ansi:-D_stdcall=__attribute__((__stdcall__)) \
+ -D_cdecl=__attribute__((__cdecl__))} \
+ -D__declspec(x)=__attribute__((x))"
+
/* For Windows applications, include more libraries, but always include
kernel32. */