diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1496b859373..e46891f60be 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-12  Steve Ellcey  <sje@cup.hp.com>
+
+	* config/pa/pa.c (hppa_legitimize_address): Remove unused variable
+	orig_base.
+	* config/pa/pa.md (call, call_value): Remove unused variable call_insn.
+
 2010-04-12  Steve Ellcey  <sje@cup.hp.com>
 
 	* function.c (assign_parms_initialize_all): Add unused attribute
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 43606ca92d3..13e81b4cd1b 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -1066,7 +1066,7 @@ hppa_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
     {
 
       /* First, try and figure out what to use as a base register.  */
-      rtx reg1, reg2, base, idx, orig_base;
+      rtx reg1, reg2, base, idx;
 
       reg1 = XEXP (XEXP (x, 0), 1);
       reg2 = XEXP (x, 1);
@@ -1088,7 +1088,6 @@ hppa_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
 	  && REG_POINTER (reg1))
 	{
 	  base = reg1;
-	  orig_base = XEXP (XEXP (x, 0), 1);
 	  idx = gen_rtx_PLUS (Pmode,
 			      gen_rtx_MULT (Pmode,
 					    XEXP (XEXP (XEXP (x, 0), 0), 0),
@@ -1099,7 +1098,6 @@ hppa_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
 	       && REG_POINTER (reg2))
 	{
 	  base = reg2;
-	  orig_base = XEXP (x, 1);
 	  idx = XEXP (x, 0);
 	}
 
diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md
index f55a5a4eda1..bb4d46bc854 100644
--- a/gcc/config/pa/pa.md
+++ b/gcc/config/pa/pa.md
@@ -7232,7 +7232,7 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
   ""
   "
 {
-  rtx op, call_insn;
+  rtx op;
   rtx nb = operands[1];
 
   if (TARGET_PORTABLE_RUNTIME)
@@ -7297,11 +7297,11 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
     {
       rtx r4 = gen_rtx_REG (word_mode, 4);
       if (GET_CODE (op) == SYMBOL_REF)
-	call_insn = emit_call_insn (gen_call_symref_64bit (op, nb, r4));
+	emit_call_insn (gen_call_symref_64bit (op, nb, r4));
       else
 	{
 	  op = force_reg (word_mode, op);
-	  call_insn = emit_call_insn (gen_call_reg_64bit (op, nb, r4));
+	  emit_call_insn (gen_call_reg_64bit (op, nb, r4));
 	}
     }
   else
@@ -7311,10 +7311,10 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
 	  if (flag_pic)
 	    {
 	      rtx r4 = gen_rtx_REG (word_mode, 4);
-	      call_insn = emit_call_insn (gen_call_symref_pic (op, nb, r4));
+	      emit_call_insn (gen_call_symref_pic (op, nb, r4));
 	    }
 	  else
-	    call_insn = emit_call_insn (gen_call_symref (op, nb));
+	    emit_call_insn (gen_call_symref (op, nb));
 	}
       else
 	{
@@ -7323,10 +7323,10 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
 	  if (flag_pic)
 	    {
 	      rtx r4 = gen_rtx_REG (word_mode, 4);
-	      call_insn = emit_call_insn (gen_call_reg_pic (nb, r4));
+	      emit_call_insn (gen_call_reg_pic (nb, r4));
 	    }
 	  else
-	    call_insn = emit_call_insn (gen_call_reg (nb));
+	    emit_call_insn (gen_call_reg (nb));
 	}
     }
 
@@ -7724,7 +7724,7 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
   ""
   "
 {
-  rtx op, call_insn;
+  rtx op;
   rtx dst = operands[0];
   rtx nb = operands[2];
 
@@ -7790,13 +7790,11 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
     {
       rtx r4 = gen_rtx_REG (word_mode, 4);
       if (GET_CODE (op) == SYMBOL_REF)
-	call_insn
-	  = emit_call_insn (gen_call_val_symref_64bit (dst, op, nb, r4));
+	  emit_call_insn (gen_call_val_symref_64bit (dst, op, nb, r4));
       else
 	{
 	  op = force_reg (word_mode, op);
-	  call_insn
-	    = emit_call_insn (gen_call_val_reg_64bit (dst, op, nb, r4));
+	  emit_call_insn (gen_call_val_reg_64bit (dst, op, nb, r4));
 	}
     }
   else
@@ -7806,11 +7804,10 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
 	  if (flag_pic)
 	    {
 	      rtx r4 = gen_rtx_REG (word_mode, 4);
-	      call_insn
-		= emit_call_insn (gen_call_val_symref_pic (dst, op, nb, r4));
+	      emit_call_insn (gen_call_val_symref_pic (dst, op, nb, r4));
 	    }
 	  else
-	    call_insn = emit_call_insn (gen_call_val_symref (dst, op, nb));
+	    emit_call_insn (gen_call_val_symref (dst, op, nb));
 	}
       else
 	{
@@ -7819,10 +7816,10 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
 	  if (flag_pic)
 	    {
 	      rtx r4 = gen_rtx_REG (word_mode, 4);
-	      call_insn = emit_call_insn (gen_call_val_reg_pic (dst, nb, r4));
+	      emit_call_insn (gen_call_val_reg_pic (dst, nb, r4));
 	    }
 	  else
-	    call_insn = emit_call_insn (gen_call_val_reg (dst, nb));
+	    emit_call_insn (gen_call_val_reg (dst, nb));
 	}
     }