patches/gcc/4.4.5/350-index_macro.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)
yann@2149
     1
-= BEGIN original header =-
yann@2149
     2
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
yann@2149
     3
-= END original header =-
yann@2149
     4
yann@2149
     5
diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/rope gcc-4.4.5/libstdc++-v3/include/ext/rope
yann@2149
     6
--- gcc-4.4.5.orig/libstdc++-v3/include/ext/rope	2009-04-10 01:23:07.000000000 +0200
yann@2149
     7
+++ gcc-4.4.5/libstdc++-v3/include/ext/rope	2010-10-09 23:12:51.000000000 +0200
yann@2149
     8
@@ -54,6 +54,9 @@
yann@2149
     9
 #include <bits/gthr.h>
yann@2149
    10
 #include <tr1/functional>
yann@2149
    11
 
yann@2149
    12
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@2149
    13
+#undef index
yann@2149
    14
+
yann@2149
    15
 # ifdef __GC
yann@2149
    16
 #   define __GC_CONST const
yann@2149
    17
 # else
yann@2149
    18
diff -durN gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h
yann@2149
    19
--- gcc-4.4.5.orig/libstdc++-v3/include/ext/ropeimpl.h	2009-04-10 01:23:07.000000000 +0200
yann@2149
    20
+++ gcc-4.4.5/libstdc++-v3/include/ext/ropeimpl.h	2010-10-09 23:12:51.000000000 +0200
yann@2149
    21
@@ -49,6 +49,9 @@
yann@2149
    22
 #include <ext/memory> // For uninitialized_copy_n
yann@2149
    23
 #include <ext/numeric> // For power
yann@2149
    24
 
yann@2149
    25
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@2149
    26
+#undef index
yann@2149
    27
+
yann@2149
    28
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@2149
    29
 
yann@2149
    30
   using std::size_t;