aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kościelnicki <koriakin@0x04.net>2016-02-19 05:04:13 +0100
committerMarcin Kościelnicki <koriakin@0x04.net>2016-03-09 18:46:12 +0100
commitf77198c878424891f11d6550370f8d9382f412de (patch)
treec8569f2e6ba18c1b932725b764091fc33df2a396
parentba84e0da35d29dd8969a4bcdd84e3eaa48927a84 (diff)
downloadgdb-f77198c878424891f11d6550370f8d9382f412de.zip
gdb-f77198c878424891f11d6550370f8d9382f412de.tar.gz
gdb-f77198c878424891f11d6550370f8d9382f412de.tar.bz2
gdb.trace/tfind.exp: Force call via global entry point on ppc64le.
tfind.exp sets a breakpoint on *gdb_recursion_test, which is the global entry point on ppc64le, and won't be hit, since the call uses the local entry. Fix by calling the function via a pointer in a global variable, forcing use of the global entry. This patch is a slightly modified hunk extracted from https://sourceware.org/ml/gdb-patches/2015-07/msg00353.html gdb/testsuite/ChangeLog: 2016-03-09 Wei-cheng Wang <cole945@gmail.com> Marcin Kościelnicki <koriakin@0x04.net> * gdb.trace/actions.c (gdb_recursion_test_fp): New typedef. (gdb_recursion_test_ptr): New global variable. (gdb_recursion_test): Call gdb_recursion_test_ptr instead of gdb_recursion_test. (gdb_c_test): Ditto.
-rw-r--r--gdb/testsuite/ChangeLog9
-rw-r--r--gdb/testsuite/gdb.trace/actions.c9
2 files changed, 16 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fe68a01..c044355 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2016-03-09 Wei-cheng Wang <cole945@gmail.com>
+ Marcin Kościelnicki <koriakin@0x04.net>
+
+ * gdb.trace/actions.c (gdb_recursion_test_fp): New typedef.
+ (gdb_recursion_test_ptr): New global variable.
+ (gdb_recursion_test): Call gdb_recursion_test_ptr instead of
+ gdb_recursion_test.
+ (gdb_c_test): Ditto.
+
2016-03-09 Marcin Kościelnicki <koriakin@0x04.net>
* gdb.trace/change-loc.exp: Don't depend on tracepoint location
diff --git a/gdb/testsuite/gdb.trace/actions.c b/gdb/testsuite/gdb.trace/actions.c
index 431b08a..aedd202 100644
--- a/gdb/testsuite/gdb.trace/actions.c
+++ b/gdb/testsuite/gdb.trace/actions.c
@@ -48,6 +48,11 @@ static union GDB_UNION_TEST
} gdb_union1_test;
void gdb_recursion_test (int, int, int, int, int, int, int);
+/* This function pointer is used to force the function to be called via
+ the global entry instead of local entry on ppc64le; otherwise, breakpoints
+ set at the global entry (i.e., '*foo') will not be hit. */
+typedef void (*gdb_recursion_test_fp) (int, int, int, int, int, int, int);
+gdb_recursion_test_fp gdb_recursion_test_ptr = gdb_recursion_test;
void gdb_recursion_test (int depth,
int q1,
@@ -66,7 +71,7 @@ void gdb_recursion_test (int depth,
q5 = q6; /* gdbtestline 6 */
q6 = q; /* gdbtestline 7 */
if (depth--) /* gdbtestline 8 */
- gdb_recursion_test (depth, q1, q2, q3, q4, q5, q6); /* gdbtestline 9 */
+ gdb_recursion_test_ptr (depth, q1, q2, q3, q4, q5, q6); /* gdbtestline 9 */
}
@@ -105,7 +110,7 @@ unsigned long gdb_c_test( unsigned long *parm )
gdb_structp_test = &gdb_struct1_test;
gdb_structpp_test = &gdb_structp_test;
- gdb_recursion_test (3, (long) parm[1], (long) parm[2], (long) parm[3],
+ gdb_recursion_test_ptr (3, (long) parm[1], (long) parm[2], (long) parm[3],
(long) parm[4], (long) parm[5], (long) parm[6]);
gdb_char_test = gdb_short_test = gdb_long_test = 0;