# Taken from http://people.freebsd.org/~peter/ezm3-amd64/ezm3-port.diff.gz
#
# This fixes some genuine amd64 issues on gcc-3.2.x.  The first chunk is
# mine, the second came from rth@redhat.com
#
Index: language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c
--- language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c	Tue Feb 17 01:06:14 2004
+++ language/modula3/m3compiler/m3cc/gcc/gcc/config/i386/i386.c	Mon Feb 16 21:15:47 2004
@@ -6761,5 +6761,5 @@
 {
   if (TARGET_64BIT)
-    fprintf (file, "%s%s%d-.+(.-%s%d)\n",
+    fprintf (file, "%s%s%d-%s%d\n",
 	     ASM_LONG, LPREFIX, value, LPREFIX, rel);
   else if (HAVE_AS_GOTOFF_IN_DATA)
@@ -8820,13 +8820,22 @@
       else if (collisions > 1)
 	{
+	  rtx base;
+
 	  collisions = 1;
-	  emit_insn (gen_rtx_SET (VOIDmode, part[0][nparts - 1],
-				  XEXP (part[1][0], 0)));
-	  part[1][0] = change_address (part[1][0],
-				       TARGET_64BIT ? DImode : SImode,
-				       part[0][nparts - 1]);
-	  part[1][1] = adjust_address (part[1][0], VOIDmode, UNITS_PER_WORD);
+
+	  base = part[0][nparts - 1];
+
+	  /* Handle the case when the last part isn't valid for lea.
+	     Happens in 64-bit mode storing the 12-byte XFmode.  */
+	  if (GET_MODE (base) != Pmode)
+	    base = gen_rtx_REG (Pmode, REGNO (base));
+
+	  emit_insn (gen_rtx_SET (VOIDmode, base, XEXP (part[1][0], 0)));
+	  part[1][0] = replace_equiv_address (part[1][0], base);
+	  part[1][1] = replace_equiv_address (part[1][1],
+				      plus_constant (base, UNITS_PER_WORD));
 	  if (nparts == 3)
-	    part[1][2] = adjust_address (part[1][0], VOIDmode, 8);
+	    part[1][2] = replace_equiv_address (part[1][2],
+				      plus_constant (base, 8));
 	}
     }
@@ -10729,11 +10738,11 @@
   if (TREE_CODE (exp) == REAL_CST)
     {
-      if (TYPE_MODE (TREE_TYPE (exp)) == DFmode && align < 64)
+      if (align < 64 && TYPE_MODE (TREE_TYPE (exp)) == DFmode)
 	return 64;
-      else if (ALIGN_MODE_128 (TYPE_MODE (TREE_TYPE (exp))) && align < 128)
+      else if (align < 128 && ALIGN_MODE_128 (TYPE_MODE (TREE_TYPE (exp))))
 	return 128;
     }
-  else if (TREE_CODE (exp) == STRING_CST && TREE_STRING_LENGTH (exp) >= 31
-	   && align < 256)
+  else if (align < 256 && TREE_CODE (exp) == STRING_CST &&
+	   TREE_STRING_LENGTH (exp) >= 31)
     return 256;
 
