diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9533556ec6..a784f7e5e5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-27  Maciej W. Rozycki  <macro@mips.com>
+            Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* infrun.c (handle_inferior_event): Don't proceed through
+	shared library trampolines if stepping at the machine
+	instruction level.
+
 2012-02-27  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* mips-linux-tdep.c (mips_linux_init_abi): Set num_pseudo_regs
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 1b2da67fff..89f9362bec 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -5008,7 +5008,8 @@ process_event_stop_test:
   /* If we're in the return path from a shared library trampoline,
      we want to proceed through the trampoline when stepping.  */
   if (gdbarch_in_solib_return_trampoline (gdbarch,
-					  stop_pc, ecs->stop_func_name))
+					  stop_pc, ecs->stop_func_name)
+      && ecs->event_thread->control.step_over_calls != STEP_OVER_NONE)
     {
       /* Determine where this trampoline returns.  */
       CORE_ADDR real_stop_pc;