/usr/src/gcc-4.6/debian/patches/gcc-multiarch.diff is in gcc-4.6-source 4.6.4-6ubuntu2.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # DP: Add multiarch support to GCC (chunks not yet applied upstream).
--- a/src/gcc/config/sh/t-linux
+++ b/src/gcc/config/sh/t-linux
@@ -6,3 +6,5 @@
MULTILIB_MATCHES =
EXTRA_MULTILIB_PARTS= crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+
+MULTILIB_OSDIRNAMES = sh4-linux-gnu:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu
--- /dev/null
+++ b/src/gcc/config/s390/t-linux
@@ -0,0 +1 @@
+MULTIARCH_DIRNAME = s390-linux-gnu
--- a/src/libstdc++-v3/python/hook.in
+++ b/src/libstdc++-v3/python/hook.in
@@ -47,7 +47,10 @@
libdir = libdir[len (prefix):]
# Compute the ".."s needed to get from libdir to the prefix.
- dotdots = ('..' + os.sep) * len (libdir.split (os.sep))
+ backdirs = len (libdir.split (os.sep))
+ if not os.path.basename(os.path.dirname(__file__)).startswith('lib'):
+ backdirs += 1 # multiarch subdir
+ dotdots = ('..' + os.sep) * backdirs
objfile = gdb.current_objfile ().filename
dir_ = os.path.join (os.path.dirname (objfile), dotdots, pythondir)
|