diff mbox

[PATCH} fix --enable-build-with-cxx

Message ID 20110505115439.GA15843@bromo.med.uc.edu
State New
Headers show

Commit Message

Jack Howarth May 5, 2011, 11:54 a.m. UTC
Currently the bootstrap with --enable-build-with-cxx is broken due to compiler errors of the form
"error: converting 'false' to pointer type 'varpool_node*' [-Werror=conversion-null]". The attached
patch changes these instances of false to NULL and restores the --enable-build-with-cxx bootstrap.
Tested on x86_64-apple-darwin10. Okay for gcc trunk?
                Jack

2011-05-05  Jack Howarth <howarth@bromo.med.uc.edu>

	* gcc/tree-inline.c (maybe_inline_call_in_expr): Use NULL.
	* gcc/varpool.c (varpool_extra_name_alias): Likewise.

Comments

Eric Botcazou May 5, 2011, 12:02 p.m. UTC | #1
> Currently the bootstrap with --enable-build-with-cxx is broken due to
> compiler errors of the form "error: converting 'false' to pointer type
> 'varpool_node*' [-Werror=conversion-null]". The attached patch changes
> these instances of false to NULL and restores the --enable-build-with-cxx
> bootstrap. Tested on x86_64-apple-darwin10. Okay for gcc trunk?

http://gcc.gnu.org/ml/gcc-patches/2011-05/msg00045.html has the first hunk so 
you should credit Dmitry.
Jack Howarth May 5, 2011, 12:55 p.m. UTC | #2
On Thu, May 05, 2011 at 02:02:19PM +0200, Eric Botcazou wrote:
> > Currently the bootstrap with --enable-build-with-cxx is broken due to
> > compiler errors of the form "error: converting 'false' to pointer type
> > 'varpool_node*' [-Werror=conversion-null]". The attached patch changes
> > these instances of false to NULL and restores the --enable-build-with-cxx
> > bootstrap. Tested on x86_64-apple-darwin10. Okay for gcc trunk?
> 
> http://gcc.gnu.org/ml/gcc-patches/2011-05/msg00045.html has the first hunk so 
> you should credit Dmitry.
> 
> -- 
> Eric Botcazou

Eric,
   I didn't see that patch so just reduce mine down to the change for change
for gcc/varpool.c. Odd that the gcc/varpool.c issue isn't seen on other targets
besides darwin apparently.
          Jack
Gabriel Dos Reis May 5, 2011, 12:56 p.m. UTC | #3
On Thu, May 5, 2011 at 7:55 AM, Jack Howarth <howarth@bromo.med.uc.edu> wrote:
> On Thu, May 05, 2011 at 02:02:19PM +0200, Eric Botcazou wrote:
>> > Currently the bootstrap with --enable-build-with-cxx is broken due to
>> > compiler errors of the form "error: converting 'false' to pointer type
>> > 'varpool_node*' [-Werror=conversion-null]". The attached patch changes
>> > these instances of false to NULL and restores the --enable-build-with-cxx
>> > bootstrap. Tested on x86_64-apple-darwin10. Okay for gcc trunk?
>>
>> http://gcc.gnu.org/ml/gcc-patches/2011-05/msg00045.html has the first hunk so
>> you should credit Dmitry.
>>
>> --
>> Eric Botcazou
>
> Eric,
>   I didn't see that patch so just reduce mine down to the change for change
> for gcc/varpool.c. Odd that the gcc/varpool.c issue isn't seen on other targets
> besides darwin apparently.

the patch is OK as obvious.
Jack Howarth May 5, 2011, 1:02 p.m. UTC | #4
On Thu, May 05, 2011 at 07:56:20AM -0500, Gabriel Dos Reis wrote:
> On Thu, May 5, 2011 at 7:55 AM, Jack Howarth <howarth@bromo.med.uc.edu> wrote:
> > On Thu, May 05, 2011 at 02:02:19PM +0200, Eric Botcazou wrote:
> >> > Currently the bootstrap with --enable-build-with-cxx is broken due to
> >> > compiler errors of the form "error: converting 'false' to pointer type
> >> > 'varpool_node*' [-Werror=conversion-null]". The attached patch changes
> >> > these instances of false to NULL and restores the --enable-build-with-cxx
> >> > bootstrap. Tested on x86_64-apple-darwin10. Okay for gcc trunk?
> >>
> >> http://gcc.gnu.org/ml/gcc-patches/2011-05/msg00045.html has the first hunk so
> >> you should credit Dmitry.
> >>
> >> --
> >> Eric Botcazou
> >
> > Eric,
> >   I didn't see that patch so just reduce mine down to the change for change
> > for gcc/varpool.c. Odd that the gcc/varpool.c issue isn't seen on other targets
> > besides darwin apparently.
> 
> the patch is OK as obvious.

Gabriel,
   Thanks. I recall during gcc 4.6's development that there was some discussion of
defaulting on --enable-build-with-cxx for the stage2 compiler and later (such that
only the bootstrapped g++ compiler would be used by --enable-build-with-cxx). Is
that change likely to happen for gcc 4.7?
            Jack
Eric Botcazou May 5, 2011, 1:07 p.m. UTC | #5
>    I didn't see that patch so just reduce mine down to the change for
> change for gcc/varpool.c. Odd that the gcc/varpool.c issue isn't seen on
> other targets besides darwin apparently.

No problem.  Please install the entire patch (with Dmitry's name as second 
name) as Dmitry hasn't got commit rights.
Gabriel Dos Reis May 5, 2011, 1:38 p.m. UTC | #6
On Thu, May 5, 2011 at 8:02 AM, Jack Howarth <howarth@bromo.med.uc.edu> wrote:
> On Thu, May 05, 2011 at 07:56:20AM -0500, Gabriel Dos Reis wrote:
>> On Thu, May 5, 2011 at 7:55 AM, Jack Howarth <howarth@bromo.med.uc.edu> wrote:
>> > On Thu, May 05, 2011 at 02:02:19PM +0200, Eric Botcazou wrote:
>> >> > Currently the bootstrap with --enable-build-with-cxx is broken due to
>> >> > compiler errors of the form "error: converting 'false' to pointer type
>> >> > 'varpool_node*' [-Werror=conversion-null]". The attached patch changes
>> >> > these instances of false to NULL and restores the --enable-build-with-cxx
>> >> > bootstrap. Tested on x86_64-apple-darwin10. Okay for gcc trunk?
>> >>
>> >> http://gcc.gnu.org/ml/gcc-patches/2011-05/msg00045.html has the first hunk so
>> >> you should credit Dmitry.
>> >>
>> >> --
>> >> Eric Botcazou
>> >
>> > Eric,
>> >   I didn't see that patch so just reduce mine down to the change for change
>> > for gcc/varpool.c. Odd that the gcc/varpool.c issue isn't seen on other targets
>> > besides darwin apparently.
>>
>> the patch is OK as obvious.
>
> Gabriel,
>   Thanks. I recall during gcc 4.6's development that there was some discussion of
> defaulting on --enable-build-with-cxx for the stage2 compiler and later (such that
> only the bootstrapped g++ compiler would be used by --enable-build-with-cxx). Is
> that change likely to happen for gcc 4.7?
>            Jack

I hope it does -- Ian may have more ideas about that.

-- Gaby
diff mbox

Patch

Index: gcc/tree-inline.c
===================================================================
--- gcc/tree-inline.c	(revision 173423)
+++ gcc/tree-inline.c	(working copy)
@@ -5238,7 +5238,7 @@  maybe_inline_call_in_expr (tree exp)
       id.transform_call_graph_edges = CB_CGE_DUPLICATE;
       id.transform_new_cfg = false;
       id.transform_return_to_modify = true;
-      id.transform_lang_insert_block = false;
+      id.transform_lang_insert_block = NULL;
 
       /* Make sure not to unshare trees behind the front-end's back
 	 since front-end specific mechanisms may rely on sharing.  */
Index: gcc/varpool.c
===================================================================
--- gcc/varpool.c	(revision 173423)
+++ gcc/varpool.c	(working copy)
@@ -676,7 +676,7 @@  varpool_extra_name_alias (tree alias, tr
 
 #ifndef ASM_OUTPUT_DEF
   /* If aliases aren't supported by the assembler, fail.  */
-  return false;
+  return NULL;
 #endif
 
   gcc_assert (TREE_CODE (decl) == VAR_DECL);