patches/gcc/3.2.3/170-libstdc++-v3-dg.exp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jul 28 21:08:01 2008 +0000 (2008-07-28)
changeset 746 b150d6f590fc
parent 402 patches/gcc/3.2.3/170-gcc-3.3-libstdc++-v3-dg.exp.patch@197e1b49586e
permissions -rw-r--r--
Third go at renaming patches to contain neither the package name nor the package version.
     1 Without this patch, the command
     2 
     3 RUNTESTFLAGS=--target=powerpc-750-linux-gnu -v -v -v -v make check-target-libstdc++-v3
     4 
     5 fails in two ways:
     6 1. the -L option meant to locate the testsuite directory is incorrect, and
     7 2. the wrong compiler is invoked, causing all sorts of havoc, not least of which
     8 is the native compiler is invoked when we really wanted to invoke the cross-compiler
     9 we just built.
    10 
    11 Here's an example log of the problem in action.  Every testcase fails, this shows just one:
    12 -------------
    13 Invoking the compiler as g++ -ggdb3 -DDEBUG_ASSERT -I/home3/dank/wk/ixos/dap_interim/linux/3rdParty/crosstool/crosstool-0.12/build/powerpc-750-linux-gnu/gcc-3.3-glibc-2.2.5/gcc-3.3/libstdc++-v3/testsuite /home3/dank/wk/ixos/dap_interim/linux/3rdParty/crosstool/crosstool-0.12/build/powerpc-750-linux-gnu/gcc-3.3-glibc-2.2.5/gcc-3.3/libstdc++-v3/testsuite/20_util/binders.cc   -g -O2 -DDEBUG_ASSERT  -L/testsuite -lv3test -lm  -o ./binders.exe
    14 compiler exited with status 1
    15 output is:
    16 /usr/lib/gcc-lib/i386-linux/2.95.4/../../../../include/g++-3/stl_function.h: In method `void binder2nd<mem_fun1_ref_t<void,Elem,int> >::operator ()(const Elem &) const':^M
    17 /usr/lib/gcc-lib/i386-linux/2.95.4/../../../../include/g++-3/stl_algo.h:83:   instantiated from `for_each<Elem *, binder2nd<mem_fun1_ref_t<void,Elem,int> > >(Elem *, Elem *, binder2nd<mem_fun1_ref_t<void,Elem,int> >)'^M
    18 /home3/dank/wk/ixos/dap_interim/linux/3rdParty/crosstool/crosstool-0.12/build/powerpc-750-linux-gnu/gcc-3.3-glibc-2.2.5/gcc-3.3/libstdc++-v3/testsuite/20_util/binders.cc:43:   instantiated from here^M
    19 /usr/lib/gcc-lib/i386-linux/2.95.4/../../../../include/g++-3/stl_function.h:224: conversion from `const Elem' to `Elem &' discards qualifiers^M
    20 /usr/lib/gcc-lib/i386-linux/2.95.4/../../../../include/g++-3/stl_function.h:622: in passing argument 1 of `mem_fun1_ref_t<void,Elem,int>::operator ()(Elem &, int) const'^M
    21 ...
    22 FAIL: 20_util/binders.cc (test for excess errors)
    23 WARNING: 20_util/binders.cc compilation failed to produce executable
    24 -------------
    25 
    26 And here's the patch.  I'm not happy with it, and it probably gets some cases wrong,
    27 but it seems to work for the common native case and for my cross-compiler case.
    28 
    29 --- gcc-3.3/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp.old	Sun Jul 13 10:42:01 2003
    30 +++ gcc-3.3/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp	Sun Jul 13 11:39:54 2003
    31 @@ -46,8 +46,23 @@
    32      global gluefile wrap_flags
    33      global ld_library_path
    34      global tool_root_dir
    35 +    global target_triplet
    36  
    37      set blddir [lookfor_file [get_multilibs] libstdc++-v3]
    38 +    if { $blddir == "" } {
    39 +        set multilibs [get_multilibs]
    40 +        # FIXME: assume multilib only one level deep
    41 +        set multisub [file tail $multilibs]
    42 +        verbose "libstdc++-v3-init: couldn't find libstdc++-v3 in $multilibs, trying $objdir"
    43 +        set blddir [lookfor_file ${objdir} "$target_triplet/$multisub/libstdc++-v3"]
    44 +    }
    45 +    if { $blddir == "" } {
    46 +        verbose "libstdc++-v3-init: couldn't find libstdc++-v3, trying $objdir without multilibs"
    47 +        set blddir [lookfor_file ${objdir} "$target_triplet/libstdc++-v3"]
    48 +    }
    49 +    if { $blddir == "" } {
    50 +         error "Can't find libstdc++-v3"
    51 +    }
    52  
    53      # By default, we assume we want to run program images.
    54      global dg-do-what-default