Merge GDB 7.5.1

gdb/testsuite/gdb.base/ctxobj-m.c

Index: gdb/testsuite/gdb.base/ctxobj-m.c
diff --git a/gdb/testsuite/gdb.base/dmsym_main.c b/gdb/testsuite/gdb.base/ctxobj-m.c
similarity index 64%
copy from gdb/testsuite/gdb.base/dmsym_main.c
copy to gdb/testsuite/gdb.base/ctxobj-m.c
index 4f867b4c85d7b82b9a7f553966f13527682d0575..97710011ff31e2e257ab99061022acad3c4f49d0 100644
--- a/gdb/testsuite/gdb.base/dmsym_main.c
+++ b/gdb/testsuite/gdb.base/ctxobj-m.c
@@ -1,6 +1,5 @@
 /* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2011-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,22 +14,24 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-extern int get_pck__foo__bar__minsym (void);
-
-int
-pck__foo__bar__minsym__2 (void)
-{
-  return get_pck__foo__bar__minsym ();
-}
+extern int get_version_1 (void);
+extern int get_version_2 (void);
 
 int
 main (void)
 {
-  int val = pck__foo__bar__minsym__2 ();
+  int v1 = get_version_1 ();
+  int v2 = get_version_2 ();
 
-  if (val != 124) /* BREAK */
+  if (v1 != 104)
     return 1;
+
+  /* The value returned by get_version_2 depends on the target.
+     On GNU/Linux, for instance, it should return 104.  But on
+     x86-windows, for instance, it will return 203.  */
+  if (v2 != 104 && v2 != 203)
+    return 2;
+
   return 0;
 }
 
-