X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/blobdiff_plain/4b1e227d171bdc6e8a9d3d9dfe7dde140c14b2ca..8a782770327d0bd4f3c6ebf8d3adb3d8cea18b29:/contrib/gcc-4.4/gcc/config/i386/i386.c?ds=sidebyside

diff --git a/contrib/gcc-4.4/gcc/config/i386/i386.c b/contrib/gcc-4.4/gcc/config/i386/i386.c
index 2fc0358622..a08ad9dce2 100644
--- a/contrib/gcc-4.4/gcc/config/i386/i386.c
+++ b/contrib/gcc-4.4/gcc/config/i386/i386.c
@@ -2705,7 +2705,7 @@ override_options (bool main_args_p)
 	     prefix, suffix, prefix, suffix, prefix, suffix);
 
   if (!ix86_arch_string)
-    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
+    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
   else
     ix86_arch_specified = 1;
 
@@ -28732,9 +28732,13 @@ ix86_mangle_type (const_tree type)
 static tree
 ix86_stack_protect_fail (void)
 {
+#if 0 /* XXX swildner */
   return TARGET_64BIT
 	 ? default_external_stack_protect_fail ()
 	 : default_hidden_stack_protect_fail ();
+#else
+  return default_external_stack_protect_fail ();
+#endif
 }
 
 /* Select a format to encode pointers in exception handling data.  CODE
@@ -29470,7 +29474,8 @@ ix86_sse5_valid_op_p (rtx operands[], rtx insn ATTRIBUTE_UNUSED, int num,
          For the integer multiply/add instructions be more restrictive and
          require operands[2] and operands[3] to be the memory operands.  */
       if (commutative)
-	return (mem_mask == ((1 << 1) | (1 << 3)) || ((1 << 2) | (1 << 3)));
+	return (mem_mask == ((1 << 1) | (1 << 3)) ||
+		mem_mask == ((1 << 2) | (1 << 3)));
       else
 	return (mem_mask == ((1 << 2) | (1 << 3)));
     }