public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* libcc1
@ 2014-10-29 10:35 Jakub Jelinek
  2014-10-29 10:37 ` libcc1 Paolo Bonzini
                   ` (2 more replies)
  0 siblings, 3 replies; 25+ messages in thread
From: Jakub Jelinek @ 2014-10-29 10:35 UTC (permalink / raw)
  To: Phil Muldoon, Paolo Bonzini, DJ Delorie, Alexandre Oliva,
	Ralf Wildenhues
  Cc: gcc-patches

It would be nice to have libcc1 built just once, not bootstrap it, but
it is a build module, is that possible?
In toplevel configure.ac I'm seeing:   
host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
shouldn't libcc1 be in build_tools instead?
I mean, it is a library meant to be dlopened by gdb and gcc
plugin that uses that library, so in canadian-cross should be
for the build target, where the resulting compiler will be run
and where gdb will be run.

Could something like following work?  Phil, can you try that?
Perhaps some toplevel Makefile* changes would be needed too.

--- configure.ac	2014-10-28 14:39:53.018852391 +0100
+++ configure.ac	2014-10-29 11:27:39.866152791 +0100
@@ -129,7 +129,7 @@ extra_host_args=
 build_libs="build-libiberty build-libcpp"
 
 # these tools are built for the build environment
-build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
+build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes build-libcc1"
 
 # these libraries are used by various programs built for the host environment
 #f
@@ -141,7 +141,7 @@ host_libs="intl libiberty opcodes bfd re
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
 # If --enable-gold is used, "gold" may replace "ld".
-host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
+host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
@@ -2659,11 +2659,18 @@ for module in ${build_configdirs} ; do
     echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${build_subdir}/${module}/Makefile
   fi
+
+  # Don't bootstrap libcc1
+  case $module in
+    libcc1) build_bootstrap_suffix=no-bootstrap ;;
+    *) build_bootstrap_suffix=$bootstrap_suffix ;;
+  esac
+
   extrasub_build="$extrasub_build
 /^@if build-$module\$/d
 /^@endif build-$module\$/d
-/^@if build-$module-$bootstrap_suffix\$/d
-/^@endif build-$module-$bootstrap_suffix\$/d"
+/^@if build-$module-$build-bootstrap_suffix\$/d
+/^@endif build-$module-$build-bootstrap_suffix\$/d"
 done
 extrasub_host=
 for module in ${configdirs} ; do


	Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 10:35 libcc1 Jakub Jelinek
@ 2014-10-29 10:37 ` Paolo Bonzini
  2014-10-29 10:48   ` libcc1 Jakub Jelinek
  2014-10-29 11:01 ` libcc1 Phil Muldoon
  2014-10-29 11:46 ` libcc1 Phil Muldoon
  2 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2014-10-29 10:37 UTC (permalink / raw)
  To: Jakub Jelinek, Phil Muldoon, DJ Delorie, Alexandre Oliva,
	Ralf Wildenhues
  Cc: gcc-patches



On 10/29/2014 11:31 AM, Jakub Jelinek wrote:
> It would be nice to have libcc1 built just once, not bootstrap it, but
> it is a build module, is that possible?
> In toplevel configure.ac I'm seeing:   
> host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"

Stuff such as texinfo and flex is in host_tools just as a relic of the
old Cygnus tree.

fixincludes is in there for running it after installation.

The ones that matter in the common case are biuntils, gas, ld, gcc, gdb,
gnattools and of course libcc1.

> shouldn't libcc1 be in build_tools instead?
> I mean, it is a library meant to be dlopened by gdb and gcc
> plugin that uses that library, so in canadian-cross should be
> for the build target, where the resulting compiler will be run
> and where gdb will be run.

That is host, not build.  Build is the system you are on.

Say you're cross-building a native mingw compiler and debugger:

    build = i686-pc-linux-gnu
    host = i686-pc-mingw (or whatever they use these days)
    target = i686-pc-mingw

You cannot link build-libcc1 (for i686-pc-linux-gnu) into host-gcc or
host-gdb.

But you surely know this, so perhaps it's me who is missing something.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 10:37 ` libcc1 Paolo Bonzini
@ 2014-10-29 10:48   ` Jakub Jelinek
  2014-10-29 10:51     ` libcc1 Paolo Bonzini
  2014-10-29 20:43     ` libcc1 Jakub Jelinek
  0 siblings, 2 replies; 25+ messages in thread
From: Jakub Jelinek @ 2014-10-29 10:48 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: Phil Muldoon, DJ Delorie, Alexandre Oliva, Ralf Wildenhues, gcc-patches

On Wed, Oct 29, 2014 at 11:37:26AM +0100, Paolo Bonzini wrote:
> On 10/29/2014 11:31 AM, Jakub Jelinek wrote:
> > shouldn't libcc1 be in build_tools instead?
> > I mean, it is a library meant to be dlopened by gdb and gcc
> > plugin that uses that library, so in canadian-cross should be
> > for the build target, where the resulting compiler will be run
> > and where gdb will be run.
> 
> That is host, not build.  Build is the system you are on.

Oops, sorry, mixed that, sure, it should be host tool then.

So without the first two hunks and third hunk changed so that it
doesn't bootstrap it?  Doesn't that mean that when bootstrapping
natively it will be built by the system compiler rather than the
newly built compiler?  I think fixincludes is only built during
stage1 normally, we don't need libcc1 during stage1/stage2 unless
not bootstrapping, it is needed just for installation and testing.

--- configure.ac	2014-10-28 14:39:53.018852391 +0100
+++ configure.ac	2014-10-29 11:43:19.873216226 +0100
@@ -2677,6 +2677,7 @@ for module in ${configdirs} ; do
   fi
   case ${module},${bootstrap_fixincludes} in
     fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
+    libcc1,*) host_bootstrap_suffix=no-bootstrap ;;
     *) host_bootstrap_suffix=$bootstrap_suffix ;;
   esac
   extrasub_host="$extrasub_host


	Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 10:48   ` libcc1 Jakub Jelinek
@ 2014-10-29 10:51     ` Paolo Bonzini
  2014-10-29 20:43     ` libcc1 Jakub Jelinek
  1 sibling, 0 replies; 25+ messages in thread
From: Paolo Bonzini @ 2014-10-29 10:51 UTC (permalink / raw)
  To: Jakub Jelinek
  Cc: Phil Muldoon, DJ Delorie, Alexandre Oliva, Ralf Wildenhues, gcc-patches



On 10/29/2014 11:45 AM, Jakub Jelinek wrote:
> On Wed, Oct 29, 2014 at 11:37:26AM +0100, Paolo Bonzini wrote:
>> On 10/29/2014 11:31 AM, Jakub Jelinek wrote:
>>> shouldn't libcc1 be in build_tools instead?
>>> I mean, it is a library meant to be dlopened by gdb and gcc
>>> plugin that uses that library, so in canadian-cross should be
>>> for the build target, where the resulting compiler will be run
>>> and where gdb will be run.
>>
>> That is host, not build.  Build is the system you are on.
> 
> Oops, sorry, mixed that, sure, it should be host tool then.
> 
> So without the first two hunks and third hunk changed so that it
> doesn't bootstrap it?  Doesn't that mean that when bootstrapping
> natively it will be built by the system compiler rather than the
> newly built compiler?

IIRC it will be built after stage3 completes, with the just-bootstrapped
compiler.

> I think fixincludes is only built during
> stage1 normally, we don't need libcc1 during stage1/stage2 unless
> not bootstrapping, it is needed just for installation and testing.
> 
> --- configure.ac	2014-10-28 14:39:53.018852391 +0100
> +++ configure.ac	2014-10-29 11:43:19.873216226 +0100
> @@ -2677,6 +2677,7 @@ for module in ${configdirs} ; do
>    fi
>    case ${module},${bootstrap_fixincludes} in
>      fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
> +    libcc1,*) host_bootstrap_suffix=no-bootstrap ;;
>      *) host_bootstrap_suffix=$bootstrap_suffix ;;
>    esac
>    extrasub_host="$extrasub_host

This makes sense.

Paolo

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 10:35 libcc1 Jakub Jelinek
  2014-10-29 10:37 ` libcc1 Paolo Bonzini
@ 2014-10-29 11:01 ` Phil Muldoon
  2014-10-29 11:24   ` libcc1 Paolo Bonzini
  2014-10-29 11:46 ` libcc1 Phil Muldoon
  2 siblings, 1 reply; 25+ messages in thread
From: Phil Muldoon @ 2014-10-29 11:01 UTC (permalink / raw)
  To: Jakub Jelinek, bonzini, DJ Delorie, aoliva, Ralf Wildenhues, tom
  Cc: gcc-patches

On 29/10/14 10:31, Jakub Jelinek wrote:
> It would be nice to have libcc1 built just once, not bootstrap it, but
> it is a build module, is that possible?
> In toplevel configure.ac I'm seeing:  
> host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
> shouldn't libcc1 be in build_tools instead?
> I mean, it is a library meant to be dlopened by gdb and gcc
> plugin that uses that library, so in canadian-cross should be
> for the build target, where the resulting compiler will be run
> and where gdb will be run.
>
> Could something like following work?  Phil, can you try that?
> Perhaps some toplevel Makefile* changes would be needed too.

From GDB's point-of-view, as long as we have access to the .so that is
built that's all GDB wants. So whichever stage it is produced should be
fine.  My archaeology into the source repository has not revealed why
we needed bootstrap.  Perhaps we included it out of a sense of
paranoia for testing.  I've CC'd Tom on this, so he may have an
opinion or insight.  From my point of view, I see no value in
bootstrapping libcc1 now.  It's not a required build to bootstrap GCC.

Cheers

Phil

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 11:01 ` libcc1 Phil Muldoon
@ 2014-10-29 11:24   ` Paolo Bonzini
  0 siblings, 0 replies; 25+ messages in thread
From: Paolo Bonzini @ 2014-10-29 11:24 UTC (permalink / raw)
  To: Phil Muldoon, Jakub Jelinek, DJ Delorie, aoliva, Ralf Wildenhues, tom
  Cc: gcc-patches

On 10/29/2014 11:58 AM, Phil Muldoon wrote:
> My archaeology into the source repository has not revealed why
> we needed bootstrap.  Perhaps we included it out of a sense of
> paranoia for testing.  I've CC'd Tom on this, so he may have an
> opinion or insight.  From my point of view, I see no value in
> bootstrapping libcc1 now.  It's not a required build to bootstrap GCC.

Then I agree, I don't think it needs to be bootstrapped.

Paolo

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 10:35 libcc1 Jakub Jelinek
  2014-10-29 10:37 ` libcc1 Paolo Bonzini
  2014-10-29 11:01 ` libcc1 Phil Muldoon
@ 2014-10-29 11:46 ` Phil Muldoon
  2014-10-29 14:32   ` libcc1 Phil Muldoon
  2 siblings, 1 reply; 25+ messages in thread
From: Phil Muldoon @ 2014-10-29 11:46 UTC (permalink / raw)
  To: Jakub Jelinek, Paolo Bonzini, DJ Delorie, Alexandre Oliva,
	Ralf Wildenhues
  Cc: gcc-patches

On 29/10/14 10:31, Jakub Jelinek wrote:
> It would be nice to have libcc1 built just once, not bootstrap it, but
> it is a build module, is that possible?
> In toplevel configure.ac I'm seeing:  
> host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
> shouldn't libcc1 be in build_tools instead?
> I mean, it is a library meant to be dlopened by gdb and gcc
> plugin that uses that library, so in canadian-cross should be
> for the build target, where the resulting compiler will be run
> and where gdb will be run.
>
> Could something like following work?  Phil, can you try that?
> Perhaps some toplevel Makefile* changes would be needed too.

From a point of view of GDB, as long as in all scenarios above the .so
is available in the finished produce that is fine.  I will test your
patch and report back.

Cheers

Phil

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 11:46 ` libcc1 Phil Muldoon
@ 2014-10-29 14:32   ` Phil Muldoon
  2014-10-29 14:39     ` libcc1 Phil Muldoon
  0 siblings, 1 reply; 25+ messages in thread
From: Phil Muldoon @ 2014-10-29 14:32 UTC (permalink / raw)
  To: Jakub Jelinek, Paolo Bonzini, DJ Delorie, Alexandre Oliva,
	Ralf Wildenhues
  Cc: gcc-patches

On 29/10/14 11:24, Phil Muldoon wrote:
> On 29/10/14 10:31, Jakub Jelinek wrote:
>> It would be nice to have libcc1 built just once, not bootstrap it, but
>> it is a build module, is that possible?
>> In toplevel configure.ac I'm seeing: 
>> host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
>> shouldn't libcc1 be in build_tools instead?
>> I mean, it is a library meant to be dlopened by gdb and gcc
>> plugin that uses that library, so in canadian-cross should be
>> for the build target, where the resulting compiler will be run
>> and where gdb will be run.
>>
>> Could something like following work?  Phil, can you try that?
>> Perhaps some toplevel Makefile* changes would be needed too.
>
> >From a point of view of GDB, as long as in all scenarios above the .so
> is available in the finished produce that is fine.  I will test your
> patch and report back.

I built with bootstrap enabled, and also disabled with this patch.  In
both cases the .so is available.  So it looks good. I also ran GDB
compile testcases against both .so's and all looks good there too.

Cheers

Phil



^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 14:32   ` libcc1 Phil Muldoon
@ 2014-10-29 14:39     ` Phil Muldoon
  2014-10-29 20:49       ` libcc1 Jeff Law
  0 siblings, 1 reply; 25+ messages in thread
From: Phil Muldoon @ 2014-10-29 14:39 UTC (permalink / raw)
  To: Jakub Jelinek, Paolo Bonzini, DJ Delorie, Alexandre Oliva,
	Ralf Wildenhues
  Cc: gcc-patches

On 29/10/14 14:26, Phil Muldoon wrote:
> On 29/10/14 11:24, Phil Muldoon wrote:
>> On 29/10/14 10:31, Jakub Jelinek wrote:
>>> It would be nice to have libcc1 built just once, not bootstrap it, but
>>> it is a build module, is that possible?
>>> In toplevel configure.ac I'm seeing:
>>> host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
>>> shouldn't libcc1 be in build_tools instead?
>>> I mean, it is a library meant to be dlopened by gdb and gcc
>>> plugin that uses that library, so in canadian-cross should be
>>> for the build target, where the resulting compiler will be run
>>> and where gdb will be run.
>>>
>>> Could something like following work?  Phil, can you try that?
>>> Perhaps some toplevel Makefile* changes would be needed too.
>>
>> >From a point of view of GDB, as long as in all scenarios above the .so
>> is available in the finished produce that is fine.  I will test your
>> patch and report back.
>
> I built with bootstrap enabled, and also disabled with this patch.  In
> both cases the .so is available.  So it looks good. I also ran GDB
> compile testcases against both .so's and all looks good there too.
>
> Cheers
>
> Phil

I forgot to ask, I am fine with this patch.  I concur with Jakub that
building libcc1 as part of bootstrap is not needed.  Does anyone else
object to removing libcc1.so from bootstrap?

Cheers

Phil

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 10:48   ` libcc1 Jakub Jelinek
  2014-10-29 10:51     ` libcc1 Paolo Bonzini
@ 2014-10-29 20:43     ` Jakub Jelinek
  2014-10-30  8:51       ` libcc1 Paolo Bonzini
  1 sibling, 1 reply; 25+ messages in thread
From: Jakub Jelinek @ 2014-10-29 20:43 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: Phil Muldoon, DJ Delorie, Alexandre Oliva, Ralf Wildenhues, gcc-patches

On Wed, Oct 29, 2014 at 11:45:51AM +0100, Jakub Jelinek wrote:
> On Wed, Oct 29, 2014 at 11:37:26AM +0100, Paolo Bonzini wrote:
> > On 10/29/2014 11:31 AM, Jakub Jelinek wrote:
> > > shouldn't libcc1 be in build_tools instead?
> > > I mean, it is a library meant to be dlopened by gdb and gcc
> > > plugin that uses that library, so in canadian-cross should be
> > > for the build target, where the resulting compiler will be run
> > > and where gdb will be run.
> > 
> > That is host, not build.  Build is the system you are on.
> 
> Oops, sorry, mixed that, sure, it should be host tool then.
> 
> So without the first two hunks and third hunk changed so that it
> doesn't bootstrap it?  Doesn't that mean that when bootstrapping
> natively it will be built by the system compiler rather than the
> newly built compiler?  I think fixincludes is only built during
> stage1 normally, we don't need libcc1 during stage1/stage2 unless
> not bootstrapping, it is needed just for installation and testing.
> 
> --- configure.ac	2014-10-28 14:39:53.018852391 +0100
> +++ configure.ac	2014-10-29 11:43:19.873216226 +0100
> @@ -2677,6 +2677,7 @@ for module in ${configdirs} ; do
>    fi
>    case ${module},${bootstrap_fixincludes} in
>      fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
> +    libcc1,*) host_bootstrap_suffix=no-bootstrap ;;
>      *) host_bootstrap_suffix=$bootstrap_suffix ;;
>    esac
>    extrasub_host="$extrasub_host

Makefile.def has:
host_modules= { module= libcc1; bootstrap=true;
                extra_configure_flags=--enable-shared; };
wonder if that bootstrap=true; is desirable there.

	Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 14:39     ` libcc1 Phil Muldoon
@ 2014-10-29 20:49       ` Jeff Law
  0 siblings, 0 replies; 25+ messages in thread
From: Jeff Law @ 2014-10-29 20:49 UTC (permalink / raw)
  To: Phil Muldoon, Jakub Jelinek, Paolo Bonzini, DJ Delorie,
	Alexandre Oliva, Ralf Wildenhues
  Cc: gcc-patches

On 10/29/14 08:32, Phil Muldoon wrote:
> On 29/10/14 14:26, Phil Muldoon wrote:
>> On 29/10/14 11:24, Phil Muldoon wrote:
>>> On 29/10/14 10:31, Jakub Jelinek wrote:
>>>> It would be nice to have libcc1 built just once, not bootstrap it, but
>>>> it is a build module, is that possible?
>>>> In toplevel configure.ac I'm seeing:
>>>> host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1"
>>>> shouldn't libcc1 be in build_tools instead?
>>>> I mean, it is a library meant to be dlopened by gdb and gcc
>>>> plugin that uses that library, so in canadian-cross should be
>>>> for the build target, where the resulting compiler will be run
>>>> and where gdb will be run.
>>>>
>>>> Could something like following work?  Phil, can you try that?
>>>> Perhaps some toplevel Makefile* changes would be needed too.
>>>
>>> >From a point of view of GDB, as long as in all scenarios above the .so
>>> is available in the finished produce that is fine.  I will test your
>>> patch and report back.
>>
>> I built with bootstrap enabled, and also disabled with this patch.  In
>> both cases the .so is available.  So it looks good. I also ran GDB
>> compile testcases against both .so's and all looks good there too.
>>
>> Cheers
>>
>> Phil
>
> I forgot to ask, I am fine with this patch.  I concur with Jakub that
> building libcc1 as part of bootstrap is not needed.  Does anyone else
> object to removing libcc1.so from bootstrap?
Not at all... To a large degree libcc1 is driven by your needs, so if 
you don't need the bootstrap, then let's remove it from bootstrap.

jeff

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: libcc1
  2014-10-29 20:43     ` libcc1 Jakub Jelinek
@ 2014-10-30  8:51       ` Paolo Bonzini
  2014-10-31 11:03         ` [PATCH] Don't bootstrap libcc1 Jakub Jelinek
  0 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2014-10-30  8:51 UTC (permalink / raw)
  To: Jakub Jelinek
  Cc: Phil Muldoon, DJ Delorie, Alexandre Oliva, Ralf Wildenhues, gcc-patches



On 10/29/2014 09:10 PM, Jakub Jelinek wrote:
> On Wed, Oct 29, 2014 at 11:45:51AM +0100, Jakub Jelinek wrote:
>> On Wed, Oct 29, 2014 at 11:37:26AM +0100, Paolo Bonzini wrote:
>>> On 10/29/2014 11:31 AM, Jakub Jelinek wrote:
>>>> shouldn't libcc1 be in build_tools instead?
>>>> I mean, it is a library meant to be dlopened by gdb and gcc
>>>> plugin that uses that library, so in canadian-cross should be
>>>> for the build target, where the resulting compiler will be run
>>>> and where gdb will be run.
>>>
>>> That is host, not build.  Build is the system you are on.
>>
>> Oops, sorry, mixed that, sure, it should be host tool then.
>>
>> So without the first two hunks and third hunk changed so that it
>> doesn't bootstrap it?  Doesn't that mean that when bootstrapping
>> natively it will be built by the system compiler rather than the
>> newly built compiler?  I think fixincludes is only built during
>> stage1 normally, we don't need libcc1 during stage1/stage2 unless
>> not bootstrapping, it is needed just for installation and testing.
>>
>> --- configure.ac	2014-10-28 14:39:53.018852391 +0100
>> +++ configure.ac	2014-10-29 11:43:19.873216226 +0100
>> @@ -2677,6 +2677,7 @@ for module in ${configdirs} ; do
>>    fi
>>    case ${module},${bootstrap_fixincludes} in
>>      fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
>> +    libcc1,*) host_bootstrap_suffix=no-bootstrap ;;
>>      *) host_bootstrap_suffix=$bootstrap_suffix ;;
>>    esac
>>    extrasub_host="$extrasub_host
> 
> Makefile.def has:
> host_modules= { module= libcc1; bootstrap=true;
>                 extra_configure_flags=--enable-shared; };
> wonder if that bootstrap=true; is desirable there.

No, it shouldn't be there

Paolo

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH] Don't bootstrap libcc1
  2014-10-30  8:51       ` libcc1 Paolo Bonzini
@ 2014-10-31 11:03         ` Jakub Jelinek
  2014-10-31 11:16           ` Richard Biener
  0 siblings, 1 reply; 25+ messages in thread
From: Jakub Jelinek @ 2014-10-31 11:03 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: Phil Muldoon, DJ Delorie, Alexandre Oliva, Ralf Wildenhues, gcc-patches

On Thu, Oct 30, 2014 at 09:39:06AM +0100, Paolo Bonzini wrote:
> >> --- configure.ac	2014-10-28 14:39:53.018852391 +0100
> >> +++ configure.ac	2014-10-29 11:43:19.873216226 +0100
> >> @@ -2677,6 +2677,7 @@ for module in ${configdirs} ; do
> >>    fi
> >>    case ${module},${bootstrap_fixincludes} in
> >>      fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
> >> +    libcc1,*) host_bootstrap_suffix=no-bootstrap ;;
> >>      *) host_bootstrap_suffix=$bootstrap_suffix ;;
> >>    esac
> >>    extrasub_host="$extrasub_host
> > 
> > Makefile.def has:
> > host_modules= { module= libcc1; bootstrap=true;
> >                 extra_configure_flags=--enable-shared; };
> > wonder if that bootstrap=true; is desirable there.
> 
> No, it shouldn't be there

Seems removing that makes the configure.ac change unneeded.
Bootstrapped/regtested on x86_64-linux and i686-linux (libcc1
is built after compare, by stage3 compiler), and built
with --disable-bootstrap on i686-linux (libcc1 is built by
the system compiler in that case).  Ok for trunk?

2014-10-31  Jakub Jelinek  <jakub@redhat.com>

	* Makefile.def (libcc1): Remove bootstrap=true;.
	* Makefile.in: Regenerated.

--- Makefile.def.jj	2014-10-28 14:40:30.000000000 +0100
+++ Makefile.def	2014-10-31 10:10:22.723173845 +0100
@@ -123,8 +123,7 @@ host_modules= { module= gnattools; };
 host_modules= { module= lto-plugin; bootstrap=true;
 		extra_configure_flags='--enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
 		extra_make_flags='@extra_linker_plugin_flags@'; };
-host_modules= { module= libcc1; bootstrap=true;
-		extra_configure_flags=--enable-shared; };
+host_modules= { module= libcc1; extra_configure_flags=--enable-shared; };
 
 target_modules = { module= libstdc++-v3;
 		   bootstrap=true;
--- Makefile.in.jj	2014-10-28 14:39:52.000000000 +0100
+++ Makefile.in	2014-10-31 10:10:51.000000000 +0100
@@ -1085,9 +1085,7 @@ all-host: maybe-all-gnattools
 @if lto-plugin-no-bootstrap
 all-host: maybe-all-lto-plugin
 @endif lto-plugin-no-bootstrap
-@if libcc1-no-bootstrap
 all-host: maybe-all-libcc1
-@endif libcc1-no-bootstrap
 
 .PHONY: all-target
 
@@ -32264,6 +32262,7 @@ configure-libcc1: stage_current
 @if libcc1
 maybe-configure-libcc1: configure-libcc1
 configure-libcc1: 
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
@@ -32287,211 +32286,6 @@ configure-libcc1:
 
 
 
-.PHONY: configure-stage1-libcc1 maybe-configure-stage1-libcc1
-maybe-configure-stage1-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage1-libcc1: configure-stage1-libcc1
-configure-stage1-libcc1:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE1_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libcc1 ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-	cd $(HOST_SUBDIR)/libcc1 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcc1; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	   \
-	  $(STAGE1_CONFIGURE_FLAGS) \
-	  --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stage2-libcc1 maybe-configure-stage2-libcc1
-maybe-configure-stage2-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage2-libcc1: configure-stage2-libcc1
-configure-stage2-libcc1:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE2_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libcc1 ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-	cd $(HOST_SUBDIR)/libcc1 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcc1; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	   --with-build-libsubdir=$(HOST_SUBDIR)  \
-	  $(STAGE2_CONFIGURE_FLAGS) \
-	  --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stage3-libcc1 maybe-configure-stage3-libcc1
-maybe-configure-stage3-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage3-libcc1: configure-stage3-libcc1
-configure-stage3-libcc1:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE3_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libcc1 ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-	cd $(HOST_SUBDIR)/libcc1 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcc1; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	   --with-build-libsubdir=$(HOST_SUBDIR)  \
-	  $(STAGE3_CONFIGURE_FLAGS) \
-	  --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stage4-libcc1 maybe-configure-stage4-libcc1
-maybe-configure-stage4-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stage4-libcc1: configure-stage4-libcc1
-configure-stage4-libcc1:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE4_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libcc1 ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-	cd $(HOST_SUBDIR)/libcc1 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcc1; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	   --with-build-libsubdir=$(HOST_SUBDIR)  \
-	  $(STAGE4_CONFIGURE_FLAGS) \
-	  --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stageprofile-libcc1 maybe-configure-stageprofile-libcc1
-maybe-configure-stageprofile-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stageprofile-libcc1: configure-stageprofile-libcc1
-configure-stageprofile-libcc1:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libcc1 ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-	cd $(HOST_SUBDIR)/libcc1 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcc1; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	   --with-build-libsubdir=$(HOST_SUBDIR)  \
-	  $(STAGEprofile_CONFIGURE_FLAGS) \
-	  --enable-shared
-@endif libcc1-bootstrap
-
-.PHONY: configure-stagefeedback-libcc1 maybe-configure-stagefeedback-libcc1
-maybe-configure-stagefeedback-libcc1:
-@if libcc1-bootstrap
-maybe-configure-stagefeedback-libcc1: configure-stagefeedback-libcc1
-configure-stagefeedback-libcc1:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libcc1 ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-	cd $(HOST_SUBDIR)/libcc1 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcc1; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	   --with-build-libsubdir=$(HOST_SUBDIR)  \
-	  $(STAGEfeedback_CONFIGURE_FLAGS) \
-	  --enable-shared
-@endif libcc1-bootstrap
-
-
-
 
 
 .PHONY: all-libcc1 maybe-all-libcc1
@@ -32503,6 +32297,7 @@ all-libcc1: stage_current
 TARGET-libcc1=all
 maybe-all-libcc1: all-libcc1
 all-libcc1: configure-libcc1
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS)  \
@@ -32513,255 +32308,6 @@ all-libcc1: configure-libcc1
 
 
 
-.PHONY: all-stage1-libcc1 maybe-all-stage1-libcc1
-.PHONY: clean-stage1-libcc1 maybe-clean-stage1-libcc1
-maybe-all-stage1-libcc1:
-maybe-clean-stage1-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage1-libcc1: all-stage1-libcc1
-all-stage1: all-stage1-libcc1
-TARGET-stage1-libcc1 = $(TARGET-libcc1)
-all-stage1-libcc1: configure-stage1-libcc1
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE1_TFLAGS)"; \
-	$(HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE1_CFLAGS)" \
-		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-		LIBCFLAGS="$(LIBCFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS)  \
-		$(STAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE1_TFLAGS)" \
-		$(TARGET-stage1-libcc1)
-
-maybe-clean-stage1-libcc1: clean-stage1-libcc1
-clean-stage1: clean-stage1-libcc1
-clean-stage1-libcc1:
-	@if [ $(current_stage) = stage1 ]; then \
-	  [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage1-libcc1/Makefile ] || exit 0; \
-	  $(MAKE) stage1-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(EXTRA_HOST_FLAGS)  \
-	$(STAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stage2-libcc1 maybe-all-stage2-libcc1
-.PHONY: clean-stage2-libcc1 maybe-clean-stage2-libcc1
-maybe-all-stage2-libcc1:
-maybe-clean-stage2-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage2-libcc1: all-stage2-libcc1
-all-stage2: all-stage2-libcc1
-TARGET-stage2-libcc1 = $(TARGET-libcc1)
-all-stage2-libcc1: configure-stage2-libcc1
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE2_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE2_CFLAGS)" \
-		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE2_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE2_TFLAGS)" \
-		$(TARGET-stage2-libcc1)
-
-maybe-clean-stage2-libcc1: clean-stage2-libcc1
-clean-stage2: clean-stage2-libcc1
-clean-stage2-libcc1:
-	@if [ $(current_stage) = stage2 ]; then \
-	  [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage2-libcc1/Makefile ] || exit 0; \
-	  $(MAKE) stage2-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stage3-libcc1 maybe-all-stage3-libcc1
-.PHONY: clean-stage3-libcc1 maybe-clean-stage3-libcc1
-maybe-all-stage3-libcc1:
-maybe-clean-stage3-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage3-libcc1: all-stage3-libcc1
-all-stage3: all-stage3-libcc1
-TARGET-stage3-libcc1 = $(TARGET-libcc1)
-all-stage3-libcc1: configure-stage3-libcc1
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE3_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE3_CFLAGS)" \
-		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE3_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE3_TFLAGS)" \
-		$(TARGET-stage3-libcc1)
-
-maybe-clean-stage3-libcc1: clean-stage3-libcc1
-clean-stage3: clean-stage3-libcc1
-clean-stage3-libcc1:
-	@if [ $(current_stage) = stage3 ]; then \
-	  [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage3-libcc1/Makefile ] || exit 0; \
-	  $(MAKE) stage3-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stage4-libcc1 maybe-all-stage4-libcc1
-.PHONY: clean-stage4-libcc1 maybe-clean-stage4-libcc1
-maybe-all-stage4-libcc1:
-maybe-clean-stage4-libcc1:
-@if libcc1-bootstrap
-maybe-all-stage4-libcc1: all-stage4-libcc1
-all-stage4: all-stage4-libcc1
-TARGET-stage4-libcc1 = $(TARGET-libcc1)
-all-stage4-libcc1: configure-stage4-libcc1
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE4_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGE4_CFLAGS)" \
-		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGE4_TFLAGS)" \
-		$(TARGET-stage4-libcc1)
-
-maybe-clean-stage4-libcc1: clean-stage4-libcc1
-clean-stage4: clean-stage4-libcc1
-clean-stage4-libcc1:
-	@if [ $(current_stage) = stage4 ]; then \
-	  [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stage4-libcc1/Makefile ] || exit 0; \
-	  $(MAKE) stage4-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stageprofile-libcc1 maybe-all-stageprofile-libcc1
-.PHONY: clean-stageprofile-libcc1 maybe-clean-stageprofile-libcc1
-maybe-all-stageprofile-libcc1:
-maybe-clean-stageprofile-libcc1:
-@if libcc1-bootstrap
-maybe-all-stageprofile-libcc1: all-stageprofile-libcc1
-all-stageprofile: all-stageprofile-libcc1
-TARGET-stageprofile-libcc1 = $(TARGET-libcc1)
-all-stageprofile-libcc1: configure-stageprofile-libcc1
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEprofile_TFLAGS)" \
-		$(TARGET-stageprofile-libcc1)
-
-maybe-clean-stageprofile-libcc1: clean-stageprofile-libcc1
-clean-stageprofile: clean-stageprofile-libcc1
-clean-stageprofile-libcc1:
-	@if [ $(current_stage) = stageprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageprofile-libcc1/Makefile ] || exit 0; \
-	  $(MAKE) stageprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-.PHONY: all-stagefeedback-libcc1 maybe-all-stagefeedback-libcc1
-.PHONY: clean-stagefeedback-libcc1 maybe-clean-stagefeedback-libcc1
-maybe-all-stagefeedback-libcc1:
-maybe-clean-stagefeedback-libcc1:
-@if libcc1-bootstrap
-maybe-all-stagefeedback-libcc1: all-stagefeedback-libcc1
-all-stagefeedback: all-stagefeedback-libcc1
-TARGET-stagefeedback-libcc1 = $(TARGET-libcc1)
-all-stagefeedback-libcc1: configure-stagefeedback-libcc1
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEfeedback_TFLAGS)" \
-		$(TARGET-stagefeedback-libcc1)
-
-maybe-clean-stagefeedback-libcc1: clean-stagefeedback-libcc1
-clean-stagefeedback: clean-stagefeedback-libcc1
-clean-stagefeedback-libcc1:
-	@if [ $(current_stage) = stagefeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagefeedback-libcc1/Makefile ] || exit 0; \
-	  $(MAKE) stagefeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcc1 && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcc1-bootstrap
-
-
-
-
 
 .PHONY: check-libcc1 maybe-check-libcc1
 maybe-check-libcc1:
@@ -32817,6 +32363,7 @@ maybe-info-libcc1: info-libcc1
 
 info-libcc1: \
     configure-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32842,6 +32389,7 @@ maybe-dvi-libcc1: dvi-libcc1
 
 dvi-libcc1: \
     configure-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32867,6 +32415,7 @@ maybe-pdf-libcc1: pdf-libcc1
 
 pdf-libcc1: \
     configure-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32892,6 +32441,7 @@ maybe-html-libcc1: html-libcc1
 
 html-libcc1: \
     configure-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32917,6 +32467,7 @@ maybe-TAGS-libcc1: TAGS-libcc1
 
 TAGS-libcc1: \
     configure-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32943,6 +32494,7 @@ maybe-install-info-libcc1: install-info-
 install-info-libcc1: \
     configure-libcc1 \
     info-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32969,6 +32521,7 @@ maybe-install-pdf-libcc1: install-pdf-li
 install-pdf-libcc1: \
     configure-libcc1 \
     pdf-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32995,6 +32548,7 @@ maybe-install-html-libcc1: install-html-
 install-html-libcc1: \
     configure-libcc1 \
     html-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33020,6 +32574,7 @@ maybe-installcheck-libcc1: installcheck-
 
 installcheck-libcc1: \
     configure-libcc1 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33044,6 +32599,7 @@ maybe-mostlyclean-libcc1:
 maybe-mostlyclean-libcc1: mostlyclean-libcc1
 
 mostlyclean-libcc1: 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33068,6 +32624,7 @@ maybe-clean-libcc1:
 maybe-clean-libcc1: clean-libcc1
 
 clean-libcc1: 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33092,6 +32649,7 @@ maybe-distclean-libcc1:
 maybe-distclean-libcc1: distclean-libcc1
 
 distclean-libcc1: 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33116,6 +32674,7 @@ maybe-maintainer-clean-libcc1:
 maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
 
 maintainer-clean-libcc1: 
+	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -46918,11 +46477,6 @@ stage1-start::
 	  mkdir stage1-lto-plugin; \
 	mv stage1-lto-plugin lto-plugin 
 @endif lto-plugin
-@if libcc1
-	@cd $(HOST_SUBDIR); [ -d stage1-libcc1 ] || \
-	  mkdir stage1-libcc1; \
-	mv stage1-libcc1 libcc1 
-@endif libcc1
 	@[ -d stage1-$(TARGET_SUBDIR) ] || \
 	  mkdir stage1-$(TARGET_SUBDIR); \
 	mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) 
@@ -47038,11 +46592,6 @@ stage1-end::
 	  cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin  ; \
 	fi
 @endif lto-plugin
-@if libcc1
-	@if test -d $(HOST_SUBDIR)/libcc1 ; then \
-	  cd $(HOST_SUBDIR); mv libcc1 stage1-libcc1  ; \
-	fi
-@endif libcc1
 	@if test -d $(TARGET_SUBDIR) ; then \
 	  mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
 	fi
@@ -47223,12 +46772,6 @@ stage2-start::
 	mv stage2-lto-plugin lto-plugin  ; \
 	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
-@if libcc1
-	@cd $(HOST_SUBDIR); [ -d stage2-libcc1 ] || \
-	  mkdir stage2-libcc1; \
-	mv stage2-libcc1 libcc1  ; \
-	mv stage1-libcc1 prev-libcc1 || test -f stage1-lean 
-@endif libcc1
 	@[ -d stage2-$(TARGET_SUBDIR) ] || \
 	  mkdir stage2-$(TARGET_SUBDIR); \
 	mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
@@ -47367,12 +46910,6 @@ stage2-end::
 	  mv prev-lto-plugin stage1-lto-plugin ; :  ; \
 	fi
 @endif lto-plugin
-@if libcc1
-	@if test -d $(HOST_SUBDIR)/libcc1 ; then \
-	  cd $(HOST_SUBDIR); mv libcc1 stage2-libcc1 ; \
-	  mv prev-libcc1 stage1-libcc1 ; :  ; \
-	fi
-@endif libcc1
 	@if test -d $(TARGET_SUBDIR) ; then \
 	  mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
 	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
@@ -47577,12 +47114,6 @@ stage3-start::
 	mv stage3-lto-plugin lto-plugin  ; \
 	mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
 @endif lto-plugin
-@if libcc1
-	@cd $(HOST_SUBDIR); [ -d stage3-libcc1 ] || \
-	  mkdir stage3-libcc1; \
-	mv stage3-libcc1 libcc1  ; \
-	mv stage2-libcc1 prev-libcc1 || test -f stage2-lean 
-@endif libcc1
 	@[ -d stage3-$(TARGET_SUBDIR) ] || \
 	  mkdir stage3-$(TARGET_SUBDIR); \
 	mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
@@ -47721,12 +47252,6 @@ stage3-end::
 	  mv prev-lto-plugin stage2-lto-plugin ; :  ; \
 	fi
 @endif lto-plugin
-@if libcc1
-	@if test -d $(HOST_SUBDIR)/libcc1 ; then \
-	  cd $(HOST_SUBDIR); mv libcc1 stage3-libcc1 ; \
-	  mv prev-libcc1 stage2-libcc1 ; :  ; \
-	fi
-@endif libcc1
 	@if test -d $(TARGET_SUBDIR) ; then \
 	  mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
 	  mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
@@ -47987,12 +47512,6 @@ stage4-start::
 	mv stage4-lto-plugin lto-plugin  ; \
 	mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean 
 @endif lto-plugin
-@if libcc1
-	@cd $(HOST_SUBDIR); [ -d stage4-libcc1 ] || \
-	  mkdir stage4-libcc1; \
-	mv stage4-libcc1 libcc1  ; \
-	mv stage3-libcc1 prev-libcc1 || test -f stage3-lean 
-@endif libcc1
 	@[ -d stage4-$(TARGET_SUBDIR) ] || \
 	  mkdir stage4-$(TARGET_SUBDIR); \
 	mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
@@ -48131,12 +47650,6 @@ stage4-end::
 	  mv prev-lto-plugin stage3-lto-plugin ; :  ; \
 	fi
 @endif lto-plugin
-@if libcc1
-	@if test -d $(HOST_SUBDIR)/libcc1 ; then \
-	  cd $(HOST_SUBDIR); mv libcc1 stage4-libcc1 ; \
-	  mv prev-libcc1 stage3-libcc1 ; :  ; \
-	fi
-@endif libcc1
 	@if test -d $(TARGET_SUBDIR) ; then \
 	  mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
 	  mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
@@ -48385,12 +47898,6 @@ stageprofile-start::
 	mv stageprofile-lto-plugin lto-plugin  ; \
 	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
-@if libcc1
-	@cd $(HOST_SUBDIR); [ -d stageprofile-libcc1 ] || \
-	  mkdir stageprofile-libcc1; \
-	mv stageprofile-libcc1 libcc1  ; \
-	mv stage1-libcc1 prev-libcc1 || test -f stage1-lean 
-@endif libcc1
 	@[ -d stageprofile-$(TARGET_SUBDIR) ] || \
 	  mkdir stageprofile-$(TARGET_SUBDIR); \
 	mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
@@ -48529,12 +48036,6 @@ stageprofile-end::
 	  mv prev-lto-plugin stage1-lto-plugin ; :  ; \
 	fi
 @endif lto-plugin
-@if libcc1
-	@if test -d $(HOST_SUBDIR)/libcc1 ; then \
-	  cd $(HOST_SUBDIR); mv libcc1 stageprofile-libcc1 ; \
-	  mv prev-libcc1 stage1-libcc1 ; :  ; \
-	fi
-@endif libcc1
 	@if test -d $(TARGET_SUBDIR) ; then \
 	  mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
 	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
@@ -48716,12 +48217,6 @@ stagefeedback-start::
 	mv stagefeedback-lto-plugin lto-plugin  ; \
 	mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
 @endif lto-plugin
-@if libcc1
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcc1 ] || \
-	  mkdir stagefeedback-libcc1; \
-	mv stagefeedback-libcc1 libcc1  ; \
-	mv stageprofile-libcc1 prev-libcc1 || test -f stageprofile-lean 
-@endif libcc1
 	@[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
 	  mkdir stagefeedback-$(TARGET_SUBDIR); \
 	mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
@@ -48860,12 +48355,6 @@ stagefeedback-end::
 	  mv prev-lto-plugin stageprofile-lto-plugin ; :  ; \
 	fi
 @endif lto-plugin
-@if libcc1
-	@if test -d $(HOST_SUBDIR)/libcc1 ; then \
-	  cd $(HOST_SUBDIR); mv libcc1 stagefeedback-libcc1 ; \
-	  mv prev-libcc1 stageprofile-libcc1 ; :  ; \
-	fi
-@endif libcc1
 	@if test -d $(TARGET_SUBDIR) ; then \
 	  mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
 	  mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
@@ -49380,21 +48869,7 @@ all-stage4-lto-plugin: maybe-all-stage4-
 all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
 all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
 configure-libcc1: maybe-configure-gcc
-
-configure-stage1-libcc1: maybe-configure-stage1-gcc
-configure-stage2-libcc1: maybe-configure-stage2-gcc
-configure-stage3-libcc1: maybe-configure-stage3-gcc
-configure-stage4-libcc1: maybe-configure-stage4-gcc
-configure-stageprofile-libcc1: maybe-configure-stageprofile-gcc
-configure-stagefeedback-libcc1: maybe-configure-stagefeedback-gcc
 all-libcc1: maybe-all-gcc
-
-all-stage1-libcc1: maybe-all-stage1-gcc
-all-stage2-libcc1: maybe-all-stage2-gcc
-all-stage3-libcc1: maybe-all-stage3-gcc
-all-stage4-libcc1: maybe-all-stage4-gcc
-all-stageprofile-libcc1: maybe-all-stageprofile-gcc
-all-stagefeedback-libcc1: maybe-all-stagefeedback-gcc
 all-utils: maybe-all-libiberty
 configure-mpfr: maybe-all-gmp
 


	Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-10-31 11:03         ` [PATCH] Don't bootstrap libcc1 Jakub Jelinek
@ 2014-10-31 11:16           ` Richard Biener
  0 siblings, 0 replies; 25+ messages in thread
From: Richard Biener @ 2014-10-31 11:16 UTC (permalink / raw)
  To: Jakub Jelinek
  Cc: Paolo Bonzini, Phil Muldoon, DJ Delorie, Alexandre Oliva,
	Ralf Wildenhues, GCC Patches

On Fri, Oct 31, 2014 at 12:01 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Thu, Oct 30, 2014 at 09:39:06AM +0100, Paolo Bonzini wrote:
>> >> --- configure.ac   2014-10-28 14:39:53.018852391 +0100
>> >> +++ configure.ac   2014-10-29 11:43:19.873216226 +0100
>> >> @@ -2677,6 +2677,7 @@ for module in ${configdirs} ; do
>> >>    fi
>> >>    case ${module},${bootstrap_fixincludes} in
>> >>      fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
>> >> +    libcc1,*) host_bootstrap_suffix=no-bootstrap ;;
>> >>      *) host_bootstrap_suffix=$bootstrap_suffix ;;
>> >>    esac
>> >>    extrasub_host="$extrasub_host
>> >
>> > Makefile.def has:
>> > host_modules= { module= libcc1; bootstrap=true;
>> >                 extra_configure_flags=--enable-shared; };
>> > wonder if that bootstrap=true; is desirable there.
>>
>> No, it shouldn't be there
>
> Seems removing that makes the configure.ac change unneeded.
> Bootstrapped/regtested on x86_64-linux and i686-linux (libcc1
> is built after compare, by stage3 compiler), and built
> with --disable-bootstrap on i686-linux (libcc1 is built by
> the system compiler in that case).  Ok for trunk?

Ok.

Thanks,
Richard.

> 2014-10-31  Jakub Jelinek  <jakub@redhat.com>
>
>         * Makefile.def (libcc1): Remove bootstrap=true;.
>         * Makefile.in: Regenerated.
>
> --- Makefile.def.jj     2014-10-28 14:40:30.000000000 +0100
> +++ Makefile.def        2014-10-31 10:10:22.723173845 +0100
> @@ -123,8 +123,7 @@ host_modules= { module= gnattools; };
>  host_modules= { module= lto-plugin; bootstrap=true;
>                 extra_configure_flags='--enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
>                 extra_make_flags='@extra_linker_plugin_flags@'; };
> -host_modules= { module= libcc1; bootstrap=true;
> -               extra_configure_flags=--enable-shared; };
> +host_modules= { module= libcc1; extra_configure_flags=--enable-shared; };
>
>  target_modules = { module= libstdc++-v3;
>                    bootstrap=true;
> --- Makefile.in.jj      2014-10-28 14:39:52.000000000 +0100
> +++ Makefile.in 2014-10-31 10:10:51.000000000 +0100
> @@ -1085,9 +1085,7 @@ all-host: maybe-all-gnattools
>  @if lto-plugin-no-bootstrap
>  all-host: maybe-all-lto-plugin
>  @endif lto-plugin-no-bootstrap
> -@if libcc1-no-bootstrap
>  all-host: maybe-all-libcc1
> -@endif libcc1-no-bootstrap
>
>  .PHONY: all-target
>
> @@ -32264,6 +32262,7 @@ configure-libcc1: stage_current
>  @if libcc1
>  maybe-configure-libcc1: configure-libcc1
>  configure-libcc1:
> +       @: $(MAKE); $(unstage)
>         @r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
>         test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> @@ -32287,211 +32286,6 @@ configure-libcc1:
>
>
>
> -.PHONY: configure-stage1-libcc1 maybe-configure-stage1-libcc1
> -maybe-configure-stage1-libcc1:
> -@if libcc1-bootstrap
> -maybe-configure-stage1-libcc1: configure-stage1-libcc1
> -configure-stage1-libcc1:
> -       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
> -       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE1_TFLAGS)"; \
> -       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> -       $(HOST_EXPORTS) \
> -       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
> -       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
> -       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
> -       echo Configuring stage 1 in $(HOST_SUBDIR)/libcc1 ; \
> -       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
> -       cd $(HOST_SUBDIR)/libcc1 || exit 1; \
> -       case $(srcdir) in \
> -         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
> -         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
> -               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
> -       esac; \
> -       module_srcdir=libcc1; \
> -       $(SHELL) $$s/$$module_srcdir/configure \
> -         --srcdir=$${topdir}/$$module_srcdir \
> -         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
> -         --target=${target_alias} \
> -          \
> -         $(STAGE1_CONFIGURE_FLAGS) \
> -         --enable-shared
> -@endif libcc1-bootstrap
> -
> -.PHONY: configure-stage2-libcc1 maybe-configure-stage2-libcc1
> -maybe-configure-stage2-libcc1:
> -@if libcc1-bootstrap
> -maybe-configure-stage2-libcc1: configure-stage2-libcc1
> -configure-stage2-libcc1:
> -       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
> -       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE2_TFLAGS)"; \
> -       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS) \
> -       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
> -       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
> -       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
> -       echo Configuring stage 2 in $(HOST_SUBDIR)/libcc1 ; \
> -       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
> -       cd $(HOST_SUBDIR)/libcc1 || exit 1; \
> -       case $(srcdir) in \
> -         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
> -         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
> -               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
> -       esac; \
> -       module_srcdir=libcc1; \
> -       $(SHELL) $$s/$$module_srcdir/configure \
> -         --srcdir=$${topdir}/$$module_srcdir \
> -         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
> -         --target=${target_alias} \
> -          --with-build-libsubdir=$(HOST_SUBDIR)  \
> -         $(STAGE2_CONFIGURE_FLAGS) \
> -         --enable-shared
> -@endif libcc1-bootstrap
> -
> -.PHONY: configure-stage3-libcc1 maybe-configure-stage3-libcc1
> -maybe-configure-stage3-libcc1:
> -@if libcc1-bootstrap
> -maybe-configure-stage3-libcc1: configure-stage3-libcc1
> -configure-stage3-libcc1:
> -       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
> -       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE3_TFLAGS)"; \
> -       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS) \
> -       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
> -       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
> -       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
> -       echo Configuring stage 3 in $(HOST_SUBDIR)/libcc1 ; \
> -       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
> -       cd $(HOST_SUBDIR)/libcc1 || exit 1; \
> -       case $(srcdir) in \
> -         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
> -         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
> -               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
> -       esac; \
> -       module_srcdir=libcc1; \
> -       $(SHELL) $$s/$$module_srcdir/configure \
> -         --srcdir=$${topdir}/$$module_srcdir \
> -         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
> -         --target=${target_alias} \
> -          --with-build-libsubdir=$(HOST_SUBDIR)  \
> -         $(STAGE3_CONFIGURE_FLAGS) \
> -         --enable-shared
> -@endif libcc1-bootstrap
> -
> -.PHONY: configure-stage4-libcc1 maybe-configure-stage4-libcc1
> -maybe-configure-stage4-libcc1:
> -@if libcc1-bootstrap
> -maybe-configure-stage4-libcc1: configure-stage4-libcc1
> -configure-stage4-libcc1:
> -       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
> -       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE4_TFLAGS)"; \
> -       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS) \
> -       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
> -       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
> -       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
> -       echo Configuring stage 4 in $(HOST_SUBDIR)/libcc1 ; \
> -       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
> -       cd $(HOST_SUBDIR)/libcc1 || exit 1; \
> -       case $(srcdir) in \
> -         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
> -         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
> -               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
> -       esac; \
> -       module_srcdir=libcc1; \
> -       $(SHELL) $$s/$$module_srcdir/configure \
> -         --srcdir=$${topdir}/$$module_srcdir \
> -         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
> -         --target=${target_alias} \
> -          --with-build-libsubdir=$(HOST_SUBDIR)  \
> -         $(STAGE4_CONFIGURE_FLAGS) \
> -         --enable-shared
> -@endif libcc1-bootstrap
> -
> -.PHONY: configure-stageprofile-libcc1 maybe-configure-stageprofile-libcc1
> -maybe-configure-stageprofile-libcc1:
> -@if libcc1-bootstrap
> -maybe-configure-stageprofile-libcc1: configure-stageprofile-libcc1
> -configure-stageprofile-libcc1:
> -       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
> -       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGEprofile_TFLAGS)"; \
> -       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS) \
> -       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
> -       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
> -       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
> -       echo Configuring stage profile in $(HOST_SUBDIR)/libcc1 ; \
> -       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
> -       cd $(HOST_SUBDIR)/libcc1 || exit 1; \
> -       case $(srcdir) in \
> -         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
> -         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
> -               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
> -       esac; \
> -       module_srcdir=libcc1; \
> -       $(SHELL) $$s/$$module_srcdir/configure \
> -         --srcdir=$${topdir}/$$module_srcdir \
> -         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
> -         --target=${target_alias} \
> -          --with-build-libsubdir=$(HOST_SUBDIR)  \
> -         $(STAGEprofile_CONFIGURE_FLAGS) \
> -         --enable-shared
> -@endif libcc1-bootstrap
> -
> -.PHONY: configure-stagefeedback-libcc1 maybe-configure-stagefeedback-libcc1
> -maybe-configure-stagefeedback-libcc1:
> -@if libcc1-bootstrap
> -maybe-configure-stagefeedback-libcc1: configure-stagefeedback-libcc1
> -configure-stagefeedback-libcc1:
> -       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
> -       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
> -       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS) \
> -       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
> -       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
> -       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
> -       echo Configuring stage feedback in $(HOST_SUBDIR)/libcc1 ; \
> -       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
> -       cd $(HOST_SUBDIR)/libcc1 || exit 1; \
> -       case $(srcdir) in \
> -         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
> -         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
> -               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
> -       esac; \
> -       module_srcdir=libcc1; \
> -       $(SHELL) $$s/$$module_srcdir/configure \
> -         --srcdir=$${topdir}/$$module_srcdir \
> -         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
> -         --target=${target_alias} \
> -          --with-build-libsubdir=$(HOST_SUBDIR)  \
> -         $(STAGEfeedback_CONFIGURE_FLAGS) \
> -         --enable-shared
> -@endif libcc1-bootstrap
> -
> -
> -
>
>
>  .PHONY: all-libcc1 maybe-all-libcc1
> @@ -32503,6 +32297,7 @@ all-libcc1: stage_current
>  TARGET-libcc1=all
>  maybe-all-libcc1: all-libcc1
>  all-libcc1: configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
>         $(HOST_EXPORTS)  \
> @@ -32513,255 +32308,6 @@ all-libcc1: configure-libcc1
>
>
>
> -.PHONY: all-stage1-libcc1 maybe-all-stage1-libcc1
> -.PHONY: clean-stage1-libcc1 maybe-clean-stage1-libcc1
> -maybe-all-stage1-libcc1:
> -maybe-clean-stage1-libcc1:
> -@if libcc1-bootstrap
> -maybe-all-stage1-libcc1: all-stage1-libcc1
> -all-stage1: all-stage1-libcc1
> -TARGET-stage1-libcc1 = $(TARGET-libcc1)
> -all-stage1-libcc1: configure-stage1-libcc1
> -       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE1_TFLAGS)"; \
> -       $(HOST_EXPORTS)  \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(BASE_FLAGS_TO_PASS) \
> -               CFLAGS="$(STAGE1_CFLAGS)" \
> -               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
> -               LIBCFLAGS="$(LIBCFLAGS)" \
> -               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
> -               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
> -               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
> -               $(EXTRA_HOST_FLAGS)  \
> -               $(STAGE1_FLAGS_TO_PASS)  \
> -               TFLAGS="$(STAGE1_TFLAGS)" \
> -               $(TARGET-stage1-libcc1)
> -
> -maybe-clean-stage1-libcc1: clean-stage1-libcc1
> -clean-stage1: clean-stage1-libcc1
> -clean-stage1-libcc1:
> -       @if [ $(current_stage) = stage1 ]; then \
> -         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
> -       else \
> -         [ -f $(HOST_SUBDIR)/stage1-libcc1/Makefile ] || exit 0; \
> -         $(MAKE) stage1-start; \
> -       fi; \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(EXTRA_HOST_FLAGS)  \
> -       $(STAGE1_FLAGS_TO_PASS)  clean
> -@endif libcc1-bootstrap
> -
> -
> -.PHONY: all-stage2-libcc1 maybe-all-stage2-libcc1
> -.PHONY: clean-stage2-libcc1 maybe-clean-stage2-libcc1
> -maybe-all-stage2-libcc1:
> -maybe-clean-stage2-libcc1:
> -@if libcc1-bootstrap
> -maybe-all-stage2-libcc1: all-stage2-libcc1
> -all-stage2: all-stage2-libcc1
> -TARGET-stage2-libcc1 = $(TARGET-libcc1)
> -all-stage2-libcc1: configure-stage2-libcc1
> -       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE2_TFLAGS)"; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS)  \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(BASE_FLAGS_TO_PASS) \
> -               CFLAGS="$(STAGE2_CFLAGS)" \
> -               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
> -               LIBCFLAGS="$(STAGE2_CFLAGS)" \
> -               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
> -               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
> -               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
> -               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
> -               TFLAGS="$(STAGE2_TFLAGS)" \
> -               $(TARGET-stage2-libcc1)
> -
> -maybe-clean-stage2-libcc1: clean-stage2-libcc1
> -clean-stage2: clean-stage2-libcc1
> -clean-stage2-libcc1:
> -       @if [ $(current_stage) = stage2 ]; then \
> -         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
> -       else \
> -         [ -f $(HOST_SUBDIR)/stage2-libcc1/Makefile ] || exit 0; \
> -         $(MAKE) stage2-start; \
> -       fi; \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
> -@endif libcc1-bootstrap
> -
> -
> -.PHONY: all-stage3-libcc1 maybe-all-stage3-libcc1
> -.PHONY: clean-stage3-libcc1 maybe-clean-stage3-libcc1
> -maybe-all-stage3-libcc1:
> -maybe-clean-stage3-libcc1:
> -@if libcc1-bootstrap
> -maybe-all-stage3-libcc1: all-stage3-libcc1
> -all-stage3: all-stage3-libcc1
> -TARGET-stage3-libcc1 = $(TARGET-libcc1)
> -all-stage3-libcc1: configure-stage3-libcc1
> -       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE3_TFLAGS)"; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS)  \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(BASE_FLAGS_TO_PASS) \
> -               CFLAGS="$(STAGE3_CFLAGS)" \
> -               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
> -               LIBCFLAGS="$(STAGE3_CFLAGS)" \
> -               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
> -               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
> -               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
> -               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
> -               TFLAGS="$(STAGE3_TFLAGS)" \
> -               $(TARGET-stage3-libcc1)
> -
> -maybe-clean-stage3-libcc1: clean-stage3-libcc1
> -clean-stage3: clean-stage3-libcc1
> -clean-stage3-libcc1:
> -       @if [ $(current_stage) = stage3 ]; then \
> -         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
> -       else \
> -         [ -f $(HOST_SUBDIR)/stage3-libcc1/Makefile ] || exit 0; \
> -         $(MAKE) stage3-start; \
> -       fi; \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
> -@endif libcc1-bootstrap
> -
> -
> -.PHONY: all-stage4-libcc1 maybe-all-stage4-libcc1
> -.PHONY: clean-stage4-libcc1 maybe-clean-stage4-libcc1
> -maybe-all-stage4-libcc1:
> -maybe-clean-stage4-libcc1:
> -@if libcc1-bootstrap
> -maybe-all-stage4-libcc1: all-stage4-libcc1
> -all-stage4: all-stage4-libcc1
> -TARGET-stage4-libcc1 = $(TARGET-libcc1)
> -all-stage4-libcc1: configure-stage4-libcc1
> -       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGE4_TFLAGS)"; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS)  \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(BASE_FLAGS_TO_PASS) \
> -               CFLAGS="$(STAGE4_CFLAGS)" \
> -               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
> -               LIBCFLAGS="$(STAGE4_CFLAGS)" \
> -               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
> -               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
> -               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
> -               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
> -               TFLAGS="$(STAGE4_TFLAGS)" \
> -               $(TARGET-stage4-libcc1)
> -
> -maybe-clean-stage4-libcc1: clean-stage4-libcc1
> -clean-stage4: clean-stage4-libcc1
> -clean-stage4-libcc1:
> -       @if [ $(current_stage) = stage4 ]; then \
> -         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
> -       else \
> -         [ -f $(HOST_SUBDIR)/stage4-libcc1/Makefile ] || exit 0; \
> -         $(MAKE) stage4-start; \
> -       fi; \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
> -@endif libcc1-bootstrap
> -
> -
> -.PHONY: all-stageprofile-libcc1 maybe-all-stageprofile-libcc1
> -.PHONY: clean-stageprofile-libcc1 maybe-clean-stageprofile-libcc1
> -maybe-all-stageprofile-libcc1:
> -maybe-clean-stageprofile-libcc1:
> -@if libcc1-bootstrap
> -maybe-all-stageprofile-libcc1: all-stageprofile-libcc1
> -all-stageprofile: all-stageprofile-libcc1
> -TARGET-stageprofile-libcc1 = $(TARGET-libcc1)
> -all-stageprofile-libcc1: configure-stageprofile-libcc1
> -       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGEprofile_TFLAGS)"; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS)  \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(BASE_FLAGS_TO_PASS) \
> -               CFLAGS="$(STAGEprofile_CFLAGS)" \
> -               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
> -               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
> -               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
> -               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
> -               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
> -               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
> -               TFLAGS="$(STAGEprofile_TFLAGS)" \
> -               $(TARGET-stageprofile-libcc1)
> -
> -maybe-clean-stageprofile-libcc1: clean-stageprofile-libcc1
> -clean-stageprofile: clean-stageprofile-libcc1
> -clean-stageprofile-libcc1:
> -       @if [ $(current_stage) = stageprofile ]; then \
> -         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
> -       else \
> -         [ -f $(HOST_SUBDIR)/stageprofile-libcc1/Makefile ] || exit 0; \
> -         $(MAKE) stageprofile-start; \
> -       fi; \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
> -@endif libcc1-bootstrap
> -
> -
> -.PHONY: all-stagefeedback-libcc1 maybe-all-stagefeedback-libcc1
> -.PHONY: clean-stagefeedback-libcc1 maybe-clean-stagefeedback-libcc1
> -maybe-all-stagefeedback-libcc1:
> -maybe-clean-stagefeedback-libcc1:
> -@if libcc1-bootstrap
> -maybe-all-stagefeedback-libcc1: all-stagefeedback-libcc1
> -all-stagefeedback: all-stagefeedback-libcc1
> -TARGET-stagefeedback-libcc1 = $(TARGET-libcc1)
> -all-stagefeedback-libcc1: configure-stagefeedback-libcc1
> -       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
> -       @r=`${PWD_COMMAND}`; export r; \
> -       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> -       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
> -       $(HOST_EXPORTS) \
> -       $(POSTSTAGE1_HOST_EXPORTS)  \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(BASE_FLAGS_TO_PASS) \
> -               CFLAGS="$(STAGEfeedback_CFLAGS)" \
> -               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
> -               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
> -               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
> -               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
> -               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
> -               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
> -               TFLAGS="$(STAGEfeedback_TFLAGS)" \
> -               $(TARGET-stagefeedback-libcc1)
> -
> -maybe-clean-stagefeedback-libcc1: clean-stagefeedback-libcc1
> -clean-stagefeedback: clean-stagefeedback-libcc1
> -clean-stagefeedback-libcc1:
> -       @if [ $(current_stage) = stagefeedback ]; then \
> -         [ -f $(HOST_SUBDIR)/libcc1/Makefile ] || exit 0; \
> -       else \
> -         [ -f $(HOST_SUBDIR)/stagefeedback-libcc1/Makefile ] || exit 0; \
> -         $(MAKE) stagefeedback-start; \
> -       fi; \
> -       cd $(HOST_SUBDIR)/libcc1 && \
> -       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
> -@endif libcc1-bootstrap
> -
> -
> -
> -
>
>  .PHONY: check-libcc1 maybe-check-libcc1
>  maybe-check-libcc1:
> @@ -32817,6 +32363,7 @@ maybe-info-libcc1: info-libcc1
>
>  info-libcc1: \
>      configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32842,6 +32389,7 @@ maybe-dvi-libcc1: dvi-libcc1
>
>  dvi-libcc1: \
>      configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32867,6 +32415,7 @@ maybe-pdf-libcc1: pdf-libcc1
>
>  pdf-libcc1: \
>      configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32892,6 +32441,7 @@ maybe-html-libcc1: html-libcc1
>
>  html-libcc1: \
>      configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32917,6 +32467,7 @@ maybe-TAGS-libcc1: TAGS-libcc1
>
>  TAGS-libcc1: \
>      configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32943,6 +32494,7 @@ maybe-install-info-libcc1: install-info-
>  install-info-libcc1: \
>      configure-libcc1 \
>      info-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32969,6 +32521,7 @@ maybe-install-pdf-libcc1: install-pdf-li
>  install-pdf-libcc1: \
>      configure-libcc1 \
>      pdf-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -32995,6 +32548,7 @@ maybe-install-html-libcc1: install-html-
>  install-html-libcc1: \
>      configure-libcc1 \
>      html-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -33020,6 +32574,7 @@ maybe-installcheck-libcc1: installcheck-
>
>  installcheck-libcc1: \
>      configure-libcc1
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -33044,6 +32599,7 @@ maybe-mostlyclean-libcc1:
>  maybe-mostlyclean-libcc1: mostlyclean-libcc1
>
>  mostlyclean-libcc1:
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -33068,6 +32624,7 @@ maybe-clean-libcc1:
>  maybe-clean-libcc1: clean-libcc1
>
>  clean-libcc1:
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -33092,6 +32649,7 @@ maybe-distclean-libcc1:
>  maybe-distclean-libcc1: distclean-libcc1
>
>  distclean-libcc1:
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -33116,6 +32674,7 @@ maybe-maintainer-clean-libcc1:
>  maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
>
>  maintainer-clean-libcc1:
> +       @: $(MAKE); $(unstage)
>         @[ -f ./libcc1/Makefile ] || exit 0; \
>         r=`${PWD_COMMAND}`; export r; \
>         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
> @@ -46918,11 +46477,6 @@ stage1-start::
>           mkdir stage1-lto-plugin; \
>         mv stage1-lto-plugin lto-plugin
>  @endif lto-plugin
> -@if libcc1
> -       @cd $(HOST_SUBDIR); [ -d stage1-libcc1 ] || \
> -         mkdir stage1-libcc1; \
> -       mv stage1-libcc1 libcc1
> -@endif libcc1
>         @[ -d stage1-$(TARGET_SUBDIR) ] || \
>           mkdir stage1-$(TARGET_SUBDIR); \
>         mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR)
> @@ -47038,11 +46592,6 @@ stage1-end::
>           cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin  ; \
>         fi
>  @endif lto-plugin
> -@if libcc1
> -       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
> -         cd $(HOST_SUBDIR); mv libcc1 stage1-libcc1  ; \
> -       fi
> -@endif libcc1
>         @if test -d $(TARGET_SUBDIR) ; then \
>           mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
>         fi
> @@ -47223,12 +46772,6 @@ stage2-start::
>         mv stage2-lto-plugin lto-plugin  ; \
>         mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean
>  @endif lto-plugin
> -@if libcc1
> -       @cd $(HOST_SUBDIR); [ -d stage2-libcc1 ] || \
> -         mkdir stage2-libcc1; \
> -       mv stage2-libcc1 libcc1  ; \
> -       mv stage1-libcc1 prev-libcc1 || test -f stage1-lean
> -@endif libcc1
>         @[ -d stage2-$(TARGET_SUBDIR) ] || \
>           mkdir stage2-$(TARGET_SUBDIR); \
>         mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
> @@ -47367,12 +46910,6 @@ stage2-end::
>           mv prev-lto-plugin stage1-lto-plugin ; :  ; \
>         fi
>  @endif lto-plugin
> -@if libcc1
> -       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
> -         cd $(HOST_SUBDIR); mv libcc1 stage2-libcc1 ; \
> -         mv prev-libcc1 stage1-libcc1 ; :  ; \
> -       fi
> -@endif libcc1
>         @if test -d $(TARGET_SUBDIR) ; then \
>           mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
>           mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
> @@ -47577,12 +47114,6 @@ stage3-start::
>         mv stage3-lto-plugin lto-plugin  ; \
>         mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean
>  @endif lto-plugin
> -@if libcc1
> -       @cd $(HOST_SUBDIR); [ -d stage3-libcc1 ] || \
> -         mkdir stage3-libcc1; \
> -       mv stage3-libcc1 libcc1  ; \
> -       mv stage2-libcc1 prev-libcc1 || test -f stage2-lean
> -@endif libcc1
>         @[ -d stage3-$(TARGET_SUBDIR) ] || \
>           mkdir stage3-$(TARGET_SUBDIR); \
>         mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
> @@ -47721,12 +47252,6 @@ stage3-end::
>           mv prev-lto-plugin stage2-lto-plugin ; :  ; \
>         fi
>  @endif lto-plugin
> -@if libcc1
> -       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
> -         cd $(HOST_SUBDIR); mv libcc1 stage3-libcc1 ; \
> -         mv prev-libcc1 stage2-libcc1 ; :  ; \
> -       fi
> -@endif libcc1
>         @if test -d $(TARGET_SUBDIR) ; then \
>           mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
>           mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
> @@ -47987,12 +47512,6 @@ stage4-start::
>         mv stage4-lto-plugin lto-plugin  ; \
>         mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean
>  @endif lto-plugin
> -@if libcc1
> -       @cd $(HOST_SUBDIR); [ -d stage4-libcc1 ] || \
> -         mkdir stage4-libcc1; \
> -       mv stage4-libcc1 libcc1  ; \
> -       mv stage3-libcc1 prev-libcc1 || test -f stage3-lean
> -@endif libcc1
>         @[ -d stage4-$(TARGET_SUBDIR) ] || \
>           mkdir stage4-$(TARGET_SUBDIR); \
>         mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
> @@ -48131,12 +47650,6 @@ stage4-end::
>           mv prev-lto-plugin stage3-lto-plugin ; :  ; \
>         fi
>  @endif lto-plugin
> -@if libcc1
> -       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
> -         cd $(HOST_SUBDIR); mv libcc1 stage4-libcc1 ; \
> -         mv prev-libcc1 stage3-libcc1 ; :  ; \
> -       fi
> -@endif libcc1
>         @if test -d $(TARGET_SUBDIR) ; then \
>           mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
>           mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
> @@ -48385,12 +47898,6 @@ stageprofile-start::
>         mv stageprofile-lto-plugin lto-plugin  ; \
>         mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean
>  @endif lto-plugin
> -@if libcc1
> -       @cd $(HOST_SUBDIR); [ -d stageprofile-libcc1 ] || \
> -         mkdir stageprofile-libcc1; \
> -       mv stageprofile-libcc1 libcc1  ; \
> -       mv stage1-libcc1 prev-libcc1 || test -f stage1-lean
> -@endif libcc1
>         @[ -d stageprofile-$(TARGET_SUBDIR) ] || \
>           mkdir stageprofile-$(TARGET_SUBDIR); \
>         mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
> @@ -48529,12 +48036,6 @@ stageprofile-end::
>           mv prev-lto-plugin stage1-lto-plugin ; :  ; \
>         fi
>  @endif lto-plugin
> -@if libcc1
> -       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
> -         cd $(HOST_SUBDIR); mv libcc1 stageprofile-libcc1 ; \
> -         mv prev-libcc1 stage1-libcc1 ; :  ; \
> -       fi
> -@endif libcc1
>         @if test -d $(TARGET_SUBDIR) ; then \
>           mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
>           mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
> @@ -48716,12 +48217,6 @@ stagefeedback-start::
>         mv stagefeedback-lto-plugin lto-plugin  ; \
>         mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean
>  @endif lto-plugin
> -@if libcc1
> -       @cd $(HOST_SUBDIR); [ -d stagefeedback-libcc1 ] || \
> -         mkdir stagefeedback-libcc1; \
> -       mv stagefeedback-libcc1 libcc1  ; \
> -       mv stageprofile-libcc1 prev-libcc1 || test -f stageprofile-lean
> -@endif libcc1
>         @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
>           mkdir stagefeedback-$(TARGET_SUBDIR); \
>         mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
> @@ -48860,12 +48355,6 @@ stagefeedback-end::
>           mv prev-lto-plugin stageprofile-lto-plugin ; :  ; \
>         fi
>  @endif lto-plugin
> -@if libcc1
> -       @if test -d $(HOST_SUBDIR)/libcc1 ; then \
> -         cd $(HOST_SUBDIR); mv libcc1 stagefeedback-libcc1 ; \
> -         mv prev-libcc1 stageprofile-libcc1 ; :  ; \
> -       fi
> -@endif libcc1
>         @if test -d $(TARGET_SUBDIR) ; then \
>           mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
>           mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
> @@ -49380,21 +48869,7 @@ all-stage4-lto-plugin: maybe-all-stage4-
>  all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
>  all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
>  configure-libcc1: maybe-configure-gcc
> -
> -configure-stage1-libcc1: maybe-configure-stage1-gcc
> -configure-stage2-libcc1: maybe-configure-stage2-gcc
> -configure-stage3-libcc1: maybe-configure-stage3-gcc
> -configure-stage4-libcc1: maybe-configure-stage4-gcc
> -configure-stageprofile-libcc1: maybe-configure-stageprofile-gcc
> -configure-stagefeedback-libcc1: maybe-configure-stagefeedback-gcc
>  all-libcc1: maybe-all-gcc
> -
> -all-stage1-libcc1: maybe-all-stage1-gcc
> -all-stage2-libcc1: maybe-all-stage2-gcc
> -all-stage3-libcc1: maybe-all-stage3-gcc
> -all-stage4-libcc1: maybe-all-stage4-gcc
> -all-stageprofile-libcc1: maybe-all-stageprofile-gcc
> -all-stagefeedback-libcc1: maybe-all-stagefeedback-gcc
>  all-utils: maybe-all-libiberty
>  configure-mpfr: maybe-all-gmp
>
>
>
>         Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 22:08               ` Jack Howarth
@ 2014-11-09 12:58                 ` Iain Sandoe
  0 siblings, 0 replies; 25+ messages in thread
From: Iain Sandoe @ 2014-11-09 12:58 UTC (permalink / raw)
  To: Jack Howarth
  Cc: Dominique d'Humières, Jakub Jelinek, gcc-patches,
	bonzini, pmuldoon

Jack, Dominique,

I think we have two issues here - let's make sure we don't derail dealing with the first one.

On 8 Nov 2014, at 22:08, Jack Howarth wrote:

>    That is curious. I wouldn't have thought that the compiler
> selection would have had such a radical effect on the linkage flags
> emitted for the build directories.
>              Jack
> 
> 
> On Sat, Nov 8, 2014 at 4:59 PM, Dominique d'Humières <dominiq@lps.ens.fr> wrote:
>> 
>>> Le 8 nov. 2014 à 22:55, Jack Howarth <howarth.at.gcc@gmail.com> a écrit :
>>> 
>>> Iain,
>>>    Any idea why this isn't failing universally? On all of the
>>> machines tested here with 'make bootstrap', the linkage of libcc1.so
>>> finds
>>> the necessary libstdc++ from the set of flags...
>>> 
>>> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src
>>> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src/.libs
>>> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/libsupc++/.libs
>>> 
>>> as I posted earlier in this thread. Why wouldn't Dominique be getting
>>> those emitted in his build and shouldn't they suffice?
>>>         Jack
>> 
>> Because you bootstrap with clang (I confirm it) while I am bootstrapping with gcc 4.9 for Ada.

We all agree that it's not obvious that the bootstrap compiler should make any difference to this.

Looking at the logs for my trunk build from last night:
 * x86_64-darwin12
 * bootstrap compiler = gcc-4.9
 * trunk checkout 217252
 * with alias fix for ipa-icf
 * with a temporary mod to put -B options for libstdc++ and libsupc++ for libcc1.
 * all langs including objc++, java and Ada.

- The [libcc1] config is using the stage#3 compiler (according to libcc1/config.log)
- The [libcc1] build is using the stage#3 compiler as far as my build logs record.
- my stage3 gcc/auto-host.h does not differ in any material way from the stage1-gcc/suto-host.h

So I think we need to do some analysis; in particular, the config and build logs for libcc1 when clang is the bootstrap compiler.  Let's take this off-list and raise a PR if we find a separate problem.

====

As for the initial reported problem here, my analysis remains the same - we need to provide "-B" options for the libraries that are mentioned, so that spec substitutution works.

Iain

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 21:59             ` Dominique d'Humières
@ 2014-11-08 22:08               ` Jack Howarth
  2014-11-09 12:58                 ` Iain Sandoe
  0 siblings, 1 reply; 25+ messages in thread
From: Jack Howarth @ 2014-11-08 22:08 UTC (permalink / raw)
  To: Dominique d'Humières
  Cc: Iain Sandoe, Jakub Jelinek, gcc-patches, bonzini, pmuldoon

Dominique,
    That is curious. I wouldn't have thought that the compiler
selection would have had such a radical effect on the linkage flags
emitted for the build directories.
              Jack


On Sat, Nov 8, 2014 at 4:59 PM, Dominique d'Humières <dominiq@lps.ens.fr> wrote:
>
>> Le 8 nov. 2014 à 22:55, Jack Howarth <howarth.at.gcc@gmail.com> a écrit :
>>
>> Iain,
>>     Any idea why this isn't failing universally? On all of the
>> machines tested here with 'make bootstrap', the linkage of libcc1.so
>> finds
>> the necessary libstdc++ from the set of flags...
>>
>> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src
>> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src/.libs
>> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/libsupc++/.libs
>>
>> as I posted earlier in this thread. Why wouldn't Dominique be getting
>> those emitted in his build and shouldn't they suffice?
>>          Jack
>
> Because you bootstrap with clang (I confirm it) while I am bootstrapping with gcc 4.9 for Ada.
>
> Dominique
>
>

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 21:55           ` Jack Howarth
@ 2014-11-08 21:59             ` Dominique d'Humières
  2014-11-08 22:08               ` Jack Howarth
  0 siblings, 1 reply; 25+ messages in thread
From: Dominique d'Humières @ 2014-11-08 21:59 UTC (permalink / raw)
  To: Jack Howarth; +Cc: Iain Sandoe, Jakub Jelinek, gcc-patches, bonzini, pmuldoon


> Le 8 nov. 2014 à 22:55, Jack Howarth <howarth.at.gcc@gmail.com> a écrit :
> 
> Iain,
>     Any idea why this isn't failing universally? On all of the
> machines tested here with 'make bootstrap', the linkage of libcc1.so
> finds
> the necessary libstdc++ from the set of flags...
> 
> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src
> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src/.libs
> -L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/libsupc++/.libs
> 
> as I posted earlier in this thread. Why wouldn't Dominique be getting
> those emitted in his build and shouldn't they suffice?
>          Jack

Because you bootstrap with clang (I confirm it) while I am bootstrapping with gcc 4.9 for Ada.

Dominique


^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 21:03         ` Iain Sandoe
@ 2014-11-08 21:55           ` Jack Howarth
  2014-11-08 21:59             ` Dominique d'Humières
  0 siblings, 1 reply; 25+ messages in thread
From: Jack Howarth @ 2014-11-08 21:55 UTC (permalink / raw)
  To: Iain Sandoe
  Cc: Jakub Jelinek, Dominique d'Humières, gcc-patches,
	bonzini, pmuldoon

Iain,
     Any idea why this isn't failing universally? On all of the
machines tested here with 'make bootstrap', the linkage of libcc1.so
finds
the necessary libstdc++ from the set of flags...

-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src/.libs
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/libsupc++/.libs

as I posted earlier in this thread. Why wouldn't Dominique be getting
those emitted in his build and shouldn't they suffice?
          Jack

On Sat, Nov 8, 2014 at 4:03 PM, Iain Sandoe <iain@codesourcery.com> wrote:
>
> On 8 Nov 2014, at 15:41, Jakub Jelinek wrote:
>
>> On Sat, Nov 08, 2014 at 04:31:28PM +0100, Dominique d'Humières wrote:
>>> I am still unable to bootstrap darwin14 without revision r216964 reverted. Executing the simplified command
>>>
>>> /opt/gcc/build_w/gcc/xg++ -B/opt/gcc/build_w/gcc/ -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -o .libs/libcc1.0.so .libs/findcomp.o -static-libstdc++ -static-libgcc
>>>
>>> I get
>>>
>>> ld: file not found: libstdc++.a
>>> collect2: error: ld returned 1 exit status
>>>
>>> while I see
>>>
>>> [Book15] build_w/libcc1% ls -l /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
>>> -rw-r--r--  1 dominiq  staff  9118792 Nov  8 15:30 /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
>>>
>>>
>>> What am I missing?
>>
>> That is for somebody familiar with all the Mach-O weirdnesses to look at,
>> I don't see anything wrong with the above g++ invocation.
>> Rerun with -v to see how ld is invoked, strace (if Darwin has anything like
>> that) it to see why it doesn't find that libstdc++.a ?
>
> This is not really mach-o related, but a consequence of the way in which GCC specs substitution works.
>
> Unless the libstdc++-v3/.libs and libsupc++/.libs are visible as -Bxxxxx, spec substitution will not work (it's not enough to provide -L).
>
> This is done elsewhere (e.g. gnattools), it just needs an appropriate addition to the libcc1/Makefile.in
>
> (will try and take a look later in the week, if no-one else gets to it first).
>
> Iain
>

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 15:41       ` Jakub Jelinek
@ 2014-11-08 21:03         ` Iain Sandoe
  2014-11-08 21:55           ` Jack Howarth
  0 siblings, 1 reply; 25+ messages in thread
From: Iain Sandoe @ 2014-11-08 21:03 UTC (permalink / raw)
  To: Jakub Jelinek
  Cc: "Dominique d'Humières", gcc-patches, bonzini, pmuldoon


On 8 Nov 2014, at 15:41, Jakub Jelinek wrote:

> On Sat, Nov 08, 2014 at 04:31:28PM +0100, Dominique d'Humières wrote:
>> I am still unable to bootstrap darwin14 without revision r216964 reverted. Executing the simplified command
>> 
>> /opt/gcc/build_w/gcc/xg++ -B/opt/gcc/build_w/gcc/ -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -o .libs/libcc1.0.so .libs/findcomp.o -static-libstdc++ -static-libgcc
>> 
>> I get
>> 
>> ld: file not found: libstdc++.a
>> collect2: error: ld returned 1 exit status
>> 
>> while I see
>> 
>> [Book15] build_w/libcc1% ls -l /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
>> -rw-r--r--  1 dominiq  staff  9118792 Nov  8 15:30 /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
>> 
>> 
>> What am I missing?
> 
> That is for somebody familiar with all the Mach-O weirdnesses to look at,
> I don't see anything wrong with the above g++ invocation.
> Rerun with -v to see how ld is invoked, strace (if Darwin has anything like
> that) it to see why it doesn't find that libstdc++.a ?

This is not really mach-o related, but a consequence of the way in which GCC specs substitution works.

Unless the libstdc++-v3/.libs and libsupc++/.libs are visible as -Bxxxxx, spec substitution will not work (it's not enough to provide -L).

This is done elsewhere (e.g. gnattools), it just needs an appropriate addition to the libcc1/Makefile.in

(will try and take a look later in the week, if no-one else gets to it first).

Iain
 

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 15:31     ` Dominique d'Humières
  2014-11-08 15:41       ` Jakub Jelinek
@ 2014-11-08 16:20       ` Jack Howarth
  1 sibling, 0 replies; 25+ messages in thread
From: Jack Howarth @ 2014-11-08 16:20 UTC (permalink / raw)
  To: Dominique d'Humières
  Cc: Jakub Jelinek, gcc-patches, bonzini, pmuldoon, Iain Sandoe

Dominique,
      I thought from
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63773#c1 that you were
having clean bootstraps on darwin. I have tested
x86_64-apple-darwin11/12/13/14 without issues in the creation of
libcc1.0

% otool -L libcc1.0.so
libcc1.0.so:
/sw/lib/gcc5.0/lib/libstdc++.6.dylib (compatibility version 7.0.0,
current version 7.21.0)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current
version 1213.0.0)
/sw/lib/gcc5.0/lib/libgcc_s.1.dylib (compatibility version 1.0.0,
current version 1.0.0)

except for the oddity that one isn't being created in the -m32
multilib. Is this a hard bootstrap failure?
                  Jack
ps From build log I see...

libtool: link:
/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/./gcc/xg++
-B/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/./gcc/ -nostdinc++
-nostdinc++ -I/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/include/x86_64-apple-darwin13.4.0
-I/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/include
-I/sw/src/fink.build/gcc50-5.0.0-1000/gcc-5.0-20141107/libstdc++-v3/libsupc++
-I/sw/src/fink.build/gcc50-5.0.0-1000/gcc-5.0-20141107/libstdc++-v3/include/backward
-I/sw/src/fink.build/gcc50-5.0.0-1000/gcc-5.0-20141107/libstdc++-v3/testsuite/util
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src/.libs
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/libsupc++/.libs
-B/sw/lib/gcc5.0/x86_64-apple-darwin13.4.0/bin/
-B/sw/lib/gcc5.0/x86_64-apple-darwin13.4.0/lib/ -isystem
/sw/lib/gcc5.0/x86_64-apple-darwin13.4.0/include -isystem
/sw/lib/gcc5.0/x86_64-apple-darwin13.4.0/sys-include    -Wl,-undefined
-Wl,dynamic_lookup -o .libs/libcc1.0.so -bundle  .libs/findcomp.o
.libs/libcc1.o .libs/names.o .libs/callbacks.o .libs/connection.o
.libs/marshall.o
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/src/.libs
-L/sw/src/fink.build/gcc50-5.0.0-1000/darwin_objdir/x86_64-apple-darwin13.4.0/libstdc++-v3/libsupc++/.libs
 -Wl,-no_pie ../libiberty/pic/libiberty.a
-Wl,-exported_symbols_list,.libs/libcc1-symbols.expsym


On Sat, Nov 8, 2014 at 10:31 AM, Dominique d'Humières
<dominiq@lps.ens.fr> wrote:
> I am still unable to bootstrap darwin14 without revision r216964 reverted. Executing the simplified command
>
> /opt/gcc/build_w/gcc/xg++ -B/opt/gcc/build_w/gcc/ -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -o .libs/libcc1.0.so .libs/findcomp.o -static-libstdc++ -static-libgcc
>
> I get
>
> ld: file not found: libstdc++.a
> collect2: error: ld returned 1 exit status
>
> while I see
>
> [Book15] build_w/libcc1% ls -l /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
> -rw-r--r--  1 dominiq  staff  9118792 Nov  8 15:30 /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
>
>
> What am I missing?
>
> TIA
>
> Dominique
>

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-08 15:31     ` Dominique d'Humières
@ 2014-11-08 15:41       ` Jakub Jelinek
  2014-11-08 21:03         ` Iain Sandoe
  2014-11-08 16:20       ` Jack Howarth
  1 sibling, 1 reply; 25+ messages in thread
From: Jakub Jelinek @ 2014-11-08 15:41 UTC (permalink / raw)
  To: Dominique d'Humières; +Cc: gcc-patches, bonzini, pmuldoon, Iain Sandoe

On Sat, Nov 08, 2014 at 04:31:28PM +0100, Dominique d'Humières wrote:
> I am still unable to bootstrap darwin14 without revision r216964 reverted. Executing the simplified command
> 
> /opt/gcc/build_w/gcc/xg++ -B/opt/gcc/build_w/gcc/ -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -o .libs/libcc1.0.so .libs/findcomp.o -static-libstdc++ -static-libgcc
> 
> I get
> 
> ld: file not found: libstdc++.a
> collect2: error: ld returned 1 exit status
> 
> while I see
> 
> [Book15] build_w/libcc1% ls -l /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
> -rw-r--r--  1 dominiq  staff  9118792 Nov  8 15:30 /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
> 
> 
> What am I missing?

That is for somebody familiar with all the Mach-O weirdnesses to look at,
I don't see anything wrong with the above g++ invocation.
Rerun with -v to see how ld is invoked, strace (if Darwin has anything like
that) it to see why it doesn't find that libstdc++.a ?

	Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-01 18:13   ` Dominique d'Humières
@ 2014-11-08 15:31     ` Dominique d'Humières
  2014-11-08 15:41       ` Jakub Jelinek
  2014-11-08 16:20       ` Jack Howarth
  0 siblings, 2 replies; 25+ messages in thread
From: Dominique d'Humières @ 2014-11-08 15:31 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: gcc-patches, bonzini, pmuldoon, Iain Sandoe

I am still unable to bootstrap darwin14 without revision r216964 reverted. Executing the simplified command

/opt/gcc/build_w/gcc/xg++ -B/opt/gcc/build_w/gcc/ -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -o .libs/libcc1.0.so .libs/findcomp.o -static-libstdc++ -static-libgcc

I get

ld: file not found: libstdc++.a
collect2: error: ld returned 1 exit status

while I see

[Book15] build_w/libcc1% ls -l /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
-rw-r--r--  1 dominiq  staff  9118792 Nov  8 15:30 /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a


What am I missing?

TIA

Dominique

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-01  9:43 ` Jakub Jelinek
@ 2014-11-01 18:13   ` Dominique d'Humières
  2014-11-08 15:31     ` Dominique d'Humières
  0 siblings, 1 reply; 25+ messages in thread
From: Dominique d'Humières @ 2014-11-01 18:13 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: gcc-patches, bonzini, pmuldoon


> Le 1 nov. 2014 à 10:43, Jakub Jelinek <jakub@redhat.com> a écrit :
> 
> So you don't have libstdc++.a in
> /opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs ?
> 
> 	Jakub

Indeed I have it:

[Book15] gcc/build_w% lf -l x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a
-rw-r--r-- 1 dominiq staff 9114784 Nov  1 18:48 x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs/libstdc++.a

as well as for i386

[Book15] gcc/build_w% lf -l x86_64-apple-darwin14.0.0/i386/libstdc++-v3/src/.libs/libstdc++.a
-rw-r--r-- 1 dominiq staff 8184744 Nov  1 18:48 x86_64-apple-darwin14.0.0/i386/libstdc++-v3/src/.libs/libstdc++.a

The working link command (r216964 reverted) is

libtool: link:  /opt/gcc/build_w/./prev-gcc/xg++ -B/opt/gcc/build_w/./prev-gcc/ -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/bin/ -nostdinc++ -B/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -B/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs  -I/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/include/x86_64-apple-darwin14.0.0  -I/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/include  -I/opt/gcc/work/libstdc++-v3/libsupc++ -L/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs -Wl,-undefined -Wl,dynamic_lookup -o .libs/libcc1.0.so -bundle  .libs/findcomp.o .libs/libcc1.o .libs/names.o .libs/callbacks.o .libs/connection.o .libs/marshall.o   -L/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/prev-x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs  -static-libstdc++ -static-libgcc -Wl,-no_pie ../libiberty/pic/libiberty.a   -Wl,-exported_symbols_list,.libs/libcc1-symbols.expsym

compared to the failing one

libtool: link:  /opt/gcc/build_w/./gcc/xg++ -B/opt/gcc/build_w/./gcc/ -nostdinc++ -nostdinc++ -I/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/include/x86_64-apple-darwin14.0.0 -I/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/include -I/opt/gcc/work/libstdc++-v3/libsupc++ -I/opt/gcc/work/libstdc++-v3/include/backward -I/opt/gcc/work/libstdc++-v3/testsuite/util -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/bin/ -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/lib/ -isystem /opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/include -isystem /opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/sys-include    -Wl,-undefined -Wl,dynamic_lookup -o .libs/libcc1.0.so -bundle  .libs/findcomp.o .libs/libcc1.o .libs/names.o .libs/callbacks.o .libs/connection.o .libs/marshall.o   -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs  -static-libstdc++ -static-libgcc -Wl,-no_pie ../libiberty/pic/libiberty.a   -Wl,-exported_symbols_list,.libs/libcc1-symbols.expsym

Dominique

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH] Don't bootstrap libcc1
  2014-11-01  9:23 [PATCH] Don't bootstrap libcc1 Dominique Dhumieres
@ 2014-11-01  9:43 ` Jakub Jelinek
  2014-11-01 18:13   ` Dominique d'Humières
  0 siblings, 1 reply; 25+ messages in thread
From: Jakub Jelinek @ 2014-11-01  9:43 UTC (permalink / raw)
  To: Dominique Dhumieres; +Cc: gcc-patches, bonzini, pmuldoon

On Sat, Nov 01, 2014 at 10:23:24AM +0100, Dominique Dhumieres wrote:
> > Seems removing that makes the configure.ac change unneeded.
> > Bootstrapped/regtested on x86_64-linux and i686-linux (libcc1
> > is built after compare, by stage3 compiler), and built
> > with --disable-bootstrap on i686-linux (libcc1 is built by
> > the system compiler in that case).  Ok for trunk?
> >
> > 2014-10-31  Jakub Jelinek  <jakub@redhat.com>
> > ...
> 
> This (r216964) breaks bootstrap at stage3
> 
> libtool: link: sed -e 's,^,_,' < ../../work/libcc1/libcc1.sym > .libs/libcc1-symbols.expsym
> libtool: link:  /opt/gcc/build_w/./gcc/xg++ -B/opt/gcc/build_w/./gcc/ -nostdinc++ -nostdinc++ -I/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/include/x86_64-apple-darwin14.0.0 -I/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/include -I/opt/gcc/work/libstdc++-v3/libsupc++ -I/opt/gcc/work/libstdc++-v3/include/backward -I/opt/gcc/work/libstdc++-v3/testsuite/util -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/bin/ -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/lib/ -isystem /opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/include -isystem /opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/sys-include    -Wl,-undefined -Wl,dynamic_lookup -o .libs/libcc1.0.so -bundle  .libs/findcomp.o .libs/libcc1.o .libs/names.o .libs/callbacks.o .libs/connection.o .libs/marshall.o   -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs  -static-libstdc++ -static-libgcc -Wl,-no_pie ../libiberty/pic/libiberty.a   -Wl,-exported_symbols_list,.libs/libcc1-symbols.expsym
> ld: file not found: libstdc++.a
> collect2: error: ld returned 1 exit status
> make[3]: *** [libcc1.la] Error 1
> make[3]: Leaving directory `/opt/gcc/build_w/libcc1'
> make[2]: *** [all] Error 2
> make[2]: Leaving directory `/opt/gcc/build_w/libcc1'
> make[1]: *** [all-libcc1] Error 2
> make[1]: Leaving directory `/opt/gcc/build_w'
> make: *** [all] Error 2
> 
> Reverting r216964 allowed me to boostrap r216988 on x86_64-apple-darwin14.

So you don't have libstdc++.a in
/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs ?

	Jakub

^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH] Don't bootstrap libcc1
@ 2014-11-01  9:23 Dominique Dhumieres
  2014-11-01  9:43 ` Jakub Jelinek
  0 siblings, 1 reply; 25+ messages in thread
From: Dominique Dhumieres @ 2014-11-01  9:23 UTC (permalink / raw)
  To: gcc-patches; +Cc: bonzini, pmuldoon, jakub

> Seems removing that makes the configure.ac change unneeded.
> Bootstrapped/regtested on x86_64-linux and i686-linux (libcc1
> is built after compare, by stage3 compiler), and built
> with --disable-bootstrap on i686-linux (libcc1 is built by
> the system compiler in that case).  Ok for trunk?
>
> 2014-10-31  Jakub Jelinek  <jakub@redhat.com>
> ...

This (r216964) breaks bootstrap at stage3

libtool: link: sed -e 's,^,_,' < ../../work/libcc1/libcc1.sym > .libs/libcc1-symbols.expsym
libtool: link:  /opt/gcc/build_w/./gcc/xg++ -B/opt/gcc/build_w/./gcc/ -nostdinc++ -nostdinc++ -I/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/include/x86_64-apple-darwin14.0.0 -I/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/include -I/opt/gcc/work/libstdc++-v3/libsupc++ -I/opt/gcc/work/libstdc++-v3/include/backward -I/opt/gcc/work/libstdc++-v3/testsuite/util -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/bin/ -B/opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/lib/ -isystem /opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/include -isystem /opt/gcc/gcc4.10w/x86_64-apple-darwin14.0.0/sys-include    -Wl,-undefined -Wl,dynamic_lookup -o .libs/libcc1.0.so -bundle  .libs/findcomp.o .libs/libcc1.o .libs/names.o .libs/callbacks.o .libs/connection.o .libs/marshall.o   -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/src/.libs -L/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libstdc++-v3/libsupc++/.libs  -static-libstdc++ -static-libgcc -Wl,-no_pie ../libiberty/pic/libiberty.a   -Wl,-exported_symbols_list,.libs/libcc1-symbols.expsym
ld: file not found: libstdc++.a
collect2: error: ld returned 1 exit status
make[3]: *** [libcc1.la] Error 1
make[3]: Leaving directory `/opt/gcc/build_w/libcc1'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/opt/gcc/build_w/libcc1'
make[1]: *** [all-libcc1] Error 2
make[1]: Leaving directory `/opt/gcc/build_w'
make: *** [all] Error 2

Reverting r216964 allowed me to boostrap r216988 on x86_64-apple-darwin14.

Dominique

^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2014-11-09 12:58 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-29 10:35 libcc1 Jakub Jelinek
2014-10-29 10:37 ` libcc1 Paolo Bonzini
2014-10-29 10:48   ` libcc1 Jakub Jelinek
2014-10-29 10:51     ` libcc1 Paolo Bonzini
2014-10-29 20:43     ` libcc1 Jakub Jelinek
2014-10-30  8:51       ` libcc1 Paolo Bonzini
2014-10-31 11:03         ` [PATCH] Don't bootstrap libcc1 Jakub Jelinek
2014-10-31 11:16           ` Richard Biener
2014-10-29 11:01 ` libcc1 Phil Muldoon
2014-10-29 11:24   ` libcc1 Paolo Bonzini
2014-10-29 11:46 ` libcc1 Phil Muldoon
2014-10-29 14:32   ` libcc1 Phil Muldoon
2014-10-29 14:39     ` libcc1 Phil Muldoon
2014-10-29 20:49       ` libcc1 Jeff Law
2014-11-01  9:23 [PATCH] Don't bootstrap libcc1 Dominique Dhumieres
2014-11-01  9:43 ` Jakub Jelinek
2014-11-01 18:13   ` Dominique d'Humières
2014-11-08 15:31     ` Dominique d'Humières
2014-11-08 15:41       ` Jakub Jelinek
2014-11-08 21:03         ` Iain Sandoe
2014-11-08 21:55           ` Jack Howarth
2014-11-08 21:59             ` Dominique d'Humières
2014-11-08 22:08               ` Jack Howarth
2014-11-09 12:58                 ` Iain Sandoe
2014-11-08 16:20       ` Jack Howarth

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).