cygwin32.h (ASM_OUTPUT_SECTION_NAME): Don't check for for exact section attributions.

        * i386/cygwin32.h (ASM_OUTPUT_SECTION_NAME): Don't check for
        for exact section attributions.
        * i386/mingw32.h (CPP_PREDEFINES): Add __MSVCRT__ for msvc
        runtime.
        * i386/crtdll.h (CPP_PREDEFINES): Define.
Fixes for egcs-1.1.1 from Mumit.

From-SVN: r22280

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 43426eb05e5d7da7356dc9c5a4c33d329439921b..6db1d49104136ba19e2121c5e9ab12e732bbaebb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+Sat Sep  5 23:29:39 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+       * i386/cygwin32.h (ASM_OUTPUT_SECTION_NAME): Don't check for
+       for exact section attributions.
+
+       * i386/mingw32.h (CPP_PREDEFINES): Add __MSVCRT__ for msvc
+       runtime.
+       * i386/crtdll.h (CPP_PREDEFINES): Define.
+
 Sat Sep  5 21:46:47 1998  Richard Henderson  <rth@cygnus.com>
 
        * alpha.c (alpha_ra_ever_killed): Inspect the topmost sequence,

diff --git a/gcc/config/i386/crtdll.h b/gcc/config/i386/crtdll.h
index c6b219ae0202ad0562bb461011fd616653549387..9a6d9a176a928df4fd77f62f4d2753ed1476965e 100644 (file)
--- a/gcc/config/i386/crtdll.h
+++ b/gcc/config/i386/crtdll.h
@@ -22,6 +22,15 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA. */
 
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES "-Di386 -D_WIN32 -DWIN32 -D__WIN32__ \
+  -D__MINGW32__ -DWINNT  -D_X86_=1 -D__STDC__=1\
+  -D__stdcall=__attribute__((__stdcall__)) \
+  _D_stdcall=__attribute__((__stdcall__)) \
+  -D__cdecl=__attribute__((__cdecl__)) \
+  -D__declspec(x)=__attribute__((x)) \
+  -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
+
 #undef LIBGCC_SPEC
 #define LIBGCC_SPEC "-lmingw32 -lgcc -lmoldname -lcrtdll"
 

diff --git a/gcc/config/i386/cygwin32.h b/gcc/config/i386/cygwin32.h
index 7d38e9d3e57d2df9f2424d42b010c34cd1c0ebb9..3fe7df9f153625b3606999e4b30774d4fd9a781d 100644 (file)
--- a/gcc/config/i386/cygwin32.h
+++ b/gcc/config/i386/cygwin32.h
@@ -376,9 +376,6 @@ do {                                                                        \
     }                                                                  \
   else                                                                 \
     {                                                                  \
-      if (DECL && s->type != type)                                     \
-       error_with_decl (DECL, "%s causes a section type conflict");    \
-                                                                       \
       fprintf (STREAM, ".section\t%s,\"%s\"\n", NAME, mode);           \
     }                                                                  \
 } while (0)

diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 19299621f7b60994e3d715207d7e941e02659e86..a320a61f78077cae783881cd18539b585144c512 100644 (file)
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -26,10 +26,14 @@ Boston, MA 02111-1307, USA. */
 
 #include "i386/cygwin32.h"
 
+/* Please keep changes to CPP_PREDEFINES in sync with i386/crtdll. The
+   only difference between the two should be __MSVCRT__ needed to 
+   distinguish MSVC from CRTDLL runtime in mingw headers. */
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Di386 -D_WIN32 -DWIN32 -D__WIN32__ \
-  -D__MINGW32__ -DWINNT  -D_X86_=1 -D__STDC__=1\
+  -D__MINGW32__ -D__MSVCRT__ -DWINNT  -D_X86_=1 -D__STDC__=1\
   -D__stdcall=__attribute__((__stdcall__)) \
+  _D_stdcall=__attribute__((__stdcall__)) \
   -D__cdecl=__attribute__((__cdecl__)) \
   -D__declspec(x)=__attribute__((x)) \
   -Asystem(winnt) -Acpu(i386) -Amachine(i386)"