Browse Source

Improved gcc to inject nptl cross-compile tweaks through configcache

Note: libc_cv_forced_unwind=yes and libc_cv_c_cleanup=yes" config cache
      variables are needed for all archs if TLS is enabled, and the
      config cache approach seems to be more reliable than patching!
crossperl
Christian Wiese 17 years ago committed by Alejandro Mery
parent
commit
564474a0d9
  1. 5
      base/glibc/glibc.conf
  2. 42
      base/glibc/nptl-force-checks.patch.cross

5
base/glibc/glibc.conf

@ -64,6 +64,11 @@ if [ $SDECFG_PKG_GLIBC_TLS = 1 ]; then
var_append glibc_addons "," "nptl" var_append glibc_addons "," "nptl"
var_append extraconfopt " " "--with-tls" var_append extraconfopt " " "--with-tls"
var_append extraconfopt " " "--with-__thread" var_append extraconfopt " " "--with-__thread"
if atstage cross ; then
var_append configcache ' ' "libc_cv_forced_unwind=yes"
var_append configcache ' ' "libc_cv_c_cleanup=yes"
fi
else else
var_append glibc_addons "," "linuxthreads" var_append glibc_addons "," "linuxthreads"
var_append extraconfopt " " "--without-__thread" var_append extraconfopt " " "--without-__thread"

42
base/glibc/nptl-force-checks.patch.cross

@ -1,42 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../glibc/nptl-force-checks.patch.cross
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Yet another ugly glibc patch for the ugly glibc configure stuff. We
force the nptl checks to succeed during the initial cross tool build,
because without libc the compiler can not link programs that early ...
- Rene Rebe <rene@exactcode.de>
--- libc/nptl/sysdeps/pthread/configure.orig 2003-12-03 07:50:01.000000000 +0100
+++ libc/nptl/sysdeps/pthread/configure 2004-10-31 00:02:50.526362392 +0200
@@ -74,7 +74,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_forced_unwind=no
+libc_cv_forced_unwind=yes
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -139,7 +139,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_c_cleanup=no
+libc_cv_c_cleanup=yes
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
Loading…
Cancel
Save