OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge issues in gdb/ChangeLog and gdb/testsuite/ChangeLog...

Browse Source 
... introduced by the previous commit to these files.
Also adjust the date in the new ChangeLog entries (out of date).
This commit is contained in:
Joel Brobecker 2018-04-02 11:34:11 -07:00
parent 79f1873171
commit 121ad66c94
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gdb/ChangeLog
View File

@ -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>

8
gdb/testsuite/ChangeLog
View File

@ -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>