1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/4.2.0/100-uclibc-conf.patch	Tue Jan 12 19:24:03 2010 +0100
     1.3 @@ -0,0 +1,200 @@
     1.4 +--- gcc/libgomp/configure
     1.5 ++++ gcc/libgomp/configure
     1.6 +@@ -3771,7 +3771,7 @@
     1.7 +   ;;
     1.8 + 
     1.9 + # This must be Linux ELF.
    1.10 +-linux-gnu*)
    1.11 ++linux*)
    1.12 +   lt_cv_deplibs_check_method=pass_all
    1.13 +   ;;
    1.14 + 
    1.15 +--- gcc/gcc/config/cris/linux.h
    1.16 ++++ gcc/gcc/config/cris/linux.h
    1.17 +@@ -74,7 +74,11 @@
    1.18 + #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
    1.19 + 
    1.20 + #undef CRIS_SUBTARGET_VERSION
    1.21 +-#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
    1.22 ++#if UCLIBC_DEFAULT
    1.23 ++# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
    1.24 ++#else
    1.25 ++# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
    1.26 ++#endif
    1.27 + 
    1.28 + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    1.29 + 
    1.30 +--- gcc/libstdc++-v3/configure
    1.31 ++++ gcc/libstdc++-v3/configure
    1.32 +@@ -4276,7 +4276,7 @@
    1.33 +   ;;
    1.34 + 
    1.35 + # This must be Linux ELF.
    1.36 +-linux-gnu*)
    1.37 ++linux*)
    1.38 +   lt_cv_deplibs_check_method=pass_all
    1.39 +   ;;
    1.40 + 
    1.41 +--- gcc/zlib/configure
    1.42 ++++ gcc/zlib/configure
    1.43 +@@ -3422,7 +3422,7 @@
    1.44 +   ;;
    1.45 + 
    1.46 + # This must be Linux ELF.
    1.47 +-linux-gnu*)
    1.48 ++linux*)
    1.49 +   lt_cv_deplibs_check_method=pass_all
    1.50 +   ;;
    1.51 + 
    1.52 +--- gcc/libobjc/configure
    1.53 ++++ gcc/libobjc/configure
    1.54 +@@ -3309,7 +3309,7 @@
    1.55 +   ;;
    1.56 + 
    1.57 + # This must be Linux ELF.
    1.58 +-linux-gnu*)
    1.59 ++linux*)
    1.60 +   lt_cv_deplibs_check_method=pass_all
    1.61 +   ;;
    1.62 + 
    1.63 +--- gcc/libgfortran/configure
    1.64 ++++ gcc/libgfortran/configure
    1.65 +@@ -3695,7 +3695,7 @@
    1.66 +   ;;
    1.67 + 
    1.68 + # This must be Linux ELF.
    1.69 +-linux-gnu*)
    1.70 ++linux*)
    1.71 +   lt_cv_deplibs_check_method=pass_all
    1.72 +   ;;
    1.73 + 
    1.74 +--- gcc/libmudflap/configure
    1.75 ++++ gcc/libmudflap/configure
    1.76 +@@ -5378,7 +5378,7 @@
    1.77 +   ;;
    1.78 + 
    1.79 + # This must be Linux ELF.
    1.80 +-linux-gnu*)
    1.81 ++linux*)
    1.82 +   lt_cv_deplibs_check_method=pass_all
    1.83 +   ;;
    1.84 + 
    1.85 +--- gcc/boehm-gc/configure
    1.86 ++++ gcc/boehm-gc/configure
    1.87 +@@ -4316,7 +4316,7 @@
    1.88 +   ;;
    1.89 + 
    1.90 + # This must be Linux ELF.
    1.91 +-linux-gnu*)
    1.92 ++linux*)
    1.93 +   lt_cv_deplibs_check_method=pass_all
    1.94 +   ;;
    1.95 + 
    1.96 +--- gcc/libffi/configure
    1.97 ++++ gcc/libffi/configure
    1.98 +@@ -3453,7 +3453,7 @@
    1.99 +   ;;
   1.100 + 
   1.101 + # This must be Linux ELF.
   1.102 +-linux-gnu*)
   1.103 ++linux*)
   1.104 +   lt_cv_deplibs_check_method=pass_all
   1.105 +   ;;
   1.106 + 
   1.107 +--- gcc/libssp/configure
   1.108 ++++ gcc/libssp/configure
   1.109 +@@ -4409,7 +4409,7 @@
   1.110 +   ;;
   1.111 + 
   1.112 + # This must be Linux ELF.
   1.113 +-linux-gnu*)
   1.114 ++linux*)
   1.115 +   lt_cv_deplibs_check_method=pass_all
   1.116 +   ;;
   1.117 + 
   1.118 +--- gcc/contrib/regression/objs-gcc.sh
   1.119 ++++ gcc/contrib/regression/objs-gcc.sh
   1.120 +@@ -105,6 +105,10 @@
   1.121 +  then
   1.122 +   make all-gdb all-dejagnu all-ld || exit 1
   1.123 +   make install-gdb install-dejagnu install-ld || exit 1
   1.124 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
   1.125 ++ then
   1.126 ++  make all-gdb all-dejagnu all-ld || exit 1
   1.127 ++  make install-gdb install-dejagnu install-ld || exit 1
   1.128 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
   1.129 +   make bootstrap || exit 1
   1.130 +   make install || exit 1
   1.131 +--- gcc/libjava/classpath/ltconfig
   1.132 ++++ gcc/libjava/classpath/ltconfig
   1.133 +@@ -603,7 +603,7 @@
   1.134 + 
   1.135 + # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
   1.136 + case $host_os in
   1.137 +-linux-gnu*) ;;
   1.138 ++linux-gnu*|linux-uclibc*) ;;
   1.139 + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
   1.140 + esac
   1.141 + 
   1.142 +@@ -1251,7 +1251,7 @@
   1.143 +   ;;
   1.144 + 
   1.145 + # This must be Linux ELF.
   1.146 +-linux-gnu*)
   1.147 ++linux*)
   1.148 +   version_type=linux
   1.149 +   need_lib_prefix=no
   1.150 +   need_version=no
   1.151 +--- gcc/libjava/classpath/configure
   1.152 ++++ gcc/libjava/classpath/configure
   1.153 +@@ -4665,7 +4665,7 @@
   1.154 +   ;;
   1.155 + 
   1.156 + # This must be Linux ELF.
   1.157 +-linux-gnu*)
   1.158 ++linux*)
   1.159 +   lt_cv_deplibs_check_method=pass_all
   1.160 +   ;;
   1.161 + 
   1.162 +--- gcc/libjava/configure
   1.163 ++++ gcc/libjava/configure
   1.164 +@@ -5212,7 +5212,7 @@
   1.165 +   ;;
   1.166 + 
   1.167 + # This must be Linux ELF.
   1.168 +-linux-gnu*)
   1.169 ++linux*)
   1.170 +   lt_cv_deplibs_check_method=pass_all
   1.171 +   ;;
   1.172 + 
   1.173 +--- gcc/libtool.m4
   1.174 ++++ gcc/libtool.m4
   1.175 +@@ -739,7 +739,7 @@
   1.176 +   ;;
   1.177 + 
   1.178 + # This must be Linux ELF.
   1.179 +-linux-gnu*)
   1.180 ++linux*)
   1.181 +   lt_cv_deplibs_check_method=pass_all
   1.182 +   ;;
   1.183 + 
   1.184 +--- gcc/ltconfig
   1.185 ++++ gcc/ltconfig
   1.186 +@@ -603,7 +603,7 @@
   1.187 + 
   1.188 + # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
   1.189 + case $host_os in
   1.190 +-linux-gnu*) ;;
   1.191 ++linux-gnu*|linux-uclibc*) ;;
   1.192 + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
   1.193 + esac
   1.194 + 
   1.195 +@@ -1251,7 +1251,7 @@
   1.196 +   ;;
   1.197 + 
   1.198 + # This must be Linux ELF.
   1.199 +-linux-gnu*)
   1.200 ++linux*)
   1.201 +   version_type=linux
   1.202 +   need_lib_prefix=no
   1.203 +   need_version=no