GCC 4.8.4 Status Report (2014-12-05)

2014-12-05 Thread Jakub Jelinek
Status
==

It is time for another 4.8 release, I'd like to create 4.8.4 release
candidate at the end of the next week and if all goes well, 4.8.4 release
a week after that.  If you have any safe fixes you'd like to be backported,
please do so soon, and if there are any known issues on the branch, please
make sure they are reported in bugzilla and let us RMs know about those.


Quality Data


Priority  #   Change from last report
---   ---
P10
P2   95+   3
P3   45+   2
---   ---
Total   140+   5


Previous Report
===

https://gcc.gnu.org/ml/gcc/2014-05/msg00263.html


Re: GCC 4.8.4 Status Report (2014-12-05)

2014-12-05 Thread H.J. Lu
On Fri, Dec 5, 2014 at 1:18 AM, Jakub Jelinek  wrote:
> Status
> ==
>
> It is time for another 4.8 release, I'd like to create 4.8.4 release
> candidate at the end of the next week and if all goes well, 4.8.4 release
> a week after that.  If you have any safe fixes you'd like to be backported,
> please do so soon, and if there are any known issues on the branch, please
> make sure they are reported in bugzilla and let us RMs know about those.
>

I backported the fix for

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64037


-- 
H.J.


Re: GCC 4.8.4 Status Report (2014-12-05)

2014-12-05 Thread David Edelsohn
On Fri, Dec 5, 2014 at 4:18 AM, Jakub Jelinek  wrote:
> Status
> ==
>
> It is time for another 4.8 release, I'd like to create 4.8.4 release
> candidate at the end of the next week and if all goes well, 4.8.4 release
> a week after that.  If you have any safe fixes you'd like to be backported,
> please do so soon, and if there are any known issues on the branch, please
> make sure they are reported in bugzilla and let us RMs know about those.
>
>
> Quality Data
> 
>
> Priority  #   Change from last report
> ---   ---
> P10
> P2   95+   3
> P3   45+   2
> ---   ---
> Total   140+   5
>
>
> Previous Report
> ===
>
> https://gcc.gnu.org/ml/gcc/2014-05/msg00263.html

The problem with building GCC trunk using any previous release of GCC
after the explosion of CHKP builtins remains unresolved.

Thanks, David


Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Jakub Jelinek
On Mon, Nov 24, 2014 at 01:06:45AM +0100, FX wrote:
> tl;dr: One question to build maintainers, and one patch submitted to toplevel 
> configure.ac
> 
> ---
> 
> I’m looked into the issue some more, and am comparing two builds of trunk 
> (exact same source), one configured with system compiler (clang) in PATH, the 
> other with GCC 4.9.2 in PATH.
> At the toplevel configure, the only meaningful difference is that the 
> gcc-based build sets stage1_ldflags='-static-libstdc++ -static-libgcc' while 
> the clang-based has stage1_ldflags='' (clang doesn’t recognized 
> -static-libstdc++).
> 
> This is included into the toplevel Makefile as STAGE1_LDFLAGS (the comment 
> appropriately says "Linker flags to use on the host, for stage1 or when not 
> bootstrapping”).
> Those are exported by HOST_EXPORTS, which is are then used by 
> configure-libcc1, all-libcc1, etc. Thus, we end up using STAGE1_LDFLAGS, 
> which correspond to the system compiler, instead of the stage3 compiler (as 
> we should).
> 
> So, this is “false negative” part of the problem (namely, why we don’t see 
> the failure when bootstrapping with clang): we use STAGE1_LDFLAGS in building 
> libcc1, and with clang as system compiler we don’t use static linking of the 
> C++ library. This part, I don’t know how to fix: it is for the build experts 
> to address. It is a real problem: it leads to libcc1.so being linked 
> dynamically to libstdc++ and libgcc, instead of statically (as it should).
> 
> ---
> 
> Second part of the question: when the freshly built g++ is used, we need to 
> pass the appropriate -B options. As I understand it, the appropriate place 
> for that is in the toplevel configure.ac, where we already pass down the 
> respective -L options. Indeed, the attached patch restores bootstrap on 
> x86_64-apple-darwin14 with gcc as system compiler (and doesn’t break the 
> bootstrap with clang as system compiler).
> 
> OK to commit?

Reading the toplevel Makefile and trying to understand how things work
for non-bootstrap vs. bootstrap host dirs that aren't bootstrapped,
I'd say the right fix should be something like following
(bootstrapping/regtesting it right now on x86_64-linux and i686-linux,
though it won't make much difference there, on x86_64-linux
STAGE1_LDFLAGS is equal to POSTSTAGE1_LDFLAGS and STAGE1_LIBS is equal
to POSTSTAGE1_LIBS.  On i686-linux there is at least a difference
for some reason (possibly related with my setarch and gcc -m32 wrappers
hacks to make i686-linux bootstrap work on x86_64-linux box) in
*STAGE1_LDFLAGS, only the POSTSTAGE1_LDFLAGS is -static-libstdc++ 
-static-libgcc.

>From my reading, POSTSTAGE1_HOST_EXPORTS is clearly inappropriate for the
modules like libcc1, because it uses prev-gcc/, while we want to use gcc/,
but otherwise looking at the HOST_EXPORTS vs. POSTSTAGE1_HOST_EXPORTS
differences, LDFLAGS and HOST_LIBS is what needs changing.
For some reason POSTSTAGE1_HOST_EXPORTS sets LDFLAGS to 
$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)
(the first part is ok and clear, the latter differs from the HOST_EXPORTS
$(STAGE1_LDFLAGS) $(LDFLAGS).
With my patch below, one actually ends up with
$(POSTSTAGE1_LDFLAGS) $(LDFLAGS_FOR_TARGET)
for libcc1 when bootstrapping in LDFLAGS, while previously
$(STAGE1_LDFLAGS) $(LDFLAGS_FOR_TARGET)
was used.  STAGE1_L{DFLAGS,IBS} is only used in $(HOST_EXPORTS),
so at least in theory I think my patch should DTRT.

Can you please test it on Darwin (or whatever other target has similar
issues with bootstrapping libcc1)?

2014-12-05  Jakub Jelinek  

PR bootstrap/64023
* Makefile.tpl (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS
to POSTSTAGE1_LDFLAGS and STAGE1_LIBS to POSTSTAGE1_LIBS.
* Makefile.in: Regenerated.

--- Makefile.tpl.jj 2014-11-12 09:31:59.0 +0100
+++ Makefile.tpl2014-12-05 17:14:16.115295667 +0100
@@ -659,6 +659,8 @@ EXTRA_TARGET_FLAGS = \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
'WINDMC=$$(WINDMC_FOR_TARGET)' \
'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+   'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+   'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
--- Makefile.in.jj  2014-11-28 14:40:52.0 +0100
+++ Makefile.in 2014-12-05 17:15:04.322439003 +0100
@@ -853,6 +853,8 @@ EXTRA_TARGET_FLAGS = \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
'WINDMC=$$(WINDMC_FOR_TARGET)' \
'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+   'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+   'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)


Jakub


Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Dominique Dhumieres
> ...
> Can you please test it on Darwin (or whatever other target has similar
> issues with bootstrapping libcc1)?
>
> 2014-12-05  Jakub Jelinek  
> ...

The patch does not work for x86_64-apple-darwin14.0.0. However the following 
patch does:

--- ../_clean/Makefile.in   2014-11-26 23:09:14.0 +0100
+++ Makefile.in 2014-12-05 17:22:54.0 +0100
@@ -31389,7 +31389,7 @@ configure-libcc1: 
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1 ; \
-   $(HOST_EXPORTS)  \
+   $(POSTSTAGE1_HOST_EXPORTS)  \
echo Configuring in $(HOST_SUBDIR)/libcc1; \
cd "$(HOST_SUBDIR)/libcc1" || exit 1; \
case $(srcdir) in \
@@ -31422,7 +31422,7 @@ all-libcc1: configure-libcc1
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS)  \
+   $(POSTSTAGE1_HOST_EXPORTS)  \
(cd $(HOST_SUBDIR)/libcc1 && \
  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) 
$(STAGE1_FLAGS_TO_PASS)  \
$(TARGET-libcc1))
@@ -31440,7 +31440,7 @@ check-libcc1:
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libcc1 && \
  $(MAKE) $(FLAGS_TO_PASS)  check)
 
@@ -31455,7 +31455,7 @@ install-libcc1: installdirs
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libcc1 && \
  $(MAKE) $(FLAGS_TO_PASS)  install)
 
@@ -31470,7 +31470,7 @@ install-strip-libcc1: installdirs
@: $(MAKE); $(unstage)
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libcc1 && \
  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
@@ -31489,7 +31489,7 @@ info-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31515,7 +31515,7 @@ dvi-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31541,7 +31541,7 @@ pdf-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31567,7 +31567,7 @@ html-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31593,7 +31593,7 @@ TAGS-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31620,7 +31620,7 @@ install-info-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31647,7 +31647,7 @@ install-pdf-libcc1: \
@[ -f ./libcc1/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-   $(HOST_EXPORTS) \
+   $(POSTSTAGE1_HOST_EXPORTS) \
for flag in $(EXTRA_HOST_FLAGS) ; do \
  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
done; \
@@ -31674,7 +31674,7 @@ install-html-libcc1: \
@[ -f ./libcc1/Make

Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Jakub Jelinek
On Fri, Dec 05, 2014 at 08:11:53PM +0100, Dominique Dhumieres wrote:
> > ...
> > Can you please test it on Darwin (or whatever other target has similar
> > issues with bootstrapping libcc1)?
> >
> > 2014-12-05  Jakub Jelinek  
> > ...
> 
> The patch does not work for x86_64-apple-darwin14.0.0. However the following 
> patch does:

As I've tried to explain, that is IMHO wrong though.
If what you are after is the -B stuff too, then perhaps:

2014-12-05  Jakub Jelinek  

PR bootstrap/64023
* Makefile.tpl (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS
to POSTSTAGE1_LDFLAGS and STAGE1_LIBS to POSTSTAGE1_LIBS.
Add -B to libstdc++-v3/src/.libs and libstdc++-v3/libsupc++/.libs
to CXX.
* Makefile.in: Regenerated.

--- Makefile.tpl.jj 2014-11-12 09:31:59.0 +0100
+++ Makefile.tpl2014-12-05 21:12:21.486031062 +0100
@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
'AS=$(COMPILER_AS_FOR_TARGET)' \
'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-   'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+   'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' 
\
+   ' -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs' \
+   ' $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
'WINDMC=$$(WINDMC_FOR_TARGET)' \
'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+   'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+   'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
--- Makefile.in.jj  2014-11-28 14:40:52.0 +0100
+++ Makefile.in 2014-12-05 21:11:48.276616008 +0100
@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
'AS=$(COMPILER_AS_FOR_TARGET)' \
'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-   'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+   'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' 
\
+   ' -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs' \
+   ' $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
'WINDMC=$$(WINDMC_FOR_TARGET)' \
'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+   'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+   'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)


Jakub


Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Dominique Dhumieres
> As I've tried to explain, that is IMHO wrong though.
> If what you are after is the -B stuff too, then perhaps:
> ...

Sorry but it does not work:

true  DO=all multi-do # make
make[4]: Leaving directory '/opt/gcc/build_w/libbacktrace'
make[3]: Leaving directory '/opt/gcc/build_w/libbacktrace'
make[3]: Entering directory '/opt/gcc/build_w/libcpp'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/opt/gcc/build_w/libcpp'
make[3]: Entering directory '/opt/gcc/build_w/libdecnumber'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/opt/gcc/build_w/libdecnumber'
make[3]: Entering directory '/opt/gcc/build_w/gcc'
make[3]: Leaving directory '/opt/gcc/build_w/gcc'
Checking multilib configuration for libgcc...
make[3]: Entering directory '/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libgcc'
make[3]: *** No rule to make target ' 
-B$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs'.  Stop.
make[3]: Leaving directory '/opt/gcc/build_w/x86_64-apple-darwin14.0.0/libgcc'
Makefile:14905: recipe for target 'all-stage1-target-libgcc' failed
make[2]: *** [all-stage1-target-libgcc] Error 2
make[2]: Leaving directory '/opt/gcc/build_w'
Makefile:21193: recipe for target 'stage1-bubble' failed
make[1]: *** [stage1-bubble] Error 2
make[1]: Leaving directory '/opt/gcc/build_w'
Makefile:910: recipe for target 'all' failed
make: *** [all] Error 2

Dominique


Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Jeff Law

On 12/05/14 15:34, Dominique Dhumieres wrote:

As I've tried to explain, that is IMHO wrong though.
If what you are after is the -B stuff too, then perhaps:
...


Sorry but it does not work:
BTW, thanks for working with Jakub on this.  We're going to be getting a 
Darwin box for Jakub and other folks in the Red Hat team to use when the 
need arises to dig into these kind of issues.


However, until that box arrives and is setup, this kind of iteration is 
the only way he can test Darwin stuff.


Jeff



Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Phil Muldoon
On 05/12/14 22:40, Jeff Law wrote:
> On 12/05/14 15:34, Dominique Dhumieres wrote:
>>> As I've tried to explain, that is IMHO wrong though.
>>> If what you are after is the -B stuff too, then perhaps:
>>> ...
>>
>> Sorry but it does not work:
> BTW, thanks for working with Jakub on this.  We're going to be getting a 
> Darwin box for Jakub and other folks in the Red Hat team to use when the need 
> arises to dig into these kind of issues.
>
> However, until that box arrives and is setup, this kind of iteration is the 
> only way he can test Darwin stuff.
>
> Jeff
>

Indeed I feel especially bad in these scenarios where patches are
suggested for a patch I submitted and are causing you folks problems.
I really do not want to do that.  So many architectures for GCC, so
very few resources.  Hopefully as Jeff indicates, this will be sorted
soon.  Again from a libcc1 point of view, as long as we have the .so
built on all configurations, that is what matters.  I have not chipped
into these threads as I have nothing to say/recommend about darwin
architectures :( I do read them all, though.

Cheers,

Phil



Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Jakub Jelinek
On Fri, Dec 05, 2014 at 11:34:28PM +0100, Dominique Dhumieres wrote:
> > As I've tried to explain, that is IMHO wrong though.
> > If what you are after is the -B stuff too, then perhaps:
> > ...
> 
> Sorry but it does not work:

Sorry, make that (just removed 4x ' in each file):

2014-12-05  Jakub Jelinek  

PR bootstrap/64023
* Makefile.tpl (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS
to POSTSTAGE1_LDFLAGS and STAGE1_LIBS to POSTSTAGE1_LIBS.
Add -B to libstdc++-v3/src/.libs and libstdc++-v3/libsupc++/.libs
to CXX.
* Makefile.in: Regenerated.

--- Makefile.tpl.jj 2014-11-12 09:31:59.0 +0100
+++ Makefile.tpl2014-12-05 21:12:21.486031062 +0100
@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
'AS=$(COMPILER_AS_FOR_TARGET)' \
'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-   'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+   'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+-B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
+$$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
'WINDMC=$$(WINDMC_FOR_TARGET)' \
'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+   'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+   'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
--- Makefile.in.jj  2014-11-28 14:40:52.0 +0100
+++ Makefile.in 2014-12-05 21:11:48.276616008 +0100
@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
'AS=$(COMPILER_AS_FOR_TARGET)' \
'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-   'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+   'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+-B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
+$$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
'WINDMC=$$(WINDMC_FOR_TARGET)' \
'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+   'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+   'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
"TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)

Jakub


Re: [patch, build] Restore bootstrap in building libcc1 on darwin

2014-12-05 Thread Dominique d'Humières
Bootstrap just finished with the patch.

Thanks,

Dominique

> Le 5 déc. 2014 à 23:47, Jakub Jelinek  a écrit :
> 
> On Fri, Dec 05, 2014 at 11:34:28PM +0100, Dominique Dhumieres wrote:
>>> As I've tried to explain, that is IMHO wrong though.
>>> If what you are after is the -B stuff too, then perhaps:
>>> ...
>> 
>> Sorry but it does not work:
> 
> Sorry, make that (just removed 4x ' in each file):
> 
> 2014-12-05  Jakub Jelinek  
> 
>   PR bootstrap/64023
>   * Makefile.tpl (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS
>   to POSTSTAGE1_LDFLAGS and STAGE1_LIBS to POSTSTAGE1_LIBS.
>   Add -B to libstdc++-v3/src/.libs and libstdc++-v3/libsupc++/.libs
>   to CXX.
>   * Makefile.in: Regenerated.
> 
> --- Makefile.tpl.jj   2014-11-12 09:31:59.0 +0100
> +++ Makefile.tpl  2014-12-05 21:12:21.486031062 +0100
> @@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
>   'AS=$(COMPILER_AS_FOR_TARGET)' \
>   'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
>   'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
> - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
> + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
> +  -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
> +  $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
>   'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
>   'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
>   'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
> @@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
>   'WINDRES=$$(WINDRES_FOR_TARGET)' \
>   'WINDMC=$$(WINDMC_FOR_TARGET)' \
>   'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
> + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
> + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
>   "TFLAGS=$$TFLAGS"
> 
> TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
> --- Makefile.in.jj2014-11-28 14:40:52.0 +0100
> +++ Makefile.in   2014-12-05 21:11:48.276616008 +0100
> @@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
>   'AS=$(COMPILER_AS_FOR_TARGET)' \
>   'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
>   'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
> - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
> + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
> +  -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
> +  $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
>   'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
>   'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
>   'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
> @@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
>   'WINDRES=$$(WINDRES_FOR_TARGET)' \
>   'WINDMC=$$(WINDMC_FOR_TARGET)' \
>   'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
> + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
> + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
>   "TFLAGS=$$TFLAGS"
> 
> TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
> 
>   Jakub