← Back to branch summary

~ubuntu-branches/debian/sid/gcc-4.8/sid

« back to all changes in this revision

Viewing changes to .svn/pristine/67/672135895e731cfcf815ffc1f56a86e0f4733922.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/67/672135895e731cfcf815ffc1f56a86e0f4733922.svn-base
 
1
# DP: Fix the location of target's libs in cross-build for biarch
 
2
 
 
3
---
 
4
 
 
5
--- a/src/config-ml.in  2010-08-24 01:48:38.000000000 -0400
 
6
+++ b/src/config-ml.in  2010-08-24 03:56:12.000000000 -0400
 
7
@@ -540,7 +540,12 @@
 
8
            else \
 
9
              if [ -d ../$${dir}/$${lib} ]; then \
 
10
                flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
 
11
-               if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
 
12
+               libsuffix_="$${dir}"; \
 
13
+               if [ "$${dir}" = "n32" ]; then libsuffix_=32; fi; \
 
14
+               if (cd ../$${dir}/$${lib}; $(MAKE) $(subst \
 
15
+                               -B$(build_tooldir)/lib/, \
 
16
+                               -B$(build_tooldir)/lib$${libsuffix_}/, \
 
17
+                               $(FLAGS_TO_PASS)) \
 
18
                                CFLAGS="$(CFLAGS) $${flags}" \
 
19
                                CCASFLAGS="$(CCASFLAGS) $${flags}" \
 
20
                                FCFLAGS="$(FCFLAGS) $${flags}" \
 
21
@@ -791,6 +796,13 @@
 
22
        GCJ_=$GCJ' '
 
23
        GFORTRAN_=$GFORTRAN' '
 
24
     else
 
25
+       if [ "${ml_dir}" = "." ]; then
 
26
+               FILTER_="s!X\\(.*\\)!\\1!p"
 
27
+       elif [ "${ml_dir}" = "n32" ]; then # mips n32 -> lib32
 
28
+               FILTER_="s!X\\(.*\\)/!\\132/!p"
 
29
+       else
 
30
+               FILTER_="s!X\\(.*\\)/!\\1${ml_dir}/!p"
 
31
+       fi
 
32
        # Create a regular expression that matches any string as long
 
33
        # as ML_POPDIR.
 
34
        popdir_rx=`echo "${ML_POPDIR}" | sed 's,.,.,g'`
 
35
@@ -799,6 +811,8 @@
 
36
          case $arg in
 
37
          -[BIL]"${ML_POPDIR}"/*)
 
38
            CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\1/p"`' ' ;;
 
39
+         -B*/lib/)
 
40
+           CC_="${CC_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;;
 
41
          "${ML_POPDIR}"/*)
 
42
            CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
43
          *)
 
44
@@ -811,6 +825,8 @@
 
45
          case $arg in
 
46
          -[BIL]"${ML_POPDIR}"/*)
 
47
            CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
48
+         -B*/lib/)
 
49
+           CXX_="${CXX_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;;
 
50
          "${ML_POPDIR}"/*)
 
51
            CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
52
          *)
 
53
@@ -823,6 +839,8 @@
 
54
          case $arg in
 
55
          -[BIL]"${ML_POPDIR}"/*)
 
56
            F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
57
+         -B*/lib/)
 
58
+           F77_="${F77_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;;
 
59
          "${ML_POPDIR}"/*)
 
60
            F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
61
          *)
 
62
@@ -835,6 +853,8 @@
 
63
          case $arg in
 
64
          -[BIL]"${ML_POPDIR}"/*)
 
65
            GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
66
+         -B*/lib/)
 
67
+           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;;
 
68
          "${ML_POPDIR}"/*)
 
69
            GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
70
          *)
 
71
@@ -847,6 +867,8 @@
 
72
          case $arg in
 
73
          -[BIL]"${ML_POPDIR}"/*)
 
74
            GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
75
+         -B*/lib/)
 
76
+           GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;;
 
77
          "${ML_POPDIR}"/*)
 
78
            GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
 
79
          *)