diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 854912c06b2..6d7734cab20 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-14  Richard Henderson  <rth@cygnus.com>
+
+	* config/i386/i386.c (legitimize_pic_address): Use Pmode
+	for all CONSTs.
+
 2000-08-14  Richard Henderson  <rth@cygnus.com>
 
 	* configure.in (ia64-*): Set float_format for i386 long double.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 3a2603e0836..4898538baa2 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2589,8 +2589,8 @@ legitimize_pic_address (orig, reg)
 	 base address (@GOTOFF).  */
 
       current_function_uses_pic_offset_table = 1;
-      new = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, addr), 7);
-      new = gen_rtx_CONST (VOIDmode, new);
+      new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), 7);
+      new = gen_rtx_CONST (Pmode, new);
       new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, new);
 
       if (reg != 0)
@@ -2605,8 +2605,8 @@ legitimize_pic_address (orig, reg)
 	 Global Offset Table (@GOT). */
 
       current_function_uses_pic_offset_table = 1;
-      new = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, addr), 6);
-      new = gen_rtx_CONST (VOIDmode, new);
+      new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), 6);
+      new = gen_rtx_CONST (Pmode, new);
       new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, new);
       new = gen_rtx_MEM (Pmode, new);
       RTX_UNCHANGING_P (new) = 1;
@@ -2641,9 +2641,9 @@ legitimize_pic_address (orig, reg)
 	      && GET_CODE (op1) == CONST_INT)
 	    {
 	      current_function_uses_pic_offset_table = 1;
-	      new = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, op0), 7);
-	      new = gen_rtx_PLUS (VOIDmode, new, op1);
-	      new = gen_rtx_CONST (VOIDmode, new);
+	      new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, op0), 7);
+	      new = gen_rtx_PLUS (Pmode, new, op1);
+	      new = gen_rtx_CONST (Pmode, new);
 	      new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, new);
 
 	      if (reg != 0)