From 121ad66c941718bb0b1f7caffe0c555829d2fd2b Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 2 Apr 2018 11:34:11 -0700 Subject: [PATCH] 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). --- gdb/ChangeLog | 16 +--------------- gdb/testsuite/ChangeLog | 8 +------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9ad04f28d7e..7eb8453cdd2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,4 @@ -2018-03-30 Weimin Pan +2018-04-02 Weimin Pan 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 - - 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 @@ -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 - - 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 diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5b287ed21a5..5536e5bf400 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,4 +1,4 @@ -2018-03-30 Weimin Pan +2018-04-02 Weimin Pan * 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 - - * 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 Sergio Durigan Junior