← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/gcc-multiarch+biarch.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2011-06-11 21:10:12 UTC
  • Revision ID: james.westby@ubuntu.com-20110611211012-5mil9506mqtiplyl
Tags: 4.4.6-5
* Update to SVN 20110611 from the gcc-4_4-branch (r174958).
* Extend multiarch support for mips/mipsel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gcc-multiarch+biarch.diff
50
50
 MULTILIB_MATCHES        =
51
51
 
52
52
 softfp_wrap_start := '\#ifndef __powerpc64__'
 
53
--- a/src/gcc/config/mips/t-linux64
 
54
+++ b/src/gcc/config/mips/t-linux64
 
55
@@ -1,6 +1,9 @@
 
56
 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
 
57
 MULTILIB_DIRNAMES = n32 32 64
 
58
-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
 
59
+MULTILIB_OSDIRNAMES = \
 
60
+       $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib32),../../lib32,../lib32) \
 
61
+       . \
 
62
+       $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../../usr/lib64),../../lib64,../lib64)
 
63
 
 
64
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
 
65