Merge GDB 7.5.1

gdb/testsuite/gdb.base/catch-load.c

Index: gdb/testsuite/gdb.base/catch-load.c
diff --git a/gdb/testsuite/gdb.base/step-bt.c b/gdb/testsuite/gdb.base/catch-load.c
similarity index 74%
copy from gdb/testsuite/gdb.base/step-bt.c
copy to gdb/testsuite/gdb.base/catch-load.c
index 371029481e713130e81d81b837bd956aa13c8d7c..170f581bd1f0f4abf28eb65e880bdfa5bebfaf11 100644
--- a/gdb/testsuite/gdb.base/step-bt.c
+++ b/gdb/testsuite/gdb.base/catch-load.c
@@ -1,6 +1,6 @@
 /* This testcase is part of GDB, the GNU debugger.
 
-   Copyright 2006-2012 Free Software Foundation, Inc.
+   Copyright 2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,18 +15,21 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include <dlfcn.h>
 #include <stdio.h>
 
-void
-hello (void)
-{
-  printf ("Hello world.\n");
-}
+/* This is updated by the .exp file.  */
+char *libname = "catch-load-so.so";
 
 int
-main (void)
+main ()
 {
-  hello ();
+  void *h;
+
+  h = dlopen (libname, RTLD_LAZY);
+
+  dlclose (h);
 
+  h = NULL;			/* final breakpoint here */
   return 0;
 }