patches/gcc/4.4.5/370-bootstrap-target_lib_path.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Dec 13 23:32:39 2011 +0100 (2011-12-13)
branch1.13
changeset 2847 c0bf2319af08
permissions -rw-r--r--
scripts: fix dumping execution backtrace

Dumping the backtrace has been broken since changeset #652e56d6d35a:
scripts: execute each steps in a subshell

We can spawn sub-sub-shells in some cases.

The way the fault handler works is to dump the backtrace, but to avoid
printing it once for every sub-shell (which could get quite confusing),
it simply exits when it detects that it is being run in a sub-shell,
leaving to the top-level shell the work to dump the backtrace.

Because each step is executed in its own sub-shell, the variable arrays
that contain the step name, the source file and line number, are lost
when exiting the per-step sub-shell.

Hence, the backtrace is currently limited to printing only the top-level
main procedure of the shell.

Fix this thus:
- when dumping the bckatraces for the steps & the functions, remember
it was dumped, and only dump it if it was not already dumped
- at the top-level shell, print the hints

Also, rename the top-level step label.

Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 4193d6e6a17430a177fa88c287879c2c35e319f3)
     1 ChangeLog:
     2 2010-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
     3 
     4 	PR bootstrap/41818
     5 	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
     6 	to $(RPATH_ENVVAR) if bootstrapping.
     7 	* Makefile.in: Regenerate.
     8 
     9 diff -durN gcc-4.4.5.orig/Makefile.in gcc-4.4.5/Makefile.in
    10 --- gcc-4.4.5.orig/Makefile.in	2009-04-25 06:10:29.000000000 +0200
    11 +++ gcc-4.4.5/Makefile.in	2010-10-09 23:13:50.000000000 +0200
    12 @@ -245,7 +245,10 @@
    13  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
    14  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
    15  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
    16 -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    17 +@if gcc-bootstrap
    18 +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
    19 +@endif gcc-bootstrap
    20 +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    21  
    22  RAW_CXX_TARGET_EXPORTS = \
    23  	$(BASE_TARGET_EXPORTS) \
    24 diff -durN gcc-4.4.5.orig/Makefile.tpl gcc-4.4.5/Makefile.tpl
    25 --- gcc-4.4.5.orig/Makefile.tpl	2009-04-14 10:57:33.000000000 +0200
    26 +++ gcc-4.4.5/Makefile.tpl	2010-10-09 23:13:50.000000000 +0200
    27 @@ -248,7 +248,10 @@
    28  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
    29  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
    30  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
    31 -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    32 +@if gcc-bootstrap
    33 +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
    34 +@endif gcc-bootstrap
    35 +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    36  
    37  RAW_CXX_TARGET_EXPORTS = \
    38  	$(BASE_TARGET_EXPORTS) \