diff options
Diffstat (limited to 'recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch')
| -rw-r--r-- | recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch | 176 |
1 files changed, 176 insertions, 0 deletions
diff --git a/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch b/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch new file mode 100644 index 0000000000..093dd1c570 --- /dev/null +++ b/recipes-devtools/gcc/gcc-4.5/linaro/gcc-4.5-linaro-r99403.patch | |||
| @@ -0,0 +1,176 @@ | |||
| 1 | 2010-09-20 Jie Zhang <jie@codesourcery.com> | ||
| 2 | |||
| 3 | Issue #5256 | ||
| 4 | |||
| 5 | libstdc++-v3/ | ||
| 6 | |||
| 7 | Backport from mainline: | ||
| 8 | |||
| 9 | 2010-05-21 Joseph Myers <joseph@codesourcery.com> | ||
| 10 | * acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Use GNU locale model for | ||
| 11 | glibc 2.3 and later, but not uClibc, without an execution test. | ||
| 12 | * configure: Regenerate. | ||
| 13 | * doc/xml/manual/configure.xml, doc/xml/manual/prerequisites.xml, | ||
| 14 | doc/xml/faq.xml: Update. | ||
| 15 | |||
| 16 | === modified file 'libstdc++-v3/acinclude.m4' | ||
| 17 | Index: gcc-4.5/libstdc++-v3/acinclude.m4 | ||
| 18 | =================================================================== | ||
| 19 | --- gcc-4.5.orig/libstdc++-v3/acinclude.m4 | ||
| 20 | +++ gcc-4.5/libstdc++-v3/acinclude.m4 | ||
| 21 | @@ -1740,41 +1740,11 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ | ||
| 22 | if test $enable_clocale_flag = gnu; then | ||
| 23 | AC_EGREP_CPP([_GLIBCXX_ok], [ | ||
| 24 | #include <features.h> | ||
| 25 | - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) | ||
| 26 | + #if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined(__UCLIBC__) | ||
| 27 | _GLIBCXX_ok | ||
| 28 | #endif | ||
| 29 | ], enable_clocale_flag=gnu, enable_clocale_flag=generic) | ||
| 30 | |||
| 31 | - if test $enable_clocale = auto; then | ||
| 32 | - # Test for bugs early in glibc-2.2.x series | ||
| 33 | - AC_TRY_RUN([ | ||
| 34 | - #define _GNU_SOURCE 1 | ||
| 35 | - #include <locale.h> | ||
| 36 | - #include <string.h> | ||
| 37 | - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) | ||
| 38 | - extern __typeof(newlocale) __newlocale; | ||
| 39 | - extern __typeof(duplocale) __duplocale; | ||
| 40 | - extern __typeof(strcoll_l) __strcoll_l; | ||
| 41 | - #endif | ||
| 42 | - int main() | ||
| 43 | - { | ||
| 44 | - const char __one[] = "Äuglein Augmen"; | ||
| 45 | - const char __two[] = "Äuglein"; | ||
| 46 | - int i; | ||
| 47 | - int j; | ||
| 48 | - __locale_t loc; | ||
| 49 | - __locale_t loc_dup; | ||
| 50 | - loc = __newlocale(1 << LC_ALL, "de_DE", 0); | ||
| 51 | - loc_dup = __duplocale(loc); | ||
| 52 | - i = __strcoll_l(__one, __two, loc); | ||
| 53 | - j = __strcoll_l(__one, __two, loc_dup); | ||
| 54 | - return 0; | ||
| 55 | - } | ||
| 56 | - ], | ||
| 57 | - [enable_clocale_flag=gnu],[enable_clocale_flag=generic], | ||
| 58 | - [enable_clocale_flag=generic]) | ||
| 59 | - fi | ||
| 60 | - | ||
| 61 | # Set it to scream when it hurts. | ||
| 62 | ac_save_CFLAGS="$CFLAGS" | ||
| 63 | CFLAGS="-Wimplicit-function-declaration -Werror" | ||
| 64 | Index: gcc-4.5/libstdc++-v3/configure | ||
| 65 | =================================================================== | ||
| 66 | --- gcc-4.5.orig/libstdc++-v3/configure | ||
| 67 | +++ gcc-4.5/libstdc++-v3/configure | ||
| 68 | @@ -15627,7 +15627,7 @@ fi | ||
| 69 | /* end confdefs.h. */ | ||
| 70 | |||
| 71 | #include <features.h> | ||
| 72 | - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) | ||
| 73 | + #if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined(__UCLIBC__) | ||
| 74 | _GLIBCXX_ok | ||
| 75 | #endif | ||
| 76 | |||
| 77 | @@ -15641,49 +15641,6 @@ fi | ||
| 78 | rm -f conftest* | ||
| 79 | |||
| 80 | |||
| 81 | - if test $enable_clocale = auto; then | ||
| 82 | - # Test for bugs early in glibc-2.2.x series | ||
| 83 | - if test "$cross_compiling" = yes; then : | ||
| 84 | - enable_clocale_flag=generic | ||
| 85 | -else | ||
| 86 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 87 | -/* end confdefs.h. */ | ||
| 88 | - | ||
| 89 | - #define _GNU_SOURCE 1 | ||
| 90 | - #include <locale.h> | ||
| 91 | - #include <string.h> | ||
| 92 | - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) | ||
| 93 | - extern __typeof(newlocale) __newlocale; | ||
| 94 | - extern __typeof(duplocale) __duplocale; | ||
| 95 | - extern __typeof(strcoll_l) __strcoll_l; | ||
| 96 | - #endif | ||
| 97 | - int main() | ||
| 98 | - { | ||
| 99 | - const char __one[] = "Äuglein Augmen"; | ||
| 100 | - const char __two[] = "Äuglein"; | ||
| 101 | - int i; | ||
| 102 | - int j; | ||
| 103 | - __locale_t loc; | ||
| 104 | - __locale_t loc_dup; | ||
| 105 | - loc = __newlocale(1 << LC_ALL, "de_DE", 0); | ||
| 106 | - loc_dup = __duplocale(loc); | ||
| 107 | - i = __strcoll_l(__one, __two, loc); | ||
| 108 | - j = __strcoll_l(__one, __two, loc_dup); | ||
| 109 | - return 0; | ||
| 110 | - } | ||
| 111 | - | ||
| 112 | -_ACEOF | ||
| 113 | -if ac_fn_c_try_run "$LINENO"; then : | ||
| 114 | - enable_clocale_flag=gnu | ||
| 115 | -else | ||
| 116 | - enable_clocale_flag=generic | ||
| 117 | -fi | ||
| 118 | -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
| 119 | - conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
| 120 | -fi | ||
| 121 | - | ||
| 122 | - fi | ||
| 123 | - | ||
| 124 | # Set it to scream when it hurts. | ||
| 125 | ac_save_CFLAGS="$CFLAGS" | ||
| 126 | CFLAGS="-Wimplicit-function-declaration -Werror" | ||
| 127 | Index: gcc-4.5/libstdc++-v3/doc/xml/faq.xml | ||
| 128 | =================================================================== | ||
| 129 | --- gcc-4.5.orig/libstdc++-v3/doc/xml/faq.xml | ||
| 130 | +++ gcc-4.5/libstdc++-v3/doc/xml/faq.xml | ||
| 131 | @@ -636,6 +636,8 @@ | ||
| 132 | C library (glibc) version 2.2.5. That version of glibc is over a | ||
| 133 | year old and contains necessary bugfixes. Many GNU/Linux distros make | ||
| 134 | glibc version 2.3.x available now. | ||
| 135 | + libstdc++ 4.6.0 and later require glibc 2.3 or later for this | ||
| 136 | + localization and formatting code. | ||
| 137 | </para> | ||
| 138 | <para>The guideline is simple: the more recent the C++ library, the | ||
| 139 | more recent the C library. (This is also documented in the main | ||
| 140 | Index: gcc-4.5/libstdc++-v3/doc/xml/manual/configure.xml | ||
| 141 | =================================================================== | ||
| 142 | --- gcc-4.5.orig/libstdc++-v3/doc/xml/manual/configure.xml | ||
| 143 | +++ gcc-4.5/libstdc++-v3/doc/xml/manual/configure.xml | ||
| 144 | @@ -113,8 +113,7 @@ | ||
| 145 | <para>If not explicitly specified, the configure proccess tries | ||
| 146 | to guess the most suitable package from the choices above. The | ||
| 147 | default is 'generic'. On glibc-based systems of sufficient | ||
| 148 | - vintage (2.2.5 and newer) and capability (with installed DE and | ||
| 149 | - FR locale data), 'gnu' is automatically selected. This option | ||
| 150 | + vintage (2.3 and newer), 'gnu' is automatically selected. This option | ||
| 151 | can change the library ABI. | ||
| 152 | </para> | ||
| 153 | </listitem></varlistentry> | ||
| 154 | Index: gcc-4.5/libstdc++-v3/doc/xml/manual/prerequisites.xml | ||
| 155 | =================================================================== | ||
| 156 | --- gcc-4.5.orig/libstdc++-v3/doc/xml/manual/prerequisites.xml | ||
| 157 | +++ gcc-4.5/libstdc++-v3/doc/xml/manual/prerequisites.xml | ||
| 158 | @@ -52,16 +52,8 @@ | ||
| 159 | <para> | ||
| 160 | If gcc 3.1.0 or later on is being used on linux, an attempt | ||
| 161 | will be made to use "C" library functionality necessary for | ||
| 162 | - C++ named locale support. For gcc 3.2.1 and later, this | ||
| 163 | - means that glibc 2.2.5 or later is required and the "C" | ||
| 164 | - library de_DE locale information must be installed. | ||
| 165 | - </para> | ||
| 166 | - | ||
| 167 | - <para> | ||
| 168 | - Note however that the sanity checks involving the de_DE | ||
| 169 | - locale are skipped when an explicit --enable-clocale=gnu | ||
| 170 | - configure option is used: only the basic checks are carried | ||
| 171 | - out, defending against misconfigurations. | ||
| 172 | + C++ named locale support. For gcc 4.6.0 and later, this | ||
| 173 | + means that glibc 2.3 or later is required. | ||
| 174 | </para> | ||
| 175 | |||
| 176 | <para> | ||
