| 1 | --- a/libgomp/configure |
| 2 | +++ b/libgomp/configure |
| 3 | @@ -3893,7 +3893,7 @@ irix5* | irix6*) |
| 4 | ;; |
| 5 | |
| 6 | # This must be Linux ELF. |
| 7 | -linux-gnu*) |
| 8 | +linux*) |
| 9 | lt_cv_deplibs_check_method=pass_all |
| 10 | ;; |
| 11 | |
| 12 | --- a/gcc/config/cris/linux.h |
| 13 | +++ b/gcc/config/cris/linux.h |
| 14 | @@ -74,7 +74,11 @@ Boston, MA 02110-1301, USA. */ |
| 15 | #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG |
| 16 | |
| 17 | #undef CRIS_SUBTARGET_VERSION |
| 18 | -#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu" |
| 19 | +#if UCLIBC_DEFAULT |
| 20 | +# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc" |
| 21 | +#else |
| 22 | +# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu" |
| 23 | +#endif |
| 24 | |
| 25 | #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" |
| 26 | |
| 27 | --- a/libstdc++-v3/configure |
| 28 | +++ b/libstdc++-v3/configure |
| 29 | @@ -4283,7 +4283,7 @@ irix5* | irix6*) |
| 30 | ;; |
| 31 | |
| 32 | # This must be Linux ELF. |
| 33 | -linux-gnu*) |
| 34 | +linux*) |
| 35 | lt_cv_deplibs_check_method=pass_all |
| 36 | ;; |
| 37 | |
| 38 | --- a/zlib/configure |
| 39 | +++ b/zlib/configure |
| 40 | @@ -3429,7 +3429,7 @@ irix5* | irix6*) |
| 41 | ;; |
| 42 | |
| 43 | # This must be Linux ELF. |
| 44 | -linux-gnu*) |
| 45 | +linux*) |
| 46 | lt_cv_deplibs_check_method=pass_all |
| 47 | ;; |
| 48 | |
| 49 | --- a/libobjc/configure |
| 50 | +++ b/libobjc/configure |
| 51 | @@ -3314,7 +3314,7 @@ irix5* | irix6*) |
| 52 | ;; |
| 53 | |
| 54 | # This must be Linux ELF. |
| 55 | -linux-gnu*) |
| 56 | +linux*) |
| 57 | lt_cv_deplibs_check_method=pass_all |
| 58 | ;; |
| 59 | |
| 60 | --- a/libgfortran/configure |
| 61 | +++ b/libgfortran/configure |
| 62 | @@ -3721,7 +3721,7 @@ irix5* | irix6*) |
| 63 | ;; |
| 64 | |
| 65 | # This must be Linux ELF. |
| 66 | -linux-gnu*) |
| 67 | +linux*) |
| 68 | lt_cv_deplibs_check_method=pass_all |
| 69 | ;; |
| 70 | |
| 71 | --- a/libmudflap/configure |
| 72 | +++ b/libmudflap/configure |
| 73 | @@ -5394,7 +5394,7 @@ irix5* | irix6*) |
| 74 | ;; |
| 75 | |
| 76 | # This must be Linux ELF. |
| 77 | -linux-gnu*) |
| 78 | +linux*) |
| 79 | lt_cv_deplibs_check_method=pass_all |
| 80 | ;; |
| 81 | |
| 82 | --- a/boehm-gc/configure |
| 83 | +++ b/boehm-gc/configure |
| 84 | @@ -4323,7 +4323,7 @@ irix5* | irix6*) |
| 85 | ;; |
| 86 | |
| 87 | # This must be Linux ELF. |
| 88 | -linux-gnu*) |
| 89 | +linux*) |
| 90 | lt_cv_deplibs_check_method=pass_all |
| 91 | ;; |
| 92 | |
| 93 | --- a/libffi/configure |
| 94 | +++ b/libffi/configure |
| 95 | @@ -3460,7 +3460,7 @@ irix5* | irix6*) |
| 96 | ;; |
| 97 | |
| 98 | # This must be Linux ELF. |
| 99 | -linux-gnu*) |
| 100 | +linux*) |
| 101 | lt_cv_deplibs_check_method=pass_all |
| 102 | ;; |
| 103 | |
| 104 | --- a/libssp/configure |
| 105 | +++ b/libssp/configure |
| 106 | @@ -4482,7 +4482,7 @@ irix5* | irix6*) |
| 107 | ;; |
| 108 | |
| 109 | # This must be Linux ELF. |
| 110 | -linux-gnu*) |
| 111 | +linux*) |
| 112 | lt_cv_deplibs_check_method=pass_all |
| 113 | ;; |
| 114 | |
| 115 | --- a/contrib/regression/objs-gcc.sh |
| 116 | +++ b/contrib/regression/objs-gcc.sh |
| 117 | @@ -105,6 +105,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H |
| 118 | then |
| 119 | make all-gdb all-dejagnu all-ld || exit 1 |
| 120 | make install-gdb install-dejagnu install-ld || exit 1 |
| 121 | +elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] |
| 122 | + then |
| 123 | + make all-gdb all-dejagnu all-ld || exit 1 |
| 124 | + make install-gdb install-dejagnu install-ld || exit 1 |
| 125 | elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then |
| 126 | make bootstrap || exit 1 |
| 127 | make install || exit 1 |
| 128 | --- a/libjava/classpath/ltconfig |
| 129 | +++ b/libjava/classpath/ltconfig |
| 130 | @@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- |
| 131 | |
| 132 | # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 133 | case $host_os in |
| 134 | -linux-gnu*) ;; |
| 135 | +linux-gnu*|linux-uclibc*) ;; |
| 136 | linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 137 | esac |
| 138 | |
| 139 | @@ -1251,7 +1251,7 @@ linux-gnuoldld* | linux-gnuaout* | linux |
| 140 | ;; |
| 141 | |
| 142 | # This must be Linux ELF. |
| 143 | -linux-gnu*) |
| 144 | +linux*) |
| 145 | version_type=linux |
| 146 | need_lib_prefix=no |
| 147 | need_version=no |
| 148 | --- a/libjava/classpath/configure |
| 149 | +++ b/libjava/classpath/configure |
| 150 | @@ -5307,7 +5307,7 @@ irix5* | irix6*) |
| 151 | ;; |
| 152 | |
| 153 | # This must be Linux ELF. |
| 154 | -linux-gnu*) |
| 155 | +linux*) |
| 156 | lt_cv_deplibs_check_method=pass_all |
| 157 | ;; |
| 158 | |
| 159 | --- a/libjava/configure |
| 160 | +++ b/libjava/configure |
| 161 | @@ -5424,7 +5424,7 @@ irix5* | irix6*) |
| 162 | ;; |
| 163 | |
| 164 | # This must be Linux ELF. |
| 165 | -linux-gnu*) |
| 166 | +linux*) |
| 167 | lt_cv_deplibs_check_method=pass_all |
| 168 | ;; |
| 169 | |
| 170 | --- a/libtool.m4 |
| 171 | +++ b/libtool.m4 |
| 172 | @@ -739,7 +739,7 @@ irix5* | irix6*) |
| 173 | ;; |
| 174 | |
| 175 | # This must be Linux ELF. |
| 176 | -linux-gnu*) |
| 177 | +linux*) |
| 178 | lt_cv_deplibs_check_method=pass_all |
| 179 | ;; |
| 180 | |
| 181 | --- a/ltconfig |
| 182 | +++ b/ltconfig |
| 183 | @@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- |
| 184 | |
| 185 | # Transform linux* to *-*-linux-gnu*, to support old configure scripts. |
| 186 | case $host_os in |
| 187 | -linux-gnu*) ;; |
| 188 | +linux-gnu*|linux-uclibc*) ;; |
| 189 | linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
| 190 | esac |
| 191 | |
| 192 | @@ -1253,7 +1253,7 @@ linux-gnuoldld* | linux-gnuaout* | linux |
| 193 | ;; |
| 194 | |
| 195 | # This must be Linux ELF. |
| 196 | -linux-gnu*) |
| 197 | +linux*) |
| 198 | version_type=linux |
| 199 | need_lib_prefix=no |
| 200 | need_version=no |
| 201 | |