patches/glibc/2.9/430-2.7-cross-compile-nptl.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jun 08 23:26:54 2010 +0200 (2010-06-08)
changeset 1976 2d90ec981ba3
parent 1201 c9967a6e3b25
permissions -rw-r--r--
config: add support for a second part of the generated choices

Some components have configuration options that can depend on
generic options, so they should go below those.

uClibc for example:
- has its own options (wchar...)
- uses the generic options (threads...)
- if linuxthreads chosen, offers two impls

So we need to be able to split the components options in 2,
one part that is above the generic options, and one part that
ends up below the generic options.
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/5070_all_glibc-2.7-cross-compile-nptl.patch
     2 
     3 -= BEGIN original header =-
     4 A little hack for cross-compiling NPTL
     5 
     6 http://sourceware.org/ml/libc-alpha/2005-02/msg00043.html
     7 
     8 -= END original header =-
     9 
    10 diff -durN glibc-2_9.orig/nptl/sysdeps/pthread/configure glibc-2_9/nptl/sysdeps/pthread/configure
    11 --- glibc-2_9.orig/nptl/sysdeps/pthread/configure	2007-10-17 00:24:30.000000000 +0200
    12 +++ glibc-2_9/nptl/sysdeps/pthread/configure	2009-02-02 22:01:28.000000000 +0100
    13 @@ -78,6 +78,10 @@
    14  fi
    15  { echo "$as_me:$LINENO: result: $libc_cv_forced_unwind" >&5
    16  echo "${ECHO_T}$libc_cv_forced_unwind" >&6; }
    17 +if test $libc_cv_forced_unwind = no -a $build_cpu != $host_cpu; then
    18 +  echo "$as_me:$LINENO: forcing libc_cv_forced_unwind = yes for cross-compile"
    19 +  libc_cv_forced_unwind=yes
    20 +fi
    21  if test $libc_cv_forced_unwind = yes; then
    22    cat >>confdefs.h <<\_ACEOF
    23  #define HAVE_FORCED_UNWIND 1
    24 @@ -141,6 +145,10 @@
    25  { echo "$as_me:$LINENO: result: $libc_cv_c_cleanup" >&5
    26  echo "${ECHO_T}$libc_cv_c_cleanup" >&6; }
    27    CFLAGS="$old_CFLAGS"
    28 +  if test $libc_cv_c_cleanup = no -a $build_cpu != $host_cpu; then
    29 +    echo "$as_me:$LINENO: result: forcing libc_cv_c_cleanup = yes for cross-compile"
    30 +    libc_cv_c_cleanup=yes
    31 +  fi
    32    if test $libc_cv_c_cleanup = no; then
    33      { { echo "$as_me:$LINENO: error: the compiler must support C cleanup handling" >&5
    34  echo "$as_me: error: the compiler must support C cleanup handling" >&2;}
    35 diff -durN glibc-2_9.orig/nptl/sysdeps/pthread/configure.in glibc-2_9/nptl/sysdeps/pthread/configure.in
    36 --- glibc-2_9.orig/nptl/sysdeps/pthread/configure.in	2003-12-03 07:50:01.000000000 +0100
    37 +++ glibc-2_9/nptl/sysdeps/pthread/configure.in	2009-02-02 22:01:28.000000000 +0100
    38 @@ -28,6 +28,9 @@
    39  struct _Unwind_Context *context;
    40  _Unwind_GetCFA (context)],
    41  libc_cv_forced_unwind=yes, libc_cv_forced_unwind=no)])
    42 +if test $libc_cv_forced_unwind = no -a $build_cpu != $host_cpu; then
    43 +  libc_cv_forced_unwind=yes
    44 +fi
    45  if test $libc_cv_forced_unwind = yes; then
    46    AC_DEFINE(HAVE_FORCED_UNWIND)
    47  dnl Check for C cleanup handling.
    48 @@ -41,6 +44,9 @@
    49    puts ("test")],
    50  libc_cv_c_cleanup=yes, libc_cv_c_cleanup=no)])
    51    CFLAGS="$old_CFLAGS"
    52 +  if test $libc_cv_c_cleanup = no -a $build_cpu != $host_cpu; then
    53 +    libc_cv_c_cleanup=yes
    54 +  fi
    55    if test $libc_cv_c_cleanup = no; then
    56      AC_MSG_ERROR([the compiler must support C cleanup handling])
    57    fi