r6689 - in glibc-package/branches/glibc-2.21/debian: . patches/kfreebsd
Author: aurel32
Date: 2015-11-22 17:05:01 +0000 (Sun, 22 Nov 2015)
New Revision: 6689
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-scripts.diff
glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff
Log:
patches/kfreebsd/local-sysdeps.diff, patches/kfreebsd/local-fbtl.diff:
update to revision 5844 (from glibc-bsd).
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-11-22 10:41:08 UTC (rev 6688)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-11-22 17:05:01 UTC (rev 6689)
@@ -13,7 +13,7 @@
- testsuite-checking/expected-results-mips64el-linux-gnuabin32-mipsn32
- testsuite-checking/expected-results-mipsel-linux-gnu-mips32
* patches/kfreebsd/local-sysdeps.diff, patches/kfreebsd/local-fbtl.diff:
- update to revision 5842 (from glibc-bsd):
+ update to revision 5844 (from glibc-bsd):
- Update to glibc 2.21.
- Define F_DUP2FD_CLOEXEC. Closes: #712074.
- Define SOCK_CLOEXEC and SOCK_NONBLOCK.
Modified: glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-scripts.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-scripts.diff 2015-11-22 10:41:08 UTC (rev 6688)
+++ glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-scripts.diff 2015-11-22 17:05:01 UTC (rev 6689)
@@ -56,9 +56,3 @@
esac
# For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.
---- /dev/null 2015-03-01 02:33:07.009060261 -0700
-+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/shlib-versions 2015-03-16 01:53:36.389707455 -0600
-@@ -0,0 +1,3 @@
-+DEFAULT GLIBC_2.3
-+libc=0.1
-+libm=1
Modified: glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff 2015-11-22 10:41:08 UTC (rev 6688)
+++ glibc-package/branches/glibc-2.21/debian/patches/kfreebsd/local-sysdeps.diff 2015-11-22 17:05:01 UTC (rev 6689)
@@ -19041,6 +19041,10 @@
+weak_alias (__rfork, rfork)
+
--- /dev/null
++++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/shlib-versions
+@@ -0,0 +1 @@
++ld=ld.so.1
+--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/sigcontextinfo.h
@@ -0,0 +1,35 @@
+/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
@@ -26654,6 +26658,14 @@
@@ -0,0 +1 @@
+/* 'setrlimit64' is the same as 'setrlimit', because __rlim64_t == __rlim_t. */
--- /dev/null
++++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/shlib-versions
+@@ -0,0 +1,5 @@
++# DEFAULT Earliest symbol set
++# --------------- ------------------------------
++DEFAULT GLIBC_2.3
++libc=0.1
++libm=1
+--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/shm-directory.c
@@ -0,0 +1,102 @@
+/* Determine directory for shm/sem files. GNU/kFreeBSD version.
@@ -31378,7 +31390,7 @@
+
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86/Makefile
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,9 @@
+# We don't need any header files.
+abi-includes :=
+
@@ -31386,10 +31398,8 @@
+
+abi-32-options := -D__i386__ -U__x86_64__
+abi-32-condition := !defined __x86_64__
-+abi-32-ld-soname := ld.so.1
+abi-64-options := -U__i386__ -D__x86_64__ -U__ILP32__ -D__LP64__
+abi-64-condition := defined __x86_64__ && defined __LP64__
-+abi-64-ld-soname := ld-kfreebsd-x86-64.so.1
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86/fbtl/bits/pthreadtypes.h
@@ -0,0 +1,240 @@
@@ -36421,6 +36431,10 @@
+weak_alias (__rfork, rfork)
+
--- /dev/null
++++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/shlib-versions
+@@ -0,0 +1 @@
++ld=ld-kfreebsd-x86-64.so.1
+--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sigcontextinfo.h
@@ -0,0 +1,35 @@
+/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
Reply to: