patches/gcc/4.2.0/100-uclibc-conf.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jul 17 17:54:21 2011 +0200 (2011-07-17)
changeset 2888 dd71df95903a
permissions -rw-r--r--
cc/gcc: pass the companion libs prefix to cc_core

In case of canadian-cross, the companion libraries are not the same for
the core cc (they run on 'build') as they are for the final cc (they run
on 'host').

Prepare for this differentiation (coming later), while retaining the
current behavior (to use the same compblibs).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     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 --- gcc/zlib/configure
    39 +++ gcc/zlib/configure
    40 @@ -3422,7 +3422,7 @@
    41    ;;
    42  
    43  # This must be Linux ELF.
    44 -linux-gnu*)
    45 +linux*)
    46    lt_cv_deplibs_check_method=pass_all
    47    ;;
    48  
    49 --- gcc/libobjc/configure
    50 +++ gcc/libobjc/configure
    51 @@ -3309,7 +3309,7 @@
    52    ;;
    53  
    54  # This must be Linux ELF.
    55 -linux-gnu*)
    56 +linux*)
    57    lt_cv_deplibs_check_method=pass_all
    58    ;;
    59  
    60 --- gcc/libgfortran/configure
    61 +++ gcc/libgfortran/configure
    62 @@ -3695,7 +3695,7 @@
    63    ;;
    64  
    65  # This must be Linux ELF.
    66 -linux-gnu*)
    67 +linux*)
    68    lt_cv_deplibs_check_method=pass_all
    69    ;;
    70  
    71 --- gcc/libmudflap/configure
    72 +++ gcc/libmudflap/configure
    73 @@ -5378,7 +5378,7 @@
    74    ;;
    75  
    76  # This must be Linux ELF.
    77 -linux-gnu*)
    78 +linux*)
    79    lt_cv_deplibs_check_method=pass_all
    80    ;;
    81  
    82 --- gcc/boehm-gc/configure
    83 +++ gcc/boehm-gc/configure
    84 @@ -4316,7 +4316,7 @@
    85    ;;
    86  
    87  # This must be Linux ELF.
    88 -linux-gnu*)
    89 +linux*)
    90    lt_cv_deplibs_check_method=pass_all
    91    ;;
    92  
    93 --- gcc/libffi/configure
    94 +++ gcc/libffi/configure
    95 @@ -3453,7 +3453,7 @@
    96    ;;
    97  
    98  # This must be Linux ELF.
    99 -linux-gnu*)
   100 +linux*)
   101    lt_cv_deplibs_check_method=pass_all
   102    ;;
   103  
   104 --- gcc/libssp/configure
   105 +++ gcc/libssp/configure
   106 @@ -4409,7 +4409,7 @@
   107    ;;
   108  
   109  # This must be Linux ELF.
   110 -linux-gnu*)
   111 +linux*)
   112    lt_cv_deplibs_check_method=pass_all
   113    ;;
   114  
   115 --- gcc/contrib/regression/objs-gcc.sh
   116 +++ gcc/contrib/regression/objs-gcc.sh
   117 @@ -105,6 +105,10 @@
   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 --- gcc/libjava/classpath/ltconfig
   129 +++ gcc/libjava/classpath/ltconfig
   130 @@ -603,7 +603,7 @@
   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 @@
   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 --- gcc/libjava/classpath/configure
   149 +++ gcc/libjava/classpath/configure
   150 @@ -4665,7 +4665,7 @@
   151    ;;
   152  
   153  # This must be Linux ELF.
   154 -linux-gnu*)
   155 +linux*)
   156    lt_cv_deplibs_check_method=pass_all
   157    ;;
   158  
   159 --- gcc/libjava/configure
   160 +++ gcc/libjava/configure
   161 @@ -5212,7 +5212,7 @@
   162    ;;
   163  
   164  # This must be Linux ELF.
   165 -linux-gnu*)
   166 +linux*)
   167    lt_cv_deplibs_check_method=pass_all
   168    ;;
   169  
   170 --- gcc/libtool.m4
   171 +++ gcc/libtool.m4
   172 @@ -739,7 +739,7 @@
   173    ;;
   174  
   175  # This must be Linux ELF.
   176 -linux-gnu*)
   177 +linux*)
   178    lt_cv_deplibs_check_method=pass_all
   179    ;;
   180  
   181 --- gcc/ltconfig
   182 +++ gcc/ltconfig
   183 @@ -603,7 +603,7 @@
   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 @@ -1251,7 +1251,7 @@
   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