← Back to branch summary

~angelsl/ubuntu/wily/gcc-5/mips-cross

« back to all changes in this revision

Viewing changes to debian/patches/libstdc++-nothumb-check.diff

  • Committer: angelsl
  • Date: 2015-10-30 03:30:35 UTC
  • Revision ID: angelsl-20151030033035-rmug41zm8hyjgisg
Original import

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libstdc++-nothumb-check.diff
 
1
# DP: Don't run the libstdc++-v3 testsuite in thumb mode on armel
 
2
 
 
3
Index: testsuite/Makefile.in
 
4
===================================================================
 
5
--- a/src/libstdc++-v3/testsuite/Makefile.in    (revision 156820)
 
6
+++ b/src/libstdc++-v3/testsuite/Makefile.in    (working copy)
 
7
@@ -583,6 +583,8 @@
 
8
        srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
 
9
        EXPECT=$(EXPECT); export EXPECT; \
 
10
        runtest=$(RUNTEST); \
 
11
+       runtestflags="`echo '$(RUNTESTFLAGS)' | sed 's/,-marm/-marm/'`"; \
 
12
+       case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \
 
13
        if [ -z "$$runtest" ]; then runtest=runtest; fi; \
 
14
        tool=libstdc++; \
 
15
        dirs=; \
 
16
@@ -590,7 +592,7 @@
 
17
          normal0) \
 
18
            if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
 
19
              $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
 
20
-                       $(RUNTESTFLAGS) abi.exp; \
 
21
+                       $$runtestflags abi.exp; \
 
22
            else echo "WARNING: could not find \`runtest'" 1>&2; :;\
 
23
            fi; \
 
24
            dirs="`cd $$srcdir; echo [013-9][0-9]_*/* [abep]*/*`";; \
 
25
@@ -605,11 +607,11 @@
 
26
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
 
27
          if [ -n "$$dirs" ]; then \
 
28
            $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
 
29
-                   $(RUNTESTFLAGS) \
 
30
+                   $$runtestflags \
 
31
                    "conformance.exp=`echo $$dirs | sed 's/ /* /g;s/$$/*/'`"; \
 
32
          else \
 
33
            $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
 
34
-                   $(RUNTESTFLAGS); \
 
35
+                   $$runtestflags; \
 
36
          fi; \
 
37
        else echo "WARNING: could not find \`runtest'" 1>&2; :;\
 
38
        fi