diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38c22877b58..72006a2ee5f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-24  Richard Henderson  <rth@redhat.com>
+
+	* config/i386/i386.c (x86_output_mi_thunk): Fix x86_64 pic jump.
+
 2002-10-24  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/h8300/h8300.c (initial_offset): Simplify by using
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 4b13c46ec9c..f950198f73b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -14233,7 +14233,14 @@ x86_output_mi_thunk (file, thunk, delta, vcall_offset, function)
       if (!flag_pic || (*targetm.binds_local_p) (function))
 	output_asm_insn ("jmp\t%P0", xops);
       else
-	output_asm_insn ("jmp\t*%P0@GOTPCREL(%%rip)", xops);
+	{
+	  tmp = XEXP (xops[0], 0);
+	  tmp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, tmp), UNSPEC_GOTPCREL);
+	  tmp = gen_rtx_CONST (Pmode, tmp);
+	  tmp = gen_rtx_MEM (QImode, tmp);
+	  xops[0] = tmp;
+	  output_asm_insn ("jmp\t%A0", xops);
+	}
     }
   else
     {