diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2018-04-02 11:34:11 -0700 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2018-04-02 11:34:11 -0700 |
| commit | 121ad66c941718bb0b1f7caffe0c555829d2fd2b (patch) | |
| tree | d18a8408a0c7d5ea648aeca10fb44f23691ff0cf | |
| parent | 79f18731714e7f07af6e78b8da8a1ffacf4247b7 (diff) | |
| download | gdb-121ad66c941718bb0b1f7caffe0c555829d2fd2b.zip gdb-121ad66c941718bb0b1f7caffe0c555829d2fd2b.tar.gz gdb-121ad66c941718bb0b1f7caffe0c555829d2fd2b.tar.bz2 | |
Fix merge issues in gdb/ChangeLog and gdb/testsuite/ChangeLog...
... introduced by the previous commit to these files.
Also adjust the date in the new ChangeLog entries (out of date).
| -rw-r--r-- | gdb/ChangeLog | 16 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 |
2 files changed, 2 insertions, 22 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9ad04f2..7eb8453 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,4 @@ -2018-03-30 Weimin Pan <weimin.pan@oracle.com> +2018-04-02 Weimin Pan <weimin.pan@oracle.com> PR gdb/16959 * cp-valprint.c: (cp_print_static_field) Fix infinite recursion when @@ -13,13 +13,6 @@ * common/gdb_vecs.h (char_ptr): Remove. * tracepoint.c (encode_actions_1): Remove usage of char_ptr. -======= -2018-03-30 Weimin Pan <weimin.pan@oracle.com> - - PR gdb/16959 - * cp-valprint.c: (cp_print_static_field) Fix infinite recursion when - printing static type. ->>>>>>> Fix infinite recursion when printing static member with typedef 2018-03-30 Simon Marchi <simon.marchi@polymtl.ca> @@ -2092,13 +2085,6 @@ * rs6000-tdep.c (ppc_insns_match_pattern): Make pattern const. Correct insns description. * ppc-tdep.h (ppc_insns_match_pattern): Update prototype. -======= -2018-02-07 Weimin Pan <weimin.pan@oracle.com> - - PR gdb/16959 - * cp-valprint.c: (cp_print_static_field) Fix infinite recursion when - printing static type. ->>>>>>> Fix infinite recursion when printing static member with typedef 2018-01-24 Pedro Alves <palves@redhat.com> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5b287ed..5536e5b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,4 +1,4 @@ -2018-03-30 Weimin Pan <weimin.pan@oracle.com> +2018-04-02 Weimin Pan <weimin.pan@oracle.com> * gdb.cp/static-typedef-print.exp: New file. * gdb.cp/static-typedef-print.cc: New file. @@ -303,12 +303,6 @@ on break.c:47 was actually inserted when debugging the version compiled at -O2 and use it in the expected output of the "info break" test performed soon after. -======= -2018-03-20 Weimin Pan <weimin.pan@oracle.com> - - * gdb.cp/static-typedef-print.exp: New file. - * gdb.cp/static-typedef-print.cc: New file. ->>>>>>> Fix infinite recursion when printing static member with typedef 2018-01-22 Pedro Alves <palves@redhat.com> Sergio Durigan Junior <sergiodj@redhat.com> |