FYI/HEAD: Patches applied to branch master

FYI/HEAD: Patches applied to branch master

[Joel Brobecker]

Hello,

Similar to the commits I just pushed on the newly created
gdb-11-branch, I'm about to push the following two commits,
this time on master:

  * [release/HEAD 1/2] Bump version to 12.0.50.DATE-git.
  * [release/HEAD 2/2] Update NEWS post GDB 11 branch creation.

Thank you,
-- 
Joel

[release/HEAD 1/2] Bump version to 12.0.50.DATE-git.

[Joel Brobecker]

Now that the GDB 11 branch has been created, we can
bump the version number.

gdb/ChangeLog:

	GDB 11 branch created (4b51505e33441c6165e7789fa2b6d21930242927):
	* version.in: Bump version to 12.0.50.DATE-git.

gdb/testsuite/ChangeLog:

	* gdb.base/default.exp: Change $_gdb_major to 12.
---
 gdb/ChangeLog                      | 5 +++++
 gdb/testsuite/ChangeLog            | 4 ++++
 gdb/testsuite/gdb.base/default.exp | 2 +-
 gdb/version.in                     | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a5f8b569f..6038dabcb1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	GDB 11 branch created (4b51505e33441c6165e7789fa2b6d21930242927):
+	* version.in: Bump version to 12.0.50.DATE-git.
+
 2021-07-02  Tom Tromey  <tromey@adacore.com>
 
 	* ada-exp.y (chop_selector, chop_separator, write_selectors)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 67fa42cbe3..9a227215dd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.base/default.exp: Change $_gdb_major to 12.
+
 2021-07-01  Pedro Alves  <pedro@palves.net>
 
 	PR mi/15729
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index c6c7c357e4..e32b769478 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -606,7 +606,7 @@ set show_conv_list \
 	{$_gdb_maint_setting = <internal function _gdb_maint_setting>} \
 	{$_gdb_setting_str = <internal function _gdb_setting_str>} \
 	{$_gdb_setting = <internal function _gdb_setting>} \
-	{$_gdb_major = 11} \
+	{$_gdb_major = 12} \
 	{$_gdb_minor = 1} \
 	{$_shell_exitsignal = void} \
 	{$_shell_exitcode = 0} \
diff --git a/gdb/version.in b/gdb/version.in
index 11de0e6284..1b7015de58 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-11.0.50.DATE-git
\ No newline at end of file
+12.0.50.DATE-git
\ No newline at end of file
-- 
2.25.1

[release/HEAD 2/2] Update NEWS post GDB 11 branch creation.

[Joel Brobecker]

gdb/ChangeLog:

	* NEWS: Create a new section for the next release branch.
	Rename the section of the current branch, now that it has
	been cut.
---
 gdb/ChangeLog | 6 ++++++
 gdb/NEWS      | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6038dabcb1..8670e53053 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* NEWS: Create a new section for the next release branch.
+	Rename the section of the current branch, now that it has
+	been cut.
+
 2021-07-03  Joel Brobecker  <brobecker@adacore.com>
 
 	GDB 11 branch created (4b51505e33441c6165e7789fa2b6d21930242927):
diff --git a/gdb/NEWS b/gdb/NEWS
index 1e474eca90..1fea2f56ff 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -1,7 +1,9 @@
 		What has changed in GDB?
 	     (Organized release by release)
 
-*** Changes since GDB 10
+*** Changes since GDB 11
+
+*** Changes in GDB 11
 
 * The 'set disassembler-options' command now supports specifying options
   for the ARC target.
-- 
2.25.1

Re: [release/HEAD 2/2] Update NEWS post GDB 11 branch creation.

[Simon Marchi]

On 2021-07-03 1:54 p.m., Joel Brobecker wrote:
> gdb/ChangeLog:
> 
> 	* NEWS: Create a new section for the next release branch.
> 	Rename the section of the current branch, now that it has
> 	been cut.

Hi Joel,

Since we are not going to use the ChangeLog file on the master branch 
from now on, should we maybe rename it to ChangeLog-2021 right away? 
That would avoid people merging ChangeLog entries by mistake (it would 
be confusing to have some people merge ChangeLog entries for the patches 
they have in progress and others not).

Simon

Re: [release/HEAD 2/2] Update NEWS post GDB 11 branch creation.

[Joel Brobecker]

> Since we are not going to use the ChangeLog file on the master branch from
> now on, should we maybe rename it to ChangeLog-2021 right away? That would
> avoid people merging ChangeLog entries by mistake (it would be confusing to
> have some people merge ChangeLog entries for the patches they have in
> progress and others not).

Good idea. Let's do that.

I'll start by renaming the file. If people feel we want to add an
explanation there as well, we can do that separately.

-- 
Joel

[RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Joel Brobecker]

Hello,

Now that ChangeLog entries are no longer used for GDB patches,
this commit renames the file gdb/ChangeLog to gdb/ChangeLog-2021,
similar to what we would do in the context of the "Start of New
Year" procedure.

The purpose of this change is to avoid people merging ChangeLog
entries by mistake when applying existing commits that they are
currently working on.

OK to apply to master? (maybe a bit on the obvious side, but
this also allows us to make sure I am not missing something
in the commit message)

Thanks,
-- 
Joel
---
 gdb/{ChangeLog => ChangeLog-2021} | 0
 gdb/config/djgpp/fnchange.lst     | 1 +
 2 files changed, 1 insertion(+)
 rename gdb/{ChangeLog => ChangeLog-2021} (100%)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog-2021
similarity index 100%
rename from gdb/ChangeLog
rename to gdb/ChangeLog-2021
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index a71ae5c48a2..3e77bece2fc 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -119,6 +119,7 @@
 @V@/gdb/ChangeLog-2018 @V@/gdb/ChangeLog.018
 @V@/gdb/ChangeLog-2019 @V@/gdb/ChangeLog.019
 @V@/gdb/ChangeLog-2020 @V@/gdb/ChangeLog.020
+@V@/gdb/ChangeLog-2021 @V@/gdb/ChangeLog.021
 @V@/gdb/ChangeLog-3.x @V@/gdb/ChangeLog.3-x
 @V@/gdb/ada-exp.tab.c @V@/gdb/ada-exp_tab.c
 @V@/gdb/amd64-windows-nat.c @V@/gdb/a64w-nat.c
-- 
2.25.1

Re: [RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Eli Zaretskii]

> From: Joel Brobecker <brobecker@adacore.com>
> Date: Sat,  3 Jul 2021 16:32:42 -0700
> Cc: Simon Marchi <simark@simark.ca>, Joel Brobecker <brobecker@adacore.com>
> 
>  gdb/{ChangeLog => ChangeLog-2021} | 0
>  gdb/config/djgpp/fnchange.lst     | 1 +
>  2 files changed, 1 insertion(+)
>  rename gdb/{ChangeLog => ChangeLog-2021} (100%)

OK for the DJGPP part.

Re: [RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Simon Marchi]

On 2021-07-03 7:32 p.m., Joel Brobecker wrote:
> Hello,
> 
> Now that ChangeLog entries are no longer used for GDB patches,
> this commit renames the file gdb/ChangeLog to gdb/ChangeLog-2021,
> similar to what we would do in the context of the "Start of New
> Year" procedure.
> 
> The purpose of this change is to avoid people merging ChangeLog
> entries by mistake when applying existing commits that they are
> currently working on.
> 
> OK to apply to master? (maybe a bit on the obvious side, but
> this also allows us to make sure I am not missing something
> in the commit message)
> 
> Thanks,
> 

Thanks, that LGTM.

Simon

Re: [RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Joel Brobecker]

> > Now that ChangeLog entries are no longer used for GDB patches,
> > this commit renames the file gdb/ChangeLog to gdb/ChangeLog-2021,
> > similar to what we would do in the context of the "Start of New
> > Year" procedure.
> > 
> > The purpose of this change is to avoid people merging ChangeLog
> > entries by mistake when applying existing commits that they are
> > currently working on.
> > 
> > OK to apply to master? (maybe a bit on the obvious side, but
> > this also allows us to make sure I am not missing something
> > in the commit message)
> 
> Thanks, that LGTM.

Thank you all. Now pushed!

-- 
Joel

Re: [RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Tom de Vries]

On 7/6/21 6:16 PM, Joel Brobecker wrote:
>>> Now that ChangeLog entries are no longer used for GDB patches,
>>> this commit renames the file gdb/ChangeLog to gdb/ChangeLog-2021,
>>> similar to what we would do in the context of the "Start of New
>>> Year" procedure.
>>>
>>> The purpose of this change is to avoid people merging ChangeLog
>>> entries by mistake when applying existing commits that they are
>>> currently working on.
>>>
>>> OK to apply to master? (maybe a bit on the obvious side, but
>>> this also allows us to make sure I am not missing something
>>> in the commit message)
>>
>> Thanks, that LGTM.
> 
> Thank you all. Now pushed!

Hi,

what about:
...
$ find gdb* -name ChangeLog
gdb/doc/ChangeLog
gdb/testsuite/ChangeLog
gdb/stubs/ChangeLog
gdbserver/ChangeLog
gdbsupport/ChangeLog
...

Maybe a good idea to rename those as well?  Or am I missing something?

Thanks,
- Tom

Re: [RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Joel Brobecker]

> $ find gdb* -name ChangeLog
> gdb/doc/ChangeLog
> gdb/testsuite/ChangeLog
> gdb/stubs/ChangeLog
> gdbserver/ChangeLog
> gdbsupport/ChangeLog
> ...
> 
> Maybe a good idea to rename those as well?  Or am I missing something?

Either that, or perhaps write a blurb at the start of the ChangeLog
file explaining that they are no longer used. These ChangeLog files
weren't rotated each year, so it might not make as much sense to
renaming them with a year extension (but I wouldn't object -- although
a range of years might make better sense in that case).

We have to include also the ChangeLog in the sim, and there's
perhaps also include/gdb.

-- 
Joel

Re: [RFA] Rename gdb/ChangeLog to gdb/ChangeLog-2021

[Mike Frysinger]

On 08 Jul 2021 05:56, Joel Brobecker wrote:
> > $ find gdb* -name ChangeLog
> > gdb/doc/ChangeLog
> > gdb/testsuite/ChangeLog
> > gdb/stubs/ChangeLog
> > gdbserver/ChangeLog
> > gdbsupport/ChangeLog
> > ...
> > 
> > Maybe a good idea to rename those as well?  Or am I missing something?
> 
> Either that, or perhaps write a blurb at the start of the ChangeLog
> file explaining that they are no longer used. These ChangeLog files
> weren't rotated each year, so it might not make as much sense to
> renaming them with a year extension (but I wouldn't object -- although
> a range of years might make better sense in that case).
> 
> We have to include also the ChangeLog in the sim, and there's
> perhaps also include/gdb.

i had a commit pending to handle the sim/ tree that was waiting for gdb to
branch & update things.  since that's landed, i've pushed the sim/ update
now too.  i also add ChangeLog to sim/.gitignore to make it harder to add
new ChangeLog files, so hopefully that should help.
-mike