* breakpoint.c (bpstat_what): Give step-resume higher priority than

	shlib events.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 03dc76bb80531d0bd34b4d89dd0f7d14cdd33a3e..06924fd45b63a11beb9ba712694354b55c015afc 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * breakpoint.c (bpstat_what): Give step-resume higher priority than
+       shlib events.
+
 2007-04-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * infrun.c: Doc fixes.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 4ca386cfabfc6faef7108ff6c6d7d8deda17151a..fa1e653beac417df5a2ae66edfb1fcb158dfd329 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3120,10 +3120,10 @@ bpstat_what (bpstat bs)
      clrs < err shl shlr sn sr ss ts
      ss   < shl shlr sn sr ts
      sn   < shl shlr sr ts
-     sr   < shl shlr ts
-     shl  < shlr
+     shl  < shlr sr
+     shlr < sr
+     sr   < ts
      ts   < 
-     shlr <
 
      What I think this means is that we don't need a damned table
      here.  If you just put the rows and columns in the right order,
@@ -3160,13 +3160,13 @@ bpstat_what (bpstat bs)
 /*long_resume */
     {clr, ss, sn, clrs, err, err, err, sr, ts, shl, shlr},
 /*step_resume */
-    {sr, sr, sr, sr, sr, sr, sr, sr, ts, shl, shlr},
+    {sr, sr, sr, sr, sr, sr, sr, sr, ts, sr, sr},
 /*through_sig */
     {ts, ts, ts, ts, ts, ts, ts, ts, ts, shl, shlr},
 /*shlib */
-    {shl, shl, shl, shl, shl, shl, shl, shl, ts, shl, shlr},
+    {shl, shl, shl, shl, shl, shl, shl, sr, ts, shl, shlr},
 /*catch_shlib */
-    {shlr, shlr, shlr, shlr, shlr, shlr, shlr, shlr, ts, shlr, shlr}
+    {shlr, shlr, shlr, shlr, shlr, shlr, shlr, sr, ts, shlr, shlr}
   };
 
 #undef kc