diff options
| author | Jim Blandy <jimb@redhat.com> | 2005-06-28 00:59:55 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 2005-06-28 00:59:55 +0000 |
| commit | 7b22dca829b4edc5c703d424b1af9297b1204065 (patch) | |
| tree | c9f51c484d7e6a27912f1557938ba09657557ad2 /rda/unix | |
| parent | 66466a7f51a43a969e98e626a183429ac221f0b0 (diff) | |
| download | gdb-7b22dca829b4edc5c703d424b1af9297b1204065.tar.gz | |
Correct merge of Kevin's patch from the trunk.jimb-rda-nptl-branchcvs/jimb-rda-nptl-branch
Diffstat (limited to 'rda/unix')
| -rw-r--r-- | rda/unix/ChangeLog | 6 | ||||
| -rw-r--r-- | rda/unix/thread-db.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/rda/unix/ChangeLog b/rda/unix/ChangeLog index e0a97477629..d61ba2100fa 100644 --- a/rda/unix/ChangeLog +++ b/rda/unix/ChangeLog @@ -1,5 +1,9 @@ 2005-03-10 Jim Blandy <jimb@redhat.com> + * thread-db.c (thread_db_get_thread_reg, + thread_db_set_thread_reg): Correct Kevin's patch, incorrectly + merged. + * configure.in: Provide description for STOCK_BREAKPOINTS for use in config.in. @@ -21,7 +25,7 @@ 2005-02-08 Kevin Buettner <kevinb@redhat.com - * td_thr_tls_get_addr_p): New static global. + * thread-db.c (td_thr_tls_get_addr_p): New static global. (thread_db_dlopen): Initialize ``td_thr_tls_get_addr_p''. (thread_db_get_gen): Add support for qGetTLSAddr packet. diff --git a/rda/unix/thread-db.c b/rda/unix/thread-db.c index b33608c95bf..4e4af7b2ca0 100644 --- a/rda/unix/thread-db.c +++ b/rda/unix/thread-db.c @@ -2221,6 +2221,10 @@ thread_db_get_thread_reg (struct gdbserv *serv, GREGSET_T gregset; td_err_e ret; + /* Initialize reg to 0 in the event that we return early due to a + register being unsupported. */ + gdbserv_ulonglong_to_reg (serv, 0LL, reg); + if (thread == NULL) thread = process->event_thread; /* Default to the event thread. */ @@ -2359,10 +2363,6 @@ thread_db_set_thread_reg (struct gdbserv *serv, GREGSET_T gregset; td_err_e ret; - /* Initialize reg to 0 in the event that we return early due to a - register being unsupported. */ - gdbserv_ulonglong_to_reg (serv, 0LL, reg); - if (thread == NULL) thread = process->event_thread; /* Default to the event thread. */ |