diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ef5e3f4570c..ebe97940f54 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5534,6 +5534,7 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread)
 	  else
 	    within_current_scope = false;
 	}
+      CORE_ADDR pc_before_check = get_frame_pc (get_selected_frame (nullptr));
       if (within_current_scope)
 	{
 	  try
@@ -5545,6 +5546,17 @@ bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread)
 	      exception_fprintf (gdb_stderr, ex,
 				 "Error in testing condition for breakpoint %d:\n",
 				 b->number);
+
+	      /* If the pc value changed as a result of evaluating the
+		 condition then we probably stopped within an inferior
+		 function call due to some unexpected stop, e.g. the thread
+		 hit another breakpoint, or the thread received an
+		 unexpected signal.  In this case we don't want to also
+		 print the information about this breakpoint.  */
+	      CORE_ADDR pc_after_check
+		= get_frame_pc (get_selected_frame (nullptr));
+	      if (pc_before_check != pc_after_check)
+		bs->print = 0;
 	    }
 	}
       else
diff --git a/gdb/testsuite/gdb.base/infcall-failure.exp b/gdb/testsuite/gdb.base/infcall-failure.exp
index 214a64f8de3..5ad179a089d 100644
--- a/gdb/testsuite/gdb.base/infcall-failure.exp
+++ b/gdb/testsuite/gdb.base/infcall-failure.exp
@@ -78,10 +78,7 @@ proc_with_prefix run_cond_hits_breakpoint_test { async_p non_stop_p } {
 	     "The program being debugged stopped while in a function called from GDB\\." \
 	     "Evaluation of the expression containing the function" \
 	     "\\(func_bp\\) will be abandoned\\." \
-	     "When the function is done executing, GDB will silently stop\\." \
-	     "" \
-	     "Breakpoint ${bp_1_num}, \[^\r\n\]+" \
-	     "${::decimal}\\s+\[^\r\n\]+Second breakpoint\[^\r\n\]+"]
+	     "When the function is done executing, GDB will silently stop\\."]
 }
 
 # Start GDB according to ASYNC_P and NON_STOP_P, then call an inferior
@@ -138,13 +135,12 @@ proc_with_prefix run_cond_hits_segfault_test { async_p non_stop_p } {
 	     "${::hex} in func_segfault \\(\\) at \[^\r\n\]+:${::segv_line}" \
 	     "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \
 	     "Error in testing condition for breakpoint ${bp_1_num}:" \
-	     "The program being debugged stopped while in a function called from GDB\\." \
+	     "The program being debugged was signaled while in a function called from GDB\\." \
+	     "GDB remains in the frame where the signal was received\\." \
+	     "To change this behavior use \"set unwindonsignal on\"\\." \
 	     "Evaluation of the expression containing the function" \
 	     "\\(func_segfault\\) will be abandoned\\." \
-	     "When the function is done executing, GDB will silently stop\\." \
-	     "" \
-	     "Breakpoint ${bp_1_num}, \[^\r\n\]+" \
-	     "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+"]
+	     "When the function is done executing, GDB will silently stop\\."]
 }
 
 # Start GDB according to ASYNC_P and NON_STOP_P, then call an inferior
@@ -168,7 +164,9 @@ proc_with_prefix run_call_hits_segfault_test { async_p non_stop_p } {
 	     "Program received signal SIGSEGV, Segmentation fault\\." \
 	     "${::hex} in func_segfault \\(\\) at \[^\r\n\]+:${::segv_line}" \
 	     "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \
-	     "The program being debugged stopped while in a function called from GDB\\." \
+	     "The program being debugged was signaled while in a function called from GDB\\." \
+	     "GDB remains in the frame where the signal was received\\." \
+	     "To change this behavior use \"set unwindonsignal on\"\\." \
 	     "Evaluation of the expression containing the function" \
 	     "\\(func_segfault\\) will be abandoned\\." \
 	     "When the function is done executing, GDB will silently stop\\."]