toolchain/gcc/patches/4.2/100-uclibc-conf.patch

   1 --- gcc/libgomp/configure
   2 +++ gcc/libgomp/configure
   3 @@ -3771,7 +3771,7 @@
   4    ;;
   5
   6  # This must be Linux ELF.
   7 -linux-gnu*)
   8 +linux*)
   9    lt_cv_deplibs_check_method=pass_all
  10    ;;
  11
  12 --- gcc/gcc/config/cris/linux.h
  13 +++ gcc/gcc/config/cris/linux.h
  14 @@ -74,7 +74,11 @@
  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 --- gcc/libstdc++-v3/configure
  28 +++ gcc/libstdc++-v3/configure
  29 @@ -4276,7 +4276,7 @@
  30    ;;
  31
  32  # This must be Linux ELF.
  33 -linux-gnu*)
  34 +linux*)
  35    lt_cv_deplibs_check_method=pass_all
  36    ;;
  37
  38 @@ -99523,7 +99523,7 @@
  39
  40      case "$target" in
  41        *-uclinux*)
  42 -        # Don't enable LFS with uClibc
  43 +        # Don't enable LFS with uClinux
  44          ;;
  45        *)
  46          cat >>confdefs.h <<\_ACEOF
  47 --- gcc/libstdc++-v3/crossconfig.m4
  48 +++ gcc/libstdc++-v3/crossconfig.m4
  49 @@ -161,7 +161,7 @@
  50      AC_DEFINE(HAVE_INT64_T)
  51      case "$target" in
  52        *-uclinux*)
  53 -        # Don't enable LFS with uClibc
  54 +        # Don't enable LFS with uClinux
  55          ;;
  56        *)
  57          AC_DEFINE(_GLIBCXX_USE_LFS)
  58 --- gcc/zlib/configure
  59 +++ gcc/zlib/configure
  60 @@ -3422,7 +3422,7 @@
  61    ;;
  62
  63  # This must be Linux ELF.
  64 -linux-gnu*)
  65 +linux*)
  66    lt_cv_deplibs_check_method=pass_all
  67    ;;
  68
  69 --- gcc/libobjc/configure
  70 +++ gcc/libobjc/configure
  71 @@ -3309,7 +3309,7 @@
  72    ;;
  73
  74  # This must be Linux ELF.
  75 -linux-gnu*)
  76 +linux*)
  77    lt_cv_deplibs_check_method=pass_all
  78    ;;
  79
  80 --- gcc/libgfortran/configure
  81 +++ gcc/libgfortran/configure
  82 @@ -3695,7 +3695,7 @@
  83    ;;
  84
  85  # This must be Linux ELF.
  86 -linux-gnu*)
  87 +linux*)
  88    lt_cv_deplibs_check_method=pass_all
  89    ;;
  90
  91 --- gcc/libmudflap/configure
  92 +++ gcc/libmudflap/configure
  93 @@ -5378,7 +5378,7 @@
  94    ;;
  95
  96  # This must be Linux ELF.
  97 -linux-gnu*)
  98 +linux*)
  99    lt_cv_deplibs_check_method=pass_all
 100    ;;
 101
 102 --- gcc/boehm-gc/configure
 103 +++ gcc/boehm-gc/configure
 104 @@ -4316,7 +4316,7 @@
 105    ;;
 106
 107  # This must be Linux ELF.
 108 -linux-gnu*)
 109 +linux*)
 110    lt_cv_deplibs_check_method=pass_all
 111    ;;
 112
 113 --- gcc/libffi/configure
 114 +++ gcc/libffi/configure
 115 @@ -3453,7 +3453,7 @@
 116    ;;
 117
 118  # This must be Linux ELF.
 119 -linux-gnu*)
 120 +linux*)
 121    lt_cv_deplibs_check_method=pass_all
 122    ;;
 123
 124 --- gcc/libssp/configure
 125 +++ gcc/libssp/configure
 126 @@ -4409,7 +4409,7 @@
 127    ;;
 128
 129  # This must be Linux ELF.
 130 -linux-gnu*)
 131 +linux*)
 132    lt_cv_deplibs_check_method=pass_all
 133    ;;
 134
 135 --- gcc/contrib/regression/objs-gcc.sh
 136 +++ gcc/contrib/regression/objs-gcc.sh
 137 @@ -105,6 +105,10 @@
 138   then
 139    make all-gdb all-dejagnu all-ld || exit 1
 140    make install-gdb install-dejagnu install-ld || exit 1
 141 +elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
 142 + then
 143 +  make all-gdb all-dejagnu all-ld || exit 1
 144 +  make install-gdb install-dejagnu install-ld || exit 1
 145  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
 146    make bootstrap || exit 1
 147    make install || exit 1
 148 --- gcc/libjava/classpath/ltconfig
 149 +++ gcc/libjava/classpath/ltconfig
 150 @@ -603,7 +603,7 @@
 151
 152  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
 153  case $host_os in
 154 -linux-gnu*) ;;
 155 +linux-gnu*|linux-uclibc*) ;;
 156  linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 157  esac
 158
 159 @@ -1251,7 +1251,7 @@
 160    ;;
 161
 162  # This must be Linux ELF.
 163 -linux-gnu*)
 164 +linux*)
 165    version_type=linux
 166    need_lib_prefix=no
 167    need_version=no
 168 --- gcc/libjava/classpath/configure
 169 +++ gcc/libjava/classpath/configure
 170 @@ -4665,7 +4665,7 @@
 171    ;;
 172
 173  # This must be Linux ELF.
 174 -linux-gnu*)
 175 +linux*)
 176    lt_cv_deplibs_check_method=pass_all
 177    ;;
 178
 179 --- gcc/libjava/configure
 180 +++ gcc/libjava/configure
 181 @@ -5212,7 +5212,7 @@
 182    ;;
 183
 184  # This must be Linux ELF.
 185 -linux-gnu*)
 186 +linux*)
 187    lt_cv_deplibs_check_method=pass_all
 188    ;;
 189
 190 --- gcc/libtool.m4
 191 +++ gcc/libtool.m4
 192 @@ -739,7 +739,7 @@
 193    ;;
 194
 195  # This must be Linux ELF.
 196 -linux-gnu*)
 197 +linux*)
 198    lt_cv_deplibs_check_method=pass_all
 199    ;;
 200
 201 --- gcc/ltconfig
 202 +++ gcc/ltconfig
 203 @@ -603,7 +603,7 @@
 204
 205  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
 206  case $host_os in
 207 -linux-gnu*) ;;
 208 +linux-gnu*|linux-uclibc*) ;;
 209  linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 210  esac
 211
 212 @@ -1251,7 +1251,7 @@
 213    ;;
 214
 215  # This must be Linux ELF.
 216 -linux-gnu*)
 217 +linux*)
 218    version_type=linux
 219    need_lib_prefix=no
 220    need_version=no