diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 91a9ca9c47..fff6bba1b3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-23  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* eval.c (evaluate_subexp_standard): Use expression architecture
+	instead of current_gdbarch.
+
+	* infrun.c (handle_inferior_event): Avoid unncessary reference
+	to current_gdbarch and get_current_frame ().
+
 2009-06-23  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* breakpoint.h (set_longjmp_breakpoint): Add THREAD argument.
diff --git a/gdb/eval.c b/gdb/eval.c
index c769872986..4770197ddd 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -938,7 +938,7 @@ evaluate_subexp_standard (struct type *expect_type,
 	      for (; range_low <= range_high; range_low++)
 		{
 		  int bit_index = (unsigned) range_low % TARGET_CHAR_BIT;
-		  if (gdbarch_bits_big_endian (current_gdbarch))
+		  if (gdbarch_bits_big_endian (exp->gdbarch))
 		    bit_index = TARGET_CHAR_BIT - 1 - bit_index;
 		  valaddr[(unsigned) range_low / TARGET_CHAR_BIT]
 		    |= 1 << bit_index;
diff --git a/gdb/infrun.c b/gdb/infrun.c
index e9d870d242..980bde8346 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3777,9 +3777,7 @@ infrun: not switching back to stepped thread, it has vanished\n");
 		  keep_going (ecs);
 		  return;
 		}
-	      if (gdbarch_skip_trampoline_code(current_gdbarch,
-					       get_current_frame (),
-					       stop_pc))
+	      if (gdbarch_skip_trampoline_code (gdbarch, frame, stop_pc))
 		{
 		  /* We are in a function call trampoline.
 		     Keep stepping backward to get to the caller.  */