* [committed, gcc-5-branch] Set DEV-PHASE to prerelease
@ 2015-04-23 23:31 H.J. Lu
2015-04-24 6:00 ` Jakub Jelinek
0 siblings, 1 reply; 8+ messages in thread
From: H.J. Lu @ 2015-04-23 23:31 UTC (permalink / raw)
To: gcc-patches
Hi,
I checked this patch into gcc-5-branch.
H.J.
---
Index: ChangeLog
===================================================================
--- ChangeLog (revision 222386)
+++ ChangeLog (working copy)
@@ -1,3 +1,7 @@
+2015-04-23 H.J. Lu <hongjiu.lu@intel.com>
+
+ * DEV-PHASE: Set to prerelease.
+
2015-04-23 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
Backport from mainline r222349
Index: DEV-PHASE
===================================================================
--- DEV-PHASE (revision 222386)
+++ DEV-PHASE (working copy)
@@ -0,0 +1 @@
+prerelease
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-04-23 23:31 [committed, gcc-5-branch] Set DEV-PHASE to prerelease H.J. Lu
@ 2015-04-24 6:00 ` Jakub Jelinek
2015-04-24 7:52 ` Richard Biener
2015-05-04 9:13 ` Rainer Orth
0 siblings, 2 replies; 8+ messages in thread
From: Jakub Jelinek @ 2015-04-24 6:00 UTC (permalink / raw)
To: H.J. Lu, Richard Biener; +Cc: gcc-patches
On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
> Hi,
>
> I checked this patch into gcc-5-branch.
That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
> Index: ChangeLog
> ===================================================================
> --- ChangeLog (revision 222386)
> +++ ChangeLog (working copy)
> @@ -1,3 +1,7 @@
> +2015-04-23 H.J. Lu <hongjiu.lu@intel.com>
> +
> + * DEV-PHASE: Set to prerelease.
> +
> 2015-04-23 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
>
> Backport from mainline r222349
> Index: DEV-PHASE
> ===================================================================
> --- DEV-PHASE (revision 222386)
> +++ DEV-PHASE (working copy)
> @@ -0,0 +1 @@
> +prerelease
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-04-24 6:00 ` Jakub Jelinek
@ 2015-04-24 7:52 ` Richard Biener
2015-05-04 9:13 ` Rainer Orth
1 sibling, 0 replies; 8+ messages in thread
From: Richard Biener @ 2015-04-24 7:52 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: H.J. Lu, gcc-patches
On Fri, 24 Apr 2015, Jakub Jelinek wrote:
> On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
> > Hi,
> >
> > I checked this patch into gcc-5-branch.
>
> That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
Yes. Please revert.
In future please don't do this kind of changes as non-RM without
approval.
Thanks,
Richard.
> > Index: ChangeLog
> > ===================================================================
> > --- ChangeLog (revision 222386)
> > +++ ChangeLog (working copy)
> > @@ -1,3 +1,7 @@
> > +2015-04-23 H.J. Lu <hongjiu.lu@intel.com>
> > +
> > + * DEV-PHASE: Set to prerelease.
> > +
> > 2015-04-23 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
> >
> > Backport from mainline r222349
> > Index: DEV-PHASE
> > ===================================================================
> > --- DEV-PHASE (revision 222386)
> > +++ DEV-PHASE (working copy)
> > @@ -0,0 +1 @@
> > +prerelease
>
> Jakub
>
>
--
Richard Biener <rguenther@suse.de>
SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Jennifer Guild,
Dilip Upmanyu, Graham Norton HRB 21284 (AG Nuernberg)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-04-24 6:00 ` Jakub Jelinek
2015-04-24 7:52 ` Richard Biener
@ 2015-05-04 9:13 ` Rainer Orth
2015-05-04 9:21 ` Jakub Jelinek
1 sibling, 1 reply; 8+ messages in thread
From: Rainer Orth @ 2015-05-04 9:13 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: H.J. Lu, Richard Biener, gcc-patches
Jakub Jelinek <jakub@redhat.com> writes:
> On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
>> Hi,
>>
>> I checked this patch into gcc-5-branch.
>
> That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
HJ has a point, though: with DEV-PHASE remaining empty, all post-5.1.0
versions of gcc identify as 5.1.1, with no way of telling them apart,
like datestamp and revison.
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-05-04 9:13 ` Rainer Orth
@ 2015-05-04 9:21 ` Jakub Jelinek
2015-05-04 9:31 ` Richard Biener
0 siblings, 1 reply; 8+ messages in thread
From: Jakub Jelinek @ 2015-05-04 9:21 UTC (permalink / raw)
To: Rainer Orth, Richard Biener; +Cc: H.J. Lu, gcc-patches
On Mon, May 04, 2015 at 11:13:51AM +0200, Rainer Orth wrote:
> Jakub Jelinek <jakub@redhat.com> writes:
>
> > On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
> >> Hi,
> >>
> >> I checked this patch into gcc-5-branch.
> >
> > That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
>
> HJ has a point, though: with DEV-PHASE remaining empty, all post-5.1.0
> versions of gcc identify as 5.1.1, with no way of telling them apart,
> like datestamp and revison.
That suggests we should change
DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
so that it would expand to DATESTAMP_c also if DEVPHASE_c is empty,
but BASEVER_c does not end with .0
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-05-04 9:21 ` Jakub Jelinek
@ 2015-05-04 9:31 ` Richard Biener
2015-05-04 10:05 ` Jakub Jelinek
0 siblings, 1 reply; 8+ messages in thread
From: Richard Biener @ 2015-05-04 9:31 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Rainer Orth, H.J. Lu, gcc-patches
On Mon, 4 May 2015, Jakub Jelinek wrote:
> On Mon, May 04, 2015 at 11:13:51AM +0200, Rainer Orth wrote:
> > Jakub Jelinek <jakub@redhat.com> writes:
> >
> > > On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
> > >> Hi,
> > >>
> > >> I checked this patch into gcc-5-branch.
> > >
> > > That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
> >
> > HJ has a point, though: with DEV-PHASE remaining empty, all post-5.1.0
> > versions of gcc identify as 5.1.1, with no way of telling them apart,
> > like datestamp and revison.
>
> That suggests we should change
> DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
> so that it would expand to DATESTAMP_c also if DEVPHASE_c is empty,
> but BASEVER_c does not end with .0
Yes.
Richard.
--
Richard Biener <rguenther@suse.de>
SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Jennifer Guild,
Dilip Upmanyu, Graham Norton HRB 21284 (AG Nuernberg)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-05-04 9:31 ` Richard Biener
@ 2015-05-04 10:05 ` Jakub Jelinek
2015-05-04 10:07 ` Richard Biener
0 siblings, 1 reply; 8+ messages in thread
From: Jakub Jelinek @ 2015-05-04 10:05 UTC (permalink / raw)
To: Richard Biener; +Cc: Rainer Orth, H.J. Lu, gcc-patches
On Mon, May 04, 2015 at 11:31:11AM +0200, Richard Biener wrote:
> On Mon, 4 May 2015, Jakub Jelinek wrote:
>
> > On Mon, May 04, 2015 at 11:13:51AM +0200, Rainer Orth wrote:
> > > Jakub Jelinek <jakub@redhat.com> writes:
> > >
> > > > On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
> > > >> Hi,
> > > >>
> > > >> I checked this patch into gcc-5-branch.
> > > >
> > > > That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
> > >
> > > HJ has a point, though: with DEV-PHASE remaining empty, all post-5.1.0
> > > versions of gcc identify as 5.1.1, with no way of telling them apart,
> > > like datestamp and revison.
> >
> > That suggests we should change
> > DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
> > so that it would expand to DATESTAMP_c also if DEVPHASE_c is empty,
> > but BASEVER_c does not end with .0
>
> Yes.
Here is a patch to do that, ok for trunk/5?
2015-05-04 Jakub Jelinek <jakub@redhat.com>
* Makefile.in (PATCHLEVEL_c): New variable.
(DATESTAMP_s, REVISION_s): If PATCHLEVEL_c is not 0,
expand the same way as if DEVPHASE_c was non-empty.
--- gcc/Makefile.in.jj 2015-04-12 21:50:12.000000000 +0200
+++ gcc/Makefile.in 2015-05-04 12:03:03.394797230 +0200
@@ -828,14 +828,20 @@ endif
version := $(BASEVER_c)
+PATCHLEVEL_c := \
+ $(shell echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/')
+
+
# For use in version.c - double quoted strings, with appropriate
# surrounding punctuation and spaces, and with the datestamp and
# development phase collapsed to the empty string in release mode
-# (i.e. if DEVPHASE_c is empty). The space immediately after the
-# comma in the $(if ...) constructs is significant - do not remove it.
+# (i.e. if DEVPHASE_c is empty and PATCHLEVEL_c is 0). The space
+# immediately after the comma in the $(if ...) constructs is
+# significant - do not remove it.
BASEVER_s := "\"$(BASEVER_c)\""
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
-DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
+DATESTAMP_s := \
+ "\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\""
PKGVERSION_s:= "\"@PKGVERSION@\""
BUGURL_s := "\"@REPORT_BUGS_TO@\""
@@ -843,7 +849,8 @@ PKGVERSION := @PKGVERSION@
BUGURL_TEXI := @REPORT_BUGS_TEXI@
ifdef REVISION_c
-REVISION_s := "\"$(if $(DEVPHASE_c), $(REVISION_c))\""
+REVISION_s := \
+ "\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(REVISION_c))\""
else
REVISION_s := "\"\""
endif
Jakub
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [committed, gcc-5-branch] Set DEV-PHASE to prerelease
2015-05-04 10:05 ` Jakub Jelinek
@ 2015-05-04 10:07 ` Richard Biener
0 siblings, 0 replies; 8+ messages in thread
From: Richard Biener @ 2015-05-04 10:07 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Rainer Orth, H.J. Lu, gcc-patches
On Mon, 4 May 2015, Jakub Jelinek wrote:
> On Mon, May 04, 2015 at 11:31:11AM +0200, Richard Biener wrote:
> > On Mon, 4 May 2015, Jakub Jelinek wrote:
> >
> > > On Mon, May 04, 2015 at 11:13:51AM +0200, Rainer Orth wrote:
> > > > Jakub Jelinek <jakub@redhat.com> writes:
> > > >
> > > > > On Thu, Apr 23, 2015 at 04:31:52PM -0700, H.J. Lu wrote:
> > > > >> Hi,
> > > > >>
> > > > >> I checked this patch into gcc-5-branch.
> > > > >
> > > > > That's wrong according to https://gcc.gnu.org/develop.html#num_scheme
> > > >
> > > > HJ has a point, though: with DEV-PHASE remaining empty, all post-5.1.0
> > > > versions of gcc identify as 5.1.1, with no way of telling them apart,
> > > > like datestamp and revison.
> > >
> > > That suggests we should change
> > > DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
> > > so that it would expand to DATESTAMP_c also if DEVPHASE_c is empty,
> > > but BASEVER_c does not end with .0
> >
> > Yes.
>
> Here is a patch to do that, ok for trunk/5?
Looks good to me.
Thanks,
Richard.
> 2015-05-04 Jakub Jelinek <jakub@redhat.com>
>
> * Makefile.in (PATCHLEVEL_c): New variable.
> (DATESTAMP_s, REVISION_s): If PATCHLEVEL_c is not 0,
> expand the same way as if DEVPHASE_c was non-empty.
>
> --- gcc/Makefile.in.jj 2015-04-12 21:50:12.000000000 +0200
> +++ gcc/Makefile.in 2015-05-04 12:03:03.394797230 +0200
> @@ -828,14 +828,20 @@ endif
>
> version := $(BASEVER_c)
>
> +PATCHLEVEL_c := \
> + $(shell echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/')
> +
> +
> # For use in version.c - double quoted strings, with appropriate
> # surrounding punctuation and spaces, and with the datestamp and
> # development phase collapsed to the empty string in release mode
> -# (i.e. if DEVPHASE_c is empty). The space immediately after the
> -# comma in the $(if ...) constructs is significant - do not remove it.
> +# (i.e. if DEVPHASE_c is empty and PATCHLEVEL_c is 0). The space
> +# immediately after the comma in the $(if ...) constructs is
> +# significant - do not remove it.
> BASEVER_s := "\"$(BASEVER_c)\""
> DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
> -DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
> +DATESTAMP_s := \
> + "\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\""
> PKGVERSION_s:= "\"@PKGVERSION@\""
> BUGURL_s := "\"@REPORT_BUGS_TO@\""
>
> @@ -843,7 +849,8 @@ PKGVERSION := @PKGVERSION@
> BUGURL_TEXI := @REPORT_BUGS_TEXI@
>
> ifdef REVISION_c
> -REVISION_s := "\"$(if $(DEVPHASE_c), $(REVISION_c))\""
> +REVISION_s := \
> + "\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(REVISION_c))\""
> else
> REVISION_s := "\"\""
> endif
>
>
> Jakub
>
>
--
Richard Biener <rguenther@suse.de>
SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Jennifer Guild,
Dilip Upmanyu, Graham Norton HRB 21284 (AG Nuernberg)
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-05-04 10:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-23 23:31 [committed, gcc-5-branch] Set DEV-PHASE to prerelease H.J. Lu
2015-04-24 6:00 ` Jakub Jelinek
2015-04-24 7:52 ` Richard Biener
2015-05-04 9:13 ` Rainer Orth
2015-05-04 9:21 ` Jakub Jelinek
2015-05-04 9:31 ` Richard Biener
2015-05-04 10:05 ` Jakub Jelinek
2015-05-04 10:07 ` Richard Biener
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).