← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gcc-4.7/vivid

« back to all changes in this revision

Viewing changes to debian/patches/gcc-multilib-multiarch.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-06-02 19:45:44 UTC
  • mfrom: (15.1.38 sid)
  • Revision ID: package-import@ubuntu.com-20140602194544-xk27875sde16bgr6
Tags: 4.7.3-14ubuntu1
* Merge with Debian; remaining changes:
  - Build from upstream source.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gcc-multilib-multiarch.diff
40
40
===================================================================
41
41
--- a/src/gcc/config/rs6000/t-linux64
42
42
+++ b/src/gcc/config/rs6000/t-linux64
43
 
@@ -31,8 +31,13 @@
 
43
@@ -31,8 +31,13 @@ MULTILIB_DIRNAMES       = 64 32
44
44
 MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
45
45
 MULTILIB_EXCEPTIONS     =
46
46
 MULTILIB_EXCLUSIONS     =
80
80
 
81
81
 ifneq (,$(findstring x86_64,$(target)))
82
82
   ifneq (,$(findstring biarchx32.h,$(tm_include_list)))
 
83
Index: b/src/gcc/config/mips/t-linux64
 
84
===================================================================
 
85
--- a/src/gcc/config/mips/t-linux64
 
86
+++ b/src/gcc/config/mips/t-linux64
 
87
@@ -25,6 +25,23 @@ MULTILIB_OSDIRNAMES = \
 
88
        ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
 
89
        ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
 
90
 
 
91
+ifneq (,$(findstring gnuabi64,$(target)))
 
92
+MULTILIB_OSDIRNAMES = \
 
93
+        ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
 
94
+        ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
 
95
+        ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
 
96
+else ifneq (,$(findstring gnuabin32,$(target)))
 
97
+MULTILIB_OSDIRNAMES = \
 
98
+        ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
 
99
+        ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
 
100
+        ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
 
101
+else
 
102
+MULTILIB_OSDIRNAMES = \
 
103
+        ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
 
104
+        ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
 
105
+        ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
 
106
+endif
 
107
+
 
108
 ifneq (,$(findstring abin32,$(target)))
 
109
 MULTIARCH_DIRNAME = $(call if_multiarch,mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT))
 
110
 else
 
111
Index: b/src/gcc/config.gcc
 
112
===================================================================
 
113
--- a/src/gcc/config.gcc
 
114
+++ b/src/gcc/config.gcc
 
115
@@ -1807,6 +1807,12 @@ mips64*-*-linux* | mipsisa64*-*-linux*)
 
116
        tmake_file="${tmake_file} mips/t-linux64"
 
117
        tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
 
118
        case ${target} in
 
119
+               *abi64*)
 
120
+                       tm_defines=$(echo ${tm_defines}| sed 's/MIPS_ABI_DEFAULT=ABI_N32/MIPS_ABI_DEFAULT=ABI_64/g')
 
121
+                       ;;
 
122
+       esac
 
123
+
 
124
+       case ${target} in
 
125
                mips64el-st-linux-gnu)
 
126
                        tm_file="${tm_file} mips/st.h"
 
127
                        tmake_file="${tmake_file} mips/t-st"