* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12

        for details.

        * haifa-sched.c: Mirror recent changes from gcc2.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18984 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 88 insertions, 313 deletions

diff --git a/gcc/config/i386/cygwin32.h b/gcc/config/i386/cygwin32.h
index 536b91c6ca0..15963bdb299 100644
--- a/gcc/config/i386/cygwin32.h
+++ b/gcc/config/i386/cygwin32.h
@@ -21,7 +21,6 @@ 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. */
 
-
 #define YES_UNDERSCORES
 
 #define DBX_DEBUGGING_INFO 
@@ -150,10 +149,9 @@ do									\
 while (0)
 #endif
 
-/* This macro gets just the user-specified name
-   out of the string in a SYMBOL_REF.  Discard
-   trailing @[NUM] encoded by ENCODE_SECTION_INFO. 
-   Do we need the stripping of leading '*'?  */
+/* This macro gets just the user-specified name out of the string in a
+   SYMBOL_REF.  Discard trailing @[NUM] encoded by ENCODE_SECTION_INFO.   */
+
 #undef  STRIP_NAME_ENCODING
 #define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME)				\
 do {									\
@@ -172,7 +170,6 @@ do {									\
     (VAR) = _name;							\
 } while (0)
       
-
 /* Emit code to check the stack when allocating more that 4000
    bytes in one go. */
 
diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
index bdce3ed000b..971a5f880c2 100644
--- a/gcc/config/i386/gnu.h
+++ b/gcc/config/i386/gnu.h
@@ -4,7 +4,8 @@
 #include <i386/linux.h>
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES GNU_CPP_PREDEFINES("i386")
+#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386) \
+-Dunix -Asystem(unix)  -DMACH -Asystem(mach) -D__GNU__ -Asystem(gnu)"
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index b910e77fd65..adab26d549c 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler for Intel X86
    (386, 486, Pentium).
-   Copyright (C) 1988, 92, 94-97, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1988, 92, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -436,12 +436,6 @@ extern int ix86_arch;
 /* Required on the 386 since it doesn't have bitfield insns.  */
 #define PCC_BITFIELD_TYPE_MATTERS 1
 
-/* An integer expression for the size in bits of the largest integer
-   machine mode that should actually be used.  All integer machine modes of
-   this size or smaller can be used for structures and unions with the
-   appropriate sizes.  */
-#define MAX_FIXED_MODE_SIZE 32
-
 /* Maximum power of 2 that code can be aligned to.  */
 #define MAX_CODE_ALIGN	6			/* 64 byte alignment */
 
@@ -1870,6 +1864,7 @@ while (0)
 
 #define CONST_COSTS(RTX,CODE,OUTER_CODE) \
   case CONST_INT:						\
+    return (unsigned) INTVAL (RTX) < 256 ? 0 : 1;		\
   case CONST:							\
   case LABEL_REF:						\
   case SYMBOL_REF:						\
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 9de8a93e1fb..ea6a9c8a487 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -1,5 +1,5 @@
 ; GCC machine description for Intel X86.
-;; Copyright (C) 1988, 94-97, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 ;; Mostly by William Schelter.
 
 ;; This file is part of GNU CC.
@@ -7378,11 +7378,10 @@ byte_xor_operation:
 
 (define_expand "movsicc"
   [(match_dup 4)
-   (parallel [(set (match_operand 0 "register_operand" "")
+   (set (match_operand 0 "register_operand" "")
 	(if_then_else:SI (match_operand 1 "comparison_operator" "")
-			 (match_operand:SI 2 "general_operand" "")
-			 (match_operand:SI 3 "general_operand" "")))
-   (clobber (match_scratch:SI 4 "=&r"))])]
+			 (match_operand:SI 2 "nonimmediate_operand" "")
+			 (match_operand:SI 3 "nonimmediate_operand" "")))]
   "TARGET_CMOVE"
   "
 {
@@ -7391,11 +7390,10 @@ byte_xor_operation:
 
 (define_expand "movhicc"
   [(match_dup 4)
-   (parallel [(set (match_operand 0 "register_operand" "")
+   (set (match_operand 0 "register_operand" "")
 	(if_then_else:HI (match_operand 1 "comparison_operator" "")
-			 (match_operand:HI 2 "general_operand" "")
-			 (match_operand:HI 3 "general_operand" "")))
-   (clobber (match_scratch:SI 4 "=&r"))])]
+			 (match_operand:HI 2 "nonimmediate_operand" "")
+			 (match_operand:HI 3 "nonimmediate_operand" "")))]
   "TARGET_CMOVE"
   "
 {
@@ -7403,146 +7401,80 @@ byte_xor_operation:
 }")
 
 (define_insn "movsicc_1"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r,r,&r,rm")
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=r,r,&r")
 	(if_then_else:SI (match_operator 1 "comparison_operator" 
-				[(cc0) (const_int 0)])
-		      (match_operand:SI 2 "general_operand" "rm,0,rm,g")
-		      (match_operand:SI 3 "general_operand" "0,rm,rm,g")))
-   (clobber (match_scratch:SI 4 "X,X,X,=&r"))]
+					 [(cc0) (const_int 0)])
+			 (match_operand:SI 2 "nonimmediate_operand" "rm,0,rm")
+			 (match_operand:SI 3 "nonimmediate_operand" "0,rm,rm")))]
   "TARGET_CMOVE"
   "*
 {
-  if (which_alternative == 0)
+  switch (which_alternative)
     {
+    case 0:
       /* r <- cond ? arg : r */
       output_asm_insn (AS2 (cmov%C1,%2,%0), operands);
-    }
-  else if (which_alternative == 1)
-    {
+      break;
+
+    case 1:
       /* r <- cond ? r : arg */
       output_asm_insn (AS2 (cmov%c1,%3,%0), operands);
-    }
-  else if (which_alternative == 2)
-    {
+      break;
+
+    case 2:
       /* r <- cond ? arg1 : arg2 */
       output_asm_insn (AS2 (cmov%C1,%2,%0), operands);
       output_asm_insn (AS2 (cmov%c1,%3,%0), operands);
+      break;
     }
-  else if (which_alternative == 3)
-    {
-      /* r <- cond ? arg1 : arg2 */
-    rtx xops[3];
-
-    xops[0] = gen_label_rtx ();
-    xops[1] = gen_label_rtx ();
-    xops[2] = operands[1];
-
-    output_asm_insn (\"j%c2 %l0\", xops);
-    if (! rtx_equal_p (operands[0], operands[2]))
-       if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[2]) == MEM)
-         {
-           output_asm_insn (AS2 (mov%z2,%2,%4), operands);
-           output_asm_insn (AS2 (mov%z2,%4,%0), operands);
-         }
-       else
-      output_asm_insn (AS2 (mov%z0,%2,%0), operands);
-    output_asm_insn (\"jmp %l1\", xops);
-    ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[0]));
-    if (! rtx_equal_p (operands[0], operands[3]))
-      {
-        if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[3]) == MEM)
-          {
-            output_asm_insn (AS2 (mov%z3,%3,%4), operands);
-            output_asm_insn (AS2 (mov%z3,%4,%0), operands);
-          }
-        else
-      output_asm_insn (AS2 (mov%z0,%3,%0), operands);
-      }
-    ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[1]));
-    }  
+
   RET;
 }")
 
 (define_insn "movhicc_1"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,&r,rm")
+  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,&r")
 	(if_then_else:HI (match_operator 1 "comparison_operator" 
-				[(cc0) (const_int 0)])
-		      (match_operand:HI 2 "general_operand" "rm,0,rm,g")
-		      (match_operand:HI 3 "general_operand" "0,rm,rm,g")))
-   (clobber (match_scratch:SI 4 "X,X,X,=&r"))]
+					 [(cc0) (const_int 0)])
+			 (match_operand:HI 2 "nonimmediate_operand" "rm,0,rm")
+			 (match_operand:HI 3 "nonimmediate_operand" "0,rm,rm")))]
   "TARGET_CMOVE"
   "*
 {
-  if (which_alternative == 0)
+  switch (which_alternative)
     {
+    case 0:
       /* r <- cond ? arg : r */
       output_asm_insn (AS2 (cmov%C1,%2,%0), operands);
-    }
-  else if (which_alternative == 1)
-    {
+      break;
+
+    case 1:
       /* r <- cond ? r : arg */
       output_asm_insn (AS2 (cmov%c1,%3,%0), operands);
-    }
-  else if (which_alternative == 2)
-    {
+      break;
+
+    case 2:
       /* r <- cond ? arg1 : arg2 */
       output_asm_insn (AS2 (cmov%C1,%2,%0), operands);
       output_asm_insn (AS2 (cmov%c1,%3,%0), operands);
+      break;
     }
-  else if (which_alternative == 3)
-    {
-      /* r <- cond ? arg1 : arg2 */
-    rtx xops[3];
-
-    xops[0] = gen_label_rtx ();
-    xops[1] = gen_label_rtx ();
-    xops[2] = operands[1];
-
-    output_asm_insn (\"j%c2 %l0\", xops);
-    if (! rtx_equal_p (operands[0], operands[2]))
-       if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[2]) == MEM)
-         {
-           output_asm_insn (AS2 (mov%z2,%2,%4), operands);
-           output_asm_insn (AS2 (mov%z2,%4,%0), operands);
-         }
-       else
-      output_asm_insn (AS2 (mov%z0,%2,%0), operands);
-    output_asm_insn (\"jmp %l1\", xops);
-    ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[0]));
-    if (! rtx_equal_p (operands[0], operands[3]))
-      {
-        if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[3]) == MEM)
-          {
-            output_asm_insn (AS2 (mov%z3,%3,%4), operands);
-            output_asm_insn (AS2 (mov%z3,%4,%0), operands);
-          }
-        else
-      output_asm_insn (AS2 (mov%z0,%3,%0), operands);
-      }
-    ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[1]));
-    }  
+
   RET;
 }")
 
+;; We need to disable the FP forms of these since they do not support
+;; memory as written, but no input reloads are permitted for insns
+;; that use cc0.  Also, movxfcc is not present.
+
 (define_expand "movsfcc"
   [(match_dup 4)
-   (set (match_operand 0 "general_operand" "")
+   (set (match_operand 0 "register_operand" "")
 	(if_then_else:SF (match_operand 1 "comparison_operator" "")
-			 (match_operand:SF 2 "general_operand" "")
-			 (match_operand:SF 3 "general_operand" "")))]
-  "TARGET_CMOVE"
+			 (match_operand:SF 2 "register_operand" "")
+			 (match_operand:SF 3 "register_operand" "")))]
+  "0 && TARGET_CMOVE"
   "
 {
-  int i;
-  
-  for (i = 2; i <= 3; i++)
-   {
-     if ((reload_in_progress | reload_completed) == 0
-       && CONSTANT_P (operands[i]))
-       {
-         operands[i] = force_const_mem (SFmode, operands[i]);
-       }
-     }
   operands[4] = i386_compare_gen (i386_compare_op0, i386_compare_op1);
 }")
 
@@ -7550,211 +7482,85 @@ byte_xor_operation:
   [(match_dup 4)
    (set (match_operand 0 "register_operand" "t")
 	(if_then_else:DF (match_operand 1 "comparison_operator" "")
-			 (match_operand:DF 2 "general_operand" "")
-			 (match_operand:DF 3 "general_operand" "")))]
-  "TARGET_CMOVE"
+			 (match_operand:DF 2 "register_operand" "")
+			 (match_operand:DF 3 "register_operand" "")))]
+  "0 && TARGET_CMOVE"
   "
 {
-  int i;
-  
-  for (i = 2; i <= 3; i++)
-   {
-     if ((reload_in_progress | reload_completed) == 0
-       && CONSTANT_P (operands[i]))
-       {
-         operands[i] = force_const_mem (DFmode, operands[i]);
-       }
-     }
   operands[4] = i386_compare_gen (i386_compare_op0, i386_compare_op1);
 }")
 
 (define_expand "movxfcc"
   [(match_dup 4)
-   (set (match_operand 0 "register_operand" "t")
+   (set (match_operand 0 "register_operand" "")
 	(if_then_else:XF (match_operand 1 "comparison_operator" "")
-			 (match_operand:XF 2 "general_operand" "")
-			 (match_operand:XF 3 "general_operand" "")))]
-  "TARGET_CMOVE"
+			 (match_operand:XF 2 "register_operand" "")
+			 (match_operand:XF 3 "register_operand" "")))]
+  "0 && TARGET_CMOVE"
   "
 {
-  int i;
-  
-  for (i = 2; i <= 3; i++)
-   {
-     if ((reload_in_progress | reload_completed) == 0
-       && CONSTANT_P (operands[i]))
-       {
-         operands[i] = force_const_mem (XFmode, operands[i]);
-       }
-     }
   operands[4] = i386_compare_gen (i386_compare_op0, i386_compare_op1);
 }")
 
 (define_insn "movsfcc_1"
-  [(set (match_operand:SF 0 "general_operand" "=f,=f,=f,=f")
+  [(set (match_operand:SF 0 "general_operand" "=f,f,&f")
 	(if_then_else:SF (match_operator 1 "comparison_operator" 
-				[(cc0) (const_int 0)])
-		      (match_operand:SF 2 "general_operand" "0,f,f,fFm")
-		      (match_operand:SF 3 "general_operand" "f,0,f,fFm")))]
+					 [(cc0) (const_int 0)])
+			 (match_operand:SF 2 "register_operand" "0,f,f")
+			 (match_operand:SF 3 "register_operand" "f,0,f")))]
   "TARGET_CMOVE"
   "*
 {
-  if (which_alternative == 0)
+  switch (which_alternative)
     {
+    case 0:
       /* r <- cond ? arg : r */
       output_asm_insn (AS2 (fcmov%f1,%3,%0), operands);
-    }
-  else if (which_alternative == 1)
-    {
+      break;
+
+    case 1:
       /* r <- cond ? r : arg */
       output_asm_insn (AS2 (fcmov%F1,%2,%0), operands);
-    }
-  else if (which_alternative == 2)
-    {
+      break;
+
+    case 2:
       /* r <- cond ? r : arg */
       output_asm_insn (AS2 (fcmov%F1,%2,%0), operands);
       output_asm_insn (AS2 (fcmov%f1,%3,%0), operands);
+      break;
     }
-  else if (which_alternative == 3)
-    {
-      /* r <- cond ? arg1 : arg2 */
-      rtx xops[3];
-
-      xops[0] = gen_label_rtx ();
-      xops[1] = gen_label_rtx ();
-      xops[2] = operands[1];
 
-      output_asm_insn (\"j%f2 %l0\", xops);
-      if (STACK_REG_P (operands[2]) || GET_CODE (operands[2]) == MEM)
-	output_asm_insn (AS1 (fld%z2,%y2), operands);
-      else
-        {
-	  operands[2] = XEXP (operands[2], 0);
-	  output_asm_insn (AS1 (fld%z2,%y2), operands);
-        }
-      output_asm_insn (\"jmp %l1\", xops);
-      ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[0]));
-      if (STACK_REG_P (operands[3]) || GET_CODE (operands[0]) == MEM)
-	  output_asm_insn (AS1 (fld%z3,%y3), operands);
-      else
-	{
-	  operands[3] = XEXP (operands[3], 0);
-	  output_asm_insn (AS1 (fld%z3,%y3), operands);
-	}
-      ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[1]));
-}
   RET;
 }")
 
 (define_insn "movdfcc_1"
-  [(set (match_operand:DF 0 "general_operand" "=f,=f,=f,=f")
+  [(set (match_operand:DF 0 "general_operand" "=f,f,&f")
 	(if_then_else:DF (match_operator 1 "comparison_operator" 
-				[(cc0) (const_int 0)])
-		      (match_operand:DF 2 "general_operand" "0,f,f,fFm")
-		      (match_operand:DF 3 "general_operand" "f,0,f,fFm")))]
+					 [(cc0) (const_int 0)])
+			 (match_operand:DF 2 "register_operand" "0,f,f")
+			 (match_operand:DF 3 "register_operand" "f,0,f")))]
   "TARGET_CMOVE"
   "*
 {
-  if (which_alternative == 0)
+  switch (which_alternative)
     {
+    case 0:
       /* r <- cond ? arg : r */
       output_asm_insn (AS2 (fcmov%f1,%3,%0), operands);
-    }
-  else if (which_alternative == 1)
-    {
-      /* r <- cond ? r : arg */
-      output_asm_insn (AS2 (fcmov%F1,%2,%0), operands);
-    }
-  else if (which_alternative == 2)
-    {
-      /* r <- cond ? r : arg */
-      output_asm_insn (AS2 (fcmov%F1,%2,%0), operands);
-      output_asm_insn (AS2 (fcmov%f1,%3,%0), operands);
-    }
-  else if (which_alternative == 3)
-    {
-      /* r <- cond ? arg1 : arg2 */
-      rtx xops[3];
-
-      xops[0] = gen_label_rtx ();
-      xops[1] = gen_label_rtx ();
-      xops[2] = operands[1];
-
-      output_asm_insn (\"j%f2 %l0\", xops);
-      if (STACK_REG_P (operands[2]) || GET_CODE (operands[2]) == MEM)
-	output_asm_insn (AS1 (fld%z2,%y2), operands);
-      else
-        {
-	  operands[2] = XEXP (operands[2], 0);
-	  output_asm_insn (AS1 (fld%z2,%y2), operands);
-        }
-      output_asm_insn (\"jmp %l1\", xops);
-      ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[0]));
-      if (STACK_REG_P (operands[3]) || GET_CODE (operands[0]) == MEM)
-	  output_asm_insn (AS1 (fld%z3,%y3), operands);
-      else
-	{
-	  operands[3] = XEXP (operands[3], 0);
-	  output_asm_insn (AS1 (fld%z3,%y3), operands);
-	}
-      ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[1]));
-}
-  RET;
-}")
+      break;
 
-(define_insn "movxfcc_1"
-  [(set (match_operand:XF 0 "register_operand" "=f,=f,=f,=f")
-	(if_then_else:XF (match_operator 1 "comparison_operator" 
-				[(cc0) (const_int 0)])
-		      (match_operand:XF 2 "register_operand" "0,f,f,fFm")
-		      (match_operand:XF 3 "register_operand" "f,0,f,fFm")))]
-  "TARGET_CMOVE"
-  "*
-{
-  if (which_alternative == 0)
-    {
-      /* r <- cond ? arg : r */
-      output_asm_insn (AS2 (fcmov%f1,%3,%0), operands);
-    }
-  else if (which_alternative == 1)
-    {
+    case 1:
       /* r <- cond ? r : arg */
       output_asm_insn (AS2 (fcmov%F1,%2,%0), operands);
-    }
-  else if (which_alternative == 2)
-    {
+      break;
+
+    case 2:
       /* r <- cond ? r : arg */
       output_asm_insn (AS2 (fcmov%F1,%2,%0), operands);
       output_asm_insn (AS2 (fcmov%f1,%3,%0), operands);
+      break;
     }
-  else if (which_alternative == 3)
-    {
-      /* r <- cond ? arg1 : arg2 */
-      rtx xops[3];
-
-      xops[0] = gen_label_rtx ();
-      xops[1] = gen_label_rtx ();
-      xops[2] = operands[1];
 
-      output_asm_insn (\"j%f2 %l0\", xops);
-      if (STACK_REG_P (operands[2]) || GET_CODE (operands[2]) == MEM)
-	output_asm_insn (AS1 (fld%z2,%y2), operands);
-      else
-        {
-	  operands[2] = XEXP (operands[2], 0);
-	  output_asm_insn (AS1 (fld%z2,%y2), operands);
-        }
-      output_asm_insn (\"jmp %l1\", xops);
-      ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[0]));
-      if (STACK_REG_P (operands[3]) || GET_CODE (operands[0]) == MEM)
-	  output_asm_insn (AS1 (fld%z3,%y3), operands);
-      else
-	{
-	  operands[3] = XEXP (operands[3], 0);
-	  output_asm_insn (AS1 (fld%z3,%y3), operands);
-	}
-      ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, \"L\", CODE_LABEL_NUMBER (xops[1]));
-}
   RET;
 }")
 
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index a1eb464b3b1..7c7a3bbc6fa 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -2,7 +2,7 @@
    hosting on Windows32, using GNU tools and the Windows32 API Library,
    as distinct from winnt.h, which is used to build GCC for use with a
    windows style library and tool set and uses the Microsoft tools.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA. */
 
 /* Include in the mingw32 libraries with libgcc */
 #undef LIBGCC_SPEC
-#define LIBGCC_SPEC "-lmingw32 -lgcc -lmoldname -lcrtdll"
+#define LIBGCC_SPEC "-lmingw32 -lgcc -lmoldname -lmsvcrt"
 
 /* Specify a different entry point when linking a DLL */
 #undef LINK_SPEC
@@ -55,9 +55,9 @@ Boston, MA 02111-1307, USA. */
 "%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12}"
 
 #undef STARTFILE_SPEC
-#define STARTFILE_SPEC "%{mdll:dllcrt1%O%s} %{!mdll:crt1%O%s}"
+#define STARTFILE_SPEC "%{mdll:dllcrt2%O%s} %{!mdll:crt2%O%s}"
 
-#define MATH_LIBRARY "-lcrtdll"
+#define MATH_LIBRARY "-lmsvcrt"
 
 /* Output STRING, a string representing a filename, to FILE.  We canonicalize
    it to be in MS-DOS format.  */
diff --git a/gcc/config/i386/xm-go32.h b/gcc/config/i386/xm-go32.h
index e83bb4b12bb..3cfd6b39992 100644
--- a/gcc/config/i386/xm-go32.h
+++ b/gcc/config/i386/xm-go32.h
@@ -1,5 +1,5 @@
 /* Configuration for GNU C-compiler for Intel 80386 running GO32.
-   Copyright (C) 1988, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -33,4 +33,3 @@ Boston, MA 02111-1307, USA.  */
 #define DIR_SEPARATOR '\\'
 
 #define NO_SYS_SIGLIST 1
-
diff --git a/gcc/config/i386/xm-mingw32.h b/gcc/config/i386/xm-mingw32.h
index 47356f568d1..38c9b6d06b0 100644
--- a/gcc/config/i386/xm-mingw32.h
+++ b/gcc/config/i386/xm-mingw32.h
@@ -1,6 +1,6 @@
 /* Configuration for GNU C-compiler for hosting on Windows32.
    using GNU tools and the Windows32 API Library.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -34,7 +34,6 @@ Boston, MA 02111-1307, USA. */
 #endif
 
 #define NO_SYS_SIGLIST 1
-#define link(a,b) -1
 #define environ _environ
 
 /* Even though we support "/", allow "\" since everybody tests both.  */
diff --git a/gcc/config/i386/xm-sco5.h b/gcc/config/i386/xm-sco5.h
index 99bc53c2bc5..6b22b1d549f 100644
--- a/gcc/config/i386/xm-sco5.h
+++ b/gcc/config/i386/xm-sco5.h
@@ -1,18 +1,7 @@
 /* Configuration for GCC for Intel i386 running SCO.  */
 
-#include "i386/xm-sysv3.h"
-
 /* Big buffers improve performance.  */
 
 #define IO_BUFFER_SIZE (0x8000 - 1024)
-/* OpenServer provides no sys_siglist,
-   but does offer the same data under another name.  */
-#define sys_siglist _sys_siglist
-#undef SYS_SIGLIST_DECLARED
-#define SYS_SIGLIST_DECLARED
 
-/* If not compiled with GNU C, use the portable alloca.  */
-#ifndef __GNUC__
-#define USE_C_ALLOCA
-#endif
 
diff --git a/gcc/config/i386/xm-sysv4.h b/gcc/config/i386/xm-sysv4.h
index 49d52b4e7f3..1365064a5a6 100644
--- a/gcc/config/i386/xm-sysv4.h
+++ b/gcc/config/i386/xm-sysv4.h
@@ -1,16 +1,5 @@
 /* Configuration for GCC for Intel i386 running System V Release 4.  */
 
-#include "i386/xm-i386.h"
-#include "xm-svr4.h"
-
-/* If not compiled with GNU C, use the portable alloca.  */
-#ifndef __GNUC__
-#define USE_C_ALLOCA
-#endif
 #ifdef __HIGHC__
 #include <alloca.h>		/* for MetaWare High-C on NCR System 3000 */
 #endif
-
-/* Univel, at least, has a small ARG_MAX.  Defining this is harmless
-   except for causing extra stat calls in the driver program.  */
-#define SMALL_ARG_MAX