r5610 - in glibc-package/trunk/debian: . debhelper.in patches/kfreebsd sysdeps
Author: ps-guest
Date: 2013-05-31 15:38:17 +0000 (Fri, 31 May 2013)
New Revision: 5610
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/sysdeps/kfreebsd.mk
Log:
bump minimal FreeBSD kernel version to 8.3, update sysdeps.diff from glibc-bsd
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-28 16:18:00 UTC (rev 5609)
+++ glibc-package/trunk/debian/changelog 2013-05-31 15:38:17 UTC (rev 5610)
@@ -5,7 +5,10 @@
all {Build-,}Essential and available in oldstable (Closes: #708504)
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 4485 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 4511 (from glibc-bsd).
+ Closes: #635192. Closes: #667448.
+ * debian/sysdeps/kfreebsd.mk, debian/debhelper.in/libc.preinst:
+ bump minimal FreeBSD kernel version to 8.3.
-- Adam Conrad <adconrad@0c3.net> Thu, 16 May 2013 16:09:55 -0600
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2013-05-28 16:18:00 UTC (rev 5609)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2013-05-31 15:38:17 UTC (rev 5610)
@@ -406,10 +406,10 @@
fi
elif [ $system = "GNU/kFreeBSD" ] ; then
kernel_ver=`uname -r`
- if kfreebsd_compare_versions "$kernel_ver" lt 8.1
+ if kfreebsd_compare_versions "$kernel_ver" lt 8.3
then
echo WARNING: this version of the GNU libc requires kernel version
- echo 8.1 or later. Please upgrade your kernel before installing
+ echo 8.3 or later. Please upgrade your kernel before installing
echo glibc.
exit 1
fi
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2013-05-28 16:18:00 UTC (rev 5609)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2013-05-31 15:38:17 UTC (rev 5610)
@@ -897,7 +897,7 @@
+
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/fcntl.h
-@@ -0,0 +1,227 @@
+@@ -0,0 +1,226 @@
+/* O_*, F_*, FD_* bit values for FreeBSD.
+ Copyright (C) 1991-1992, 1997-2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -983,8 +983,7 @@
+#if defined (__USE_XOPEN2K8) || defined (__USE_BSD)
+/* Defined by POSIX 1003.1-2008; BSD default, but reserve for future use. */
+#define O_TTY_INIT 0x00080000 /* Restore default termios attributes */
-+/* Defining O_CLOEXEC would break kfreebsd 8.1, see #635192 */
-+/* #define O_CLOEXEC 0x00100000 */
++#define O_CLOEXEC 0x00100000
+#endif
+
+/* For now FreeBSD has synchronisity options for data and read operations.
@@ -5303,7 +5302,7 @@
+weak_alias (__clone, clone)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure
-@@ -0,0 +1,342 @@
+@@ -0,0 +1,432 @@
+# This file is generated from configure.in by Autoconf. DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/bsd/bsd4.4/kfreebsd.
+
@@ -5328,78 +5327,180 @@
+fi
+
+
-+echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+if test "${ac_cv_prog_egrep+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+else
-+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+ then ac_cv_prog_egrep='grep -E'
-+ else ac_cv_prog_egrep='egrep'
++ if test -z "$GREP"; then
++ ac_path_GREP_found=false
++ # Loop through the user's path and test for each of PROGNAME-LIST
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in grep ggrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
++ # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++ ac_count=0
++ $as_echo_n 0123456789 >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ $as_echo 'GREP' >> "conftest.nl"
++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ as_fn_arith $ac_count + 1 && ac_count=$as_val
++ if test $ac_count -gt ${ac_path_GREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_GREP="$ac_path_GREP"
++ ac_path_GREP_max=$ac_count
+ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++ $ac_path_GREP_found && break 3
++ done
++ done
++ done
++IFS=$as_save_IFS
++ if test -z "$ac_cv_path_GREP"; then
++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ fi
++else
++ ac_cv_path_GREP=$GREP
+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
+
-+echo "$as_me:$LINENO: checking installed kFreeBSD kernel header files" >&5
-+echo $ECHO_N "checking installed kFreeBSD kernel header files... $ECHO_C" >&6
-+if test "${libc_cv_kfreebsd810+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++ then ac_cv_path_EGREP="$GREP -E"
++ else
++ if test -z "$EGREP"; then
++ ac_path_EGREP_found=false
++ # Loop through the user's path and test for each of PROGNAME-LIST
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in egrep; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++ # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++ ac_count=0
++ $as_echo_n 0123456789 >"conftest.in"
++ while :
++ do
++ cat "conftest.in" "conftest.in" >"conftest.tmp"
++ mv "conftest.tmp" "conftest.in"
++ cp "conftest.in" "conftest.nl"
++ $as_echo 'EGREP' >> "conftest.nl"
++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++ as_fn_arith $ac_count + 1 && ac_count=$as_val
++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++ # Best one so far, save it but keep looking for a better one
++ ac_cv_path_EGREP="$ac_path_EGREP"
++ ac_path_EGREP_max=$ac_count
++ fi
++ # 10*(2^10) chars as input seems more than enough
++ test $ac_count -gt 10 && break
++ done
++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++ $ac_path_EGREP_found && break 3
++ done
++ done
++ done
++IFS=$as_save_IFS
++ if test -z "$ac_cv_path_EGREP"; then
++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ fi
++else
++ ac_cv_path_EGREP=$EGREP
++fi
++
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking installed kFreeBSD kernel header files" >&5
++$as_echo_n "checking installed kFreeBSD kernel header files... " >&6; }
++if test "${libc_cv_kfreebsd830+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <osreldate.h>
+#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
+#define __FreeBSD_kernel_version __FreeBSD_version
+#endif
-+#if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version < (8 *100000+ 1 *1000+ 0) /* 8.1.0 */
++#if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version < (8 *100000+ 3 *1000+ 0) /* 8.3.0 */
+eat flaming death
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "eat flaming death" >/dev/null 2>&1; then
-+ libc_cv_kfreebsd810='TOO OLD!'
++ $EGREP "eat flaming death" >/dev/null 2>&1; then :
++ libc_cv_kfreebsd830='TOO OLD!'
+else
-+ libc_cv_kfreebsd810='8.1.0 or later'
++ libc_cv_kfreebsd830='8.3.0 or later'
+fi
+rm -f conftest*
+
+fi
-+echo "$as_me:$LINENO: result: $libc_cv_kfreebsd810" >&5
-+echo "${ECHO_T}$libc_cv_kfreebsd810" >&6
-+if test "$libc_cv_kfreebsd810" != '8.1.0 or later'; then
-+ { { echo "$as_me:$LINENO: error: GNU libc requires kernel header files from
-+kFreeBSD 8.1.0 or later to be installed before configuring.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_kfreebsd830" >&5
++$as_echo "$libc_cv_kfreebsd830" >&6; }
++if test "$libc_cv_kfreebsd830" != '8.3.0 or later'; then
++ as_fn_error "GNU libc requires kernel header files from
++kFreeBSD 8.3.0 or later to be installed before configuring.
+The kernel header files are found usually in /usr/src/sys/; make sure
-+these directories use files from kFreeBSD 8.1.0 or later.
++these directories use files from kFreeBSD 8.3.0 or later.
+This check uses <osreldate.h>, so
+make sure that file was built correctly when installing the kernel header
+files. To use kernel headers not from /usr/src/sys/, use the
-+configure option --with-headers." >&5
-+echo "$as_me: error: GNU libc requires kernel header files from
-+kFreeBSD 8.1.0 or later to be installed before configuring.
-+The kernel header files are found usually in /usr/src/sys/; make sure
-+these directories use files from kFreeBSD 8.1.0 or later.
-+This check uses <osreldate.h>, so
-+make sure that file was built correctly when installing the kernel header
-+files. To use kernel headers not from /usr/src/sys/, use the
-+configure option --with-headers." >&2;}
-+ { (exit 1); exit 1; }; }
++configure option --with-headers." "$LINENO" 5
+fi
+
-+# Check whether --enable-compatible-utmp or --disable-compatible-utmp was given.
-+if test "${enable_compatible_utmp+set}" = set; then
-+ enableval="$enable_compatible_utmp"
-+ enable_utmp_compat=$enableval
++# Check whether --enable-compatible-utmp was given.
++if test "${enable_compatible_utmp+set}" = set; then :
++ enableval=$enable_compatible_utmp; enable_utmp_compat=$enableval
+else
+ enable_utmp_compat=no
-+fi;
++fi
++
+if test "$enable_utmp_compat" = no; then
+ utmp_subdir=utmp-utmpx
+else
@@ -5417,13 +5518,13 @@
+case "$machine" in
+ i386*)
+ libc_cv_gcc_unwind_find_fde=yes
-+ arch_minimum_kernel=8.1.0
++ arch_minimum_kernel=8.3.0
+ ;;
+ x86_64*)
-+ arch_minimum_kernel=8.1.0
++ arch_minimum_kernel=8.3.0
+ ;;
+ *)
-+ arch_minimum_kernel=8.1.0
++ arch_minimum_kernel=8.3.0
+ ;;
+esac
+if test -n "$minimum_kernel"; then
@@ -5432,27 +5533,23 @@
+ arch_version=$((`echo "$arch_minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
+
+ if test $user_version -lt $arch_version; then
-+ { echo "$as_me:$LINENO: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
-+echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
++$as_echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
+ minimum_kernel=$arch_minimum_kernel
+ fi
+else
-+ if test $arch_minimum_kernel != '8.1.0'; then
++ if test $arch_minimum_kernel != '8.3.0'; then
+ minimum_kernel=$arch_minimum_kernel
+ fi
+fi
+
+if test -n "$minimum_kernel"; then
-+ echo "$as_me:$LINENO: checking for kernel header at least $minimum_kernel" >&5
-+echo $ECHO_N "checking for kernel header at least $minimum_kernel... $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5
++$as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; }
+ hdrnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 100000 + \2 * 1000 + \3)/'`;
+ decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
+ abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <osreldate.h>
+#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
@@ -5463,15 +5560,15 @@
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "eat flaming death" >/dev/null 2>&1; then
++ $EGREP "eat flaming death" >/dev/null 2>&1; then :
+ libc_minimum_kernel='too old!'
+else
+ libc_minimum_kernel=ok
+fi
+rm -f conftest*
+
-+ echo "$as_me:$LINENO: result: $libc_minimum_kernel" >&5
-+echo "${ECHO_T}$libc_minimum_kernel" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_minimum_kernel" >&5
++$as_echo "$libc_minimum_kernel" >&6; }
+ if test "$libc_minimum_kernel" = ok; then
+ cat >>confdefs.h <<_ACEOF
+#define __KFREEBSD_KERNEL_VERSION $decnum
@@ -5482,11 +5579,8 @@
+_ACEOF
+
+ else
-+ { { echo "$as_me:$LINENO: error: *** The available kernel headers are older than the requested
-+*** compatible kernel version" >&5
-+echo "$as_me: error: *** The available kernel headers are older than the requested
-+*** compatible kernel version" >&2;}
-+ { (exit 1); exit 1; }; }
++ as_fn_error "*** The available kernel headers are older than the requested
++*** compatible kernel version" "$LINENO" 5
+ fi
+fi
+
@@ -5596,6 +5690,7 @@
+use_ldconfig=yes
+
+# We need some extensions to the `ldd' script.
++
+case "$machine" in
+ x86_64*)
+ ldd_rewrite_script=$dir/x86_64/ldd-rewrite.sed
@@ -5614,8 +5709,8 @@
+ else
+ ac_prefix=$ac_default_prefix
+ fi
-+ echo "$as_me:$LINENO: checking for symlinks in ${ac_prefix}/include" >&5
-+echo $ECHO_N "checking for symlinks in ${ac_prefix}/include... $ECHO_C" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symlinks in ${ac_prefix}/include" >&5
++$as_echo_n "checking for symlinks in ${ac_prefix}/include... " >&6; }
+ ac_message=
+ if test -L ${ac_prefix}/include/net; then
+ ac_message="$ac_message
@@ -5626,29 +5721,23 @@
+ ${ac_prefix}/include/scsi is a symlink"
+ fi
+ if test -n "$ac_message"; then
-+ { { echo "$as_me:$LINENO: error: $ac_message
++ as_fn_error "$ac_message
+\`make install' will destroy the target of the link(s).
+Delete the links and re-run configure, or better still, move the entire
-+${ac_prefix}/include directory out of the way." >&5
-+echo "$as_me: error: $ac_message
-+\`make install' will destroy the target of the link(s).
-+Delete the links and re-run configure, or better still, move the entire
-+${ac_prefix}/include directory out of the way." >&2;}
-+ { (exit 1); exit 1; }; }
++${ac_prefix}/include directory out of the way." "$LINENO" 5
+ else
-+ echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
++$as_echo "ok" >&6; }
+ fi
+fi
+
+# We support internal syscalls.
+# It is advertised as inlined syscalls availability ...
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_INLINED_SYSCALLS 1
-+_ACEOF
++$as_echo "#define HAVE_INLINED_SYSCALLS 1" >>confdefs.h
++
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/configure.in
-@@ -0,0 +1,266 @@
+@@ -0,0 +1,267 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/bsd/bsd4.4/kfreebsd.
+
@@ -5669,7 +5758,7 @@
+# existing system library, because we are the only system library.
+inhibit_glue=yes
+
-+define([LIBC_KFREEBSD_VERSION],[6.0.0])dnl
++define([LIBC_KFREEBSD_VERSION],[8.3.0])dnl
+if test -n "$sysheaders"; then
+ OLD_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
@@ -5698,10 +5787,11 @@
+configure option --with-headers.])
+fi
+
-+AC_ARG_ENABLE(compatible-utmp, dnl
-+[ --disable-compatible-utmp use a struct utmp which is the same as struct
-+ utmpx, as on kFreeBSD, but incompatible with FreeBSD],
-+ enable_utmp_compat=$enableval, enable_utmp_compat=no)
++AC_ARG_ENABLE([compatible-utmp],
++ AC_HELP_STRING([--disable-compatible-utmp],
++ [use a struct utmp which is the same as struct utmpx, as on kFreeBSD, but incompatible with FreeBSD]),
++ [enable_utmp_compat=$enableval],
++ [enable_utmp_compat=no])
+if test "$enable_utmp_compat" = no; then
+ utmp_subdir=utmp-utmpx
+else
@@ -5719,13 +5809,13 @@
+case "$machine" in
+ i386*)
+ libc_cv_gcc_unwind_find_fde=yes
-+ arch_minimum_kernel=6.0.0
++ arch_minimum_kernel=8.3.0
+ ;;
+ x86_64*)
-+ arch_minimum_kernel=6.0.0
++ arch_minimum_kernel=8.3.0
+ ;;
+ *)
-+ arch_minimum_kernel=6.0.0
++ arch_minimum_kernel=8.3.0
+ ;;
+esac
+if test -n "$minimum_kernel"; then
@@ -5738,7 +5828,7 @@
+ minimum_kernel=$arch_minimum_kernel
+ fi
+else
-+ if test $arch_minimum_kernel != '6.0.0'; then
++ if test $arch_minimum_kernel != '8.3.0'; then
+ minimum_kernel=$arch_minimum_kernel
+ fi
+fi
@@ -6435,7 +6525,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-sysdep.c
-@@ -0,0 +1,253 @@
+@@ -0,0 +1,261 @@
+/* Dynamic linker system dependencies for GNU/kFreeBSD.
+ Copyright (C) 1995-1998,2000-2008,2009,2010,2011
+ Free Software Foundation, Inc.
@@ -6673,21 +6763,29 @@
+ int request[2] = { CTL_KERN, KERN_OSRELDATE };
+ size_t len;
+ int version;
++ int subrelease;
+
+ len = sizeof(version);
+ if (__sysctl (request, 2, &version, &len, NULL, 0) < 0)
+ return -1;
+
+/*
-+ * scheme is: <major><two digit minor>Rxx
-+ * 'R' is 0 if release branch or x.0-CURRENT before RELENG_*_0
-+ * is created, otherwise 1.
++ * since 8.0 release
++ * scheme is: <major><two digit minor>Rxx
++ * 'R' is in the range 0 to 4 if this is a release branch or
++ * x.0-CURRENT before RELENG_*_0 is created, otherwise 'R' is
++ * in the range 5 to 9.
+ */
+
+ /* Convert to the GLIBC versioning system */
++ subrelease = version % 1000;
++ if (subrelease >= 500)
++ subrelease -= 300; /* hopefull 55 values suffice for stable update */
++ if (subrelease > 255) /* it have to fit into byte */
++ subrelease = 255;
+ return ((version / 100000) << 16) /* major */
+ | (((version % 100000) / 1000) << 8) /* minor 0 - 99 */
-+ | ((version % 200)); /* subrelease 0 - 199 */
++ | subrelease;
+}
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-sysdep.h
@@ -9661,7 +9759,7 @@
+#endif /* _FREEBSD_PT_MACHINE_H */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/linuxthreads/sysdep-cancel.h
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,147 @@
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@@ -9774,7 +9872,7 @@
+#endif
+
+# ifndef __ASSEMBLER__
-+# if defined FLOATING_STACKS && defined PIC
++# if defined PIC
+# define SINGLE_THREAD_P \
+ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+ p_header.data.multiple_threads) == 0, 1)
@@ -9790,27 +9888,8 @@
+# else
+# if !defined PIC
+# define SINGLE_THREAD_P cmpl $0, __local_multiple_threads
-+# elif defined FLOATING_STACKS
++# else
+# define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
-+# else
-+# if !defined NOT_IN_libc || defined IS_IN_libpthread
-+# define __SINGLE_THREAD_CMP cmpl $0, __local_multiple_threads@GOTOFF(%ecx)
-+# else
-+# define __SINGLE_THREAD_CMP \
-+ movl __local_multiple_threads@GOT(%ecx), %ecx;\
-+ cmpl $0, (%ecx)
-+# endif
-+# if !defined HAVE_HIDDEN
-+# define SINGLE_THREAD_P \
-+ SETUP_PIC_REG (cx); \
-+ addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
-+ __SINGLE_THREAD_CMP
-+# else
-+# define SINGLE_THREAD_P \
-+ call __i686.get_pc_thunk.cx; \
-+ addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
-+ __SINGLE_THREAD_CMP
-+# endif
+# endif
+# endif
+
@@ -9830,7 +9909,7 @@
+
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/linuxthreads/tls.h
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,80 @@
+/* Definition for thread-local data handling. linuxthreads/i386 version.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -9856,16 +9935,6 @@
+
+#include <linuxthreads/sysdeps/i386/tls.h>
+
-+/* We can support TLS only if the floating-stack support is available.
-+ To avoid bothering with the TLS support code at all,
-+ use configure --without-tls.
-+
-+ We need USE_TLS to be consistently defined, for ldsodefs.h conditionals.
-+ But some of the code below can cause problems in building libpthread
-+*/
-+
-+#if defined FLOATING_STACKS || !defined IS_IN_libpthread
-+
+# ifndef __ASSEMBLER__
+
+#undef TLS_INIT_TP
@@ -9920,8 +9989,6 @@
+
+# endif /* __ASSEMBLER__ */
+
-+#endif /* FLOATING_STACKS || !IS_IN_libpthread */
-+
+#endif /* _FREEBSD_TLS_H */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/linuxthreads/vfork.S
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2013-05-28 16:18:00 UTC (rev 5609)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2013-05-31 15:38:17 UTC (rev 5610)
@@ -1,6 +1,6 @@
EGLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
# When changing this, make sure to update debian/debhelper.in/libc.preinst!
-MIN_KERNEL_SUPPORTED := 8.1.0
+MIN_KERNEL_SUPPORTED := 8.3.0
libc = libc0.1
# Linuxthreads Config
Reply to: