patches/gcc/4.4.4/350-index_macro.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu Oct 07 22:37:06 2010 +0200 (2010-10-07)
changeset 2138 2242d87c5404
child 2148 ada9128c98b8
permissions -rw-r--r--
scripts: always create lib32 and lib64 symlinks

Unconditionally create the lib32 -> lib/ and lib64 -> lib/ symlinks.

This is reportedly a fix to build a toolchain for a 32-bit target on
a 'pure' 64-bit host (eg. on Fedora FC12, host libs are in lib64/,
and there is no lib -> lib64 symlink, as we can see on other distors,
as Debian). As gcc only puts static host lib in lib64/ (along with
target files in subdirs), we can safely create the symlinks.

Also note that the symlinks are summarily removed at the end
of the build.

Signed-off-by: Anthony Foiani <anthony.foiani@gmail.com>
[Yann E. MORIN: fix a comment, rephrase the commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1948
     1
Original patch from: ../4.3.2/290-index_macro.patch
yann@1948
     2
yann@1948
     3
-= BEGIN original header =-
yann@1948
     4
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
yann@1948
     5
-= END original header =-
yann@1948
     6
yann@1948
     7
diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
yann@1948
     8
yann@1948
     9
diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/rope gcc-4.4.4/libstdc++-v3/include/ext/rope
yann@1948
    10
--- gcc-4.4.4.orig/libstdc++-v3/include/ext/rope	2009-04-10 01:23:07.000000000 +0200
yann@1948
    11
+++ gcc-4.4.4/libstdc++-v3/include/ext/rope	2010-05-16 19:37:47.000000000 +0200
yann@1948
    12
@@ -54,6 +54,9 @@
yann@1948
    13
 #include <bits/gthr.h>
yann@1948
    14
 #include <tr1/functional>
yann@1948
    15
 
yann@1948
    16
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1948
    17
+#undef index
yann@1948
    18
+
yann@1948
    19
 # ifdef __GC
yann@1948
    20
 #   define __GC_CONST const
yann@1948
    21
 # else
yann@1948
    22
diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h
yann@1948
    23
--- gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h	2009-04-10 01:23:07.000000000 +0200
yann@1948
    24
+++ gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h	2010-05-16 19:37:47.000000000 +0200
yann@1948
    25
@@ -49,6 +49,9 @@
yann@1948
    26
 #include <ext/memory> // For uninitialized_copy_n
yann@1948
    27
 #include <ext/numeric> // For power
yann@1948
    28
 
yann@1948
    29
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@1948
    30
+#undef index
yann@1948
    31
+
yann@1948
    32
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
yann@1948
    33
 
yann@1948
    34
   using std::size_t;