mingw32.h (INCOMING_RETURN_ADDR_RTX): Delete.

        * i386/mingw32.h (INCOMING_RETURN_ADDR_RTX): Delete. Use the value
        of DWARF2_UNWIND_INFO, if any, from i386/cygwin32.h instead.
        (STANDARD_INCLUDE_DIR): Change to /usr/local/i386-mingw32/include.

From-SVN: r17321

gcc/ChangeLog

+Thu Dec 18 18:40:17 1997  Mumit Khan <khan@xraylith.wisc.edu>
+	
+	* i386/mingw32.h (INCOMING_RETURN_ADDR_RTX): Delete. Use the value
+	of DWARF2_UNWIND_INFO, if any, from i386/cygwin32.h instead.
+	(STANDARD_INCLUDE_DIR): Change to /usr/local/i386-mingw32/include.
+
 Tue Jan 13 00:44:02 1998  Jim Wilson  <wilson@cygnus.com> 
 
 	* mips.md (return_internal): Change mode from SImode to VOIDmode.

gcc/config/i386/mingw32.h

@@ -33,15 +33,58 @@ Boston, MA 02111-1307, USA. */
   -D__cdecl=__attribute__((__cdecl__)) \
   -Asystem(winnt) -Acpu(i386) -Amachine(i386)"
 
+/* Specific a different directory for the standard include files.  */
+#undef STANDARD_INCLUDE_DIR
+#define STANDARD_INCLUDE_DIR "/usr/local/i386-mingw32/include"
+
+#define STANDARD_INCLUDE_COMPONENT "MINGW32"
+
 /* For Windows applications, include more libraries, but always include
    kernel32.  */
 #undef LIB_SPEC
-#define LIB_SPEC "%{windows:-luser32 -lgdi32 -lcomdlg32} -lkernel32"
+#define LIB_SPEC \
+"%{mwindows:-luser32 -lgdi32 -lcomdlg32} -lkernel32 -ladvapi32 -lshell32"
 
-/* Include in the Windows32 API libraries with libgcc */
+/* Include in the mingw32 libraries with libgcc */
 #undef LIBGCC_SPEC
 #define LIBGCC_SPEC "-lmingw32 -lgcc -lmoldname -lcrtdll"
 
 /* Specify a different entry point when linking a DLL */
 #undef LINK_SPEC
-#define LINK_SPEC "%{windows:--subsystem windows} %{dll:--dll -e _DllMainCRTStartup@12}"
+#define LINK_SPEC \
+"%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12}"
+
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC "%{mdll:dllcrt1%O%s} %{!mdll:crt1%O%s}"
+
+#define MATH_LIBRARY "-lcrtdll"
+
+/* Output STRING, a string representing a filename, to FILE.  We canonicalize
+   it to be in MS-DOS format.  */
+#define OUTPUT_QUOTED_STRING(FILE, STRING) \
+do {						\
+  char c;					\
+						\
+  putc ('\"', asm_file);			\
+  if (STRING[1] == ':'				\
+      && (STRING[2] == '/' || STRING[2] == '\\')) \
+    {						\
+      putc ('/', asm_file);			\
+      putc ('/', asm_file);			\
+      putc (*string, asm_file);			\
+      string += 2;				\
+    }						\
+						\
+  while ((c = *string++) != 0)			\
+    {						\
+      if (c == '\\')				\
+	c = '/';				\
+						\
+      if (c == '\"')				\
+	putc ('\\', asm_file);			\
+      putc (c, asm_file);			\
+    }						\
+						\
+  putc ('\"', asm_file);			\
+} while (0)
+