Merge GDB 7.5.1

gdb/testsuite/gdb.trace/strace.c

Index: gdb/testsuite/gdb.trace/strace.c
diff --git a/gdb/testsuite/gdb.trace/status-stop.c b/gdb/testsuite/gdb.trace/strace.c
similarity index 75%
copy from gdb/testsuite/gdb.trace/status-stop.c
copy to gdb/testsuite/gdb.trace/strace.c
index 01130b1f9470436a1b84c6e4fdd388761800e34d..f83c0def77c6d6c1001fc56ab83cc5fa0506bb30 100644
--- a/gdb/testsuite/gdb.trace/status-stop.c
+++ b/gdb/testsuite/gdb.trace/strace.c
@@ -15,15 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-static void
-func1 (void)
-{}
-
-int buf[1024];
-
-static void
-func2 (void)
-{}
+#include <ust/marker.h>
 
 static void
 end (void)
@@ -32,16 +24,13 @@ end (void)
 int
 main (void)
 {
-  int i;
-
-  func1 ();
+  /* Some code to make sure that breakpoints on `main' and `ust/bar' marker
+     are set at different addresses.  */
+  int a = 0;
+  int b = a;
 
-  /* We call func2 as many times as possible to make sure that trace is
-     stopped due to trace buffer is full.  */
-  for (i = 0; i < 10000; i++)
-    {
-      func2 ();
-    }
+  trace_mark(ust, bar, "str %s", "FOOBAZ");
+  trace_mark(ust, bar2, "number1 %d number2 %d", 53, 9800);
 
   end ();
   return 0;