[gomp4] DEV-PHASE change

[ was: r241221 [1/2] - in /branches/gomp-4_0-branch: .... ]

On 16/10/16 22:13, tschwinge@gcc.gnu.org wrote:
> Author: tschwinge
> Date: Sun Oct 16 20:13:18 2016
> New Revision: 241221
>
> URL: https://gcc.gnu.org/viewcvs?rev=241221&root=gcc&view=rev
> Log:
> svn merge -r 235033:240831 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch
>
> Modified:
>     branches/gomp-4_0-branch/gcc/DEV-PHASE

Hi Thomas,

In this merge, the DEV-PHASE file was cleared:
...
$ svn diff -c 241221 DEV-PHASE
...

Consequently, when bootstrapping the branch, -Werror is not enabled by 
default (as we can see here in configure):
...
else
   if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = 
xexperimental; then
   enable_werror=yes
else
   enable_werror=no
fi
...

Was this change unintentionally merged from the 6 branch?

Thanks,
- Tom

Hi Tom!

On Thu, 23 Feb 2017 17:19:37 +0100, Tom de Vries <Tom_deVries@mentor.com> wrote:
> [ was: r241221 [1/2] - in /branches/gomp-4_0-branch: .... ]
> 
> On 16/10/16 22:13, tschwinge@gcc.gnu.org wrote:
> > Author: tschwinge
> > Date: Sun Oct 16 20:13:18 2016
> > New Revision: 241221
> >
> > URL: https://gcc.gnu.org/viewcvs?rev=241221&root=gcc&view=rev
> > Log:
> > svn merge -r 235033:240831 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch

> In this merge, the DEV-PHASE file was cleared:

> Consequently, when bootstrapping the branch, -Werror is not enabled by 
> default (as we can see here in configure):
> ...
> else
>    if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = 
> xexperimental; then
>    enable_werror=yes
> else
>    enable_werror=no
> fi
> ...
> 
> Was this change unintentionally merged from the 6 branch?

Well, I generally merge all changes from the base branch.

So you're suggesting we should restore that file's content, to get back
"enable_werror=yes"?  (I have not yet looked up which other things, if
any, this DEV-PHASE file control.)


Grüße
 Thomas

On 27/02/17 10:09, Thomas Schwinge wrote:
> Hi Tom!
>
> On Thu, 23 Feb 2017 17:19:37 +0100, Tom de Vries <Tom_deVries@mentor.com> wrote:
>> [ was: r241221 [1/2] - in /branches/gomp-4_0-branch: .... ]
>>
>> On 16/10/16 22:13, tschwinge@gcc.gnu.org wrote:
>>> Author: tschwinge
>>> Date: Sun Oct 16 20:13:18 2016
>>> New Revision: 241221
>>>
>>> URL: https://gcc.gnu.org/viewcvs?rev=241221&root=gcc&view=rev
>>> Log:
>>> svn merge -r 235033:240831 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch
>
>> In this merge, the DEV-PHASE file was cleared:
>
>> Consequently, when bootstrapping the branch, -Werror is not enabled by
>> default (as we can see here in configure):
>> ...
>> else
>>    if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" =
>> xexperimental; then
>>    enable_werror=yes
>> else
>>    enable_werror=no
>> fi
>> ...
>>
>> Was this change unintentionally merged from the 6 branch?
>
> Well, I generally merge all changes from the base branch.
>
> So you're suggesting we should restore that file's content, to get back
> "enable_werror=yes"?

At https://gcc.gnu.org/install/configure.html I read:
...
--enable-werror
--disable-werror
--enable-werror=yes
--enable-werror=no
     When you specify this option, it controls whether certain files in 
the compiler are built with -Werror in bootstrap stage2 and later. If 
you don't specify it, -Werror is turned on for the main development 
trunk. However it defaults to off for release branches and final 
releases. The specific files which get -Werror are controlled by the 
Makefiles.
...

Since gomp4 is not a release branch or final release, I'd expect -Werror 
to be turned on.

> (I have not yet looked up which other things, if
> any, this DEV-PHASE file control.)
>

Some default stage1 checking:
...
   if test "x$enable_checking" = x && \
      test -d ${srcdir}/gcc && \
      test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then
     stage1_checking=--enable-checking=yes,types,extra
   fi
...

Thanks,
- Tom