[Glibc-bsd-commits] r4405 - trunk/glibc-ports/patches
Aurelien Jarno
aurel32 at alioth.debian.org
Tue May 7 18:53:20 UTC 2013
Author: aurel32
Date: 2013-05-07 18:53:19 +0000 (Tue, 07 May 2013)
New Revision: 4405
Modified:
trunk/glibc-ports/patches/config_h_in.patch
trunk/glibc-ports/patches/linuxthreads29.patch
trunk/glibc-ports/patches/memusage_no_mremap.patch
trunk/glibc-ports/patches/readdir_r.patch
trunk/glibc-ports/patches/scripts.patch
trunk/glibc-ports/patches/undef-glibc.patch
Log:
Merge patches from pkg-glibc
Modified: trunk/glibc-ports/patches/config_h_in.patch
===================================================================
--- trunk/glibc-ports/patches/config_h_in.patch 2013-05-07 18:38:27 UTC (rev 4404)
+++ trunk/glibc-ports/patches/config_h_in.patch 2013-05-07 18:53:19 UTC (rev 4405)
@@ -2,9 +2,13 @@
* config.h.in (__KFREEBSD_KERNEL_VERSION): Add.
+---
+ config.h.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/config.h.in
+++ b/config.h.in
-@@ -150,6 +150,9 @@
+@@ -159,6 +159,9 @@
/* Linux specific: minimum supported kernel version. */
#undef __LINUX_KERNEL_VERSION
@@ -14,4 +18,3 @@
/* Override abi-tags ABI version if necessary. */
#undef __ABI_TAG_VERSION
-
Modified: trunk/glibc-ports/patches/linuxthreads29.patch
===================================================================
--- trunk/glibc-ports/patches/linuxthreads29.patch 2013-05-07 18:38:27 UTC (rev 4404)
+++ trunk/glibc-ports/patches/linuxthreads29.patch 2013-05-07 18:53:19 UTC (rev 4405)
@@ -1,17 +1,25 @@
some of these hacks should be solved properly by upstream ...
---- glibc-2.9.orig/nscd/connections.c
-+++ glibc-2.9/nscd/connections.c
-@@ -873,6 +873,7 @@
- #endif
+---
+ linuxthreads/sysdeps/pthread/bits/libc-tsd.h | 12 ++++++------
+ linuxthreads/sysdeps/pthread/malloc-machine.h | 6 +++---
+ nscd/connections.c | 4 ++++
+ sysdeps/i386/tlsdesc.sym | 4 ++++
+ sysdeps/x86_64/tlsdesc.sym | 5 ++++-
+ 5 files changed, 21 insertions(+), 10 deletions(-)
+
+--- a/nscd/connections.c
++++ b/nscd/connections.c
+@@ -876,6 +876,7 @@
+ }
}
+#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
/* Create the socket. */
#ifndef __ASSUME_SOCK_CLOEXEC
sock = -1;
-@@ -885,6 +886,9 @@
+@@ -888,6 +889,9 @@
have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
#endif
}
@@ -21,8 +29,8 @@
#ifndef __ASSUME_SOCK_CLOEXEC
if (have_sock_cloexec < 0)
sock = socket (AF_UNIX, SOCK_STREAM, 0);
---- glibc-2.9.orig/sysdeps/i386/tlsdesc.sym
-+++ glibc-2.9/sysdeps/i386/tlsdesc.sym
+--- a/sysdeps/i386/tlsdesc.sym
++++ b/sysdeps/i386/tlsdesc.sym
@@ -8,7 +8,11 @@
-- Abuse tls.h macros to derive offsets relative to the thread register.
@@ -35,8 +43,8 @@
TLSDESC_ARG offsetof(struct tlsdesc, arg)
---- glibc-2.9.orig/sysdeps/x86_64/tlsdesc.sym
-+++ glibc-2.9/sysdeps/x86_64/tlsdesc.sym
+--- a/sysdeps/x86_64/tlsdesc.sym
++++ b/sysdeps/x86_64/tlsdesc.sym
@@ -5,10 +5,13 @@
#include <dl-tlsdesc.h>
@@ -52,8 +60,8 @@
TLSDESC_ARG offsetof(struct tlsdesc, arg)
---- glibc-2.9.orig/linuxthreads/sysdeps/pthread/malloc-machine.h
-+++ glibc-2.9/linuxthreads/sysdeps/pthread/malloc-machine.h
+--- a/linuxthreads/sysdeps/pthread/malloc-machine.h
++++ b/linuxthreads/sysdeps/pthread/malloc-machine.h
@@ -57,10 +57,10 @@
#include <bits/libc-tsd.h>
@@ -68,8 +76,8 @@
#include <sysdeps/generic/malloc-machine.h>
---- glibc-2.9.orig/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
-+++ glibc-2.9/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
+--- a/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
++++ b/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
@@ -42,14 +42,14 @@
weak_extern (__pthread_internal_tsd_set)
# endif
Modified: trunk/glibc-ports/patches/memusage_no_mremap.patch
===================================================================
--- trunk/glibc-ports/patches/memusage_no_mremap.patch 2013-05-07 18:38:27 UTC (rev 4404)
+++ trunk/glibc-ports/patches/memusage_no_mremap.patch 2013-05-07 18:53:19 UTC (rev 4405)
@@ -4,16 +4,16 @@
--- a/malloc/memusage.c
+++ b/malloc/memusage.c
-@@ -665,6 +665,8 @@
+@@ -674,6 +674,8 @@
return result;
}
+#include <_G_config.h>
+#ifdef _G_HAVE_MREMAP
- /* `mmap' replacement. We do not have to keep track of the sizesince
+ /* `mremap' replacement. We do not have to keep track of the size since
`munmap' will get it as a parameter. */
-@@ -730,6 +732,7 @@
+@@ -739,6 +741,7 @@
/* Return the pointer to the user buffer. */
return result;
}
Modified: trunk/glibc-ports/patches/readdir_r.patch
===================================================================
--- trunk/glibc-ports/patches/readdir_r.patch 2013-05-07 18:38:27 UTC (rev 4404)
+++ trunk/glibc-ports/patches/readdir_r.patch 2013-05-07 18:53:19 UTC (rev 4405)
@@ -1,9 +1,9 @@
---
- sysdeps/unix/readdir_r.c | 30 +++++++++++++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
+ sysdeps/unix/readdir_r.c | 33 +++++++++++++++++++++++++--------
+ 1 file changed, 25 insertions(+), 8 deletions(-)
---- a/sysdeps/unix/readdir_r.c
-+++ b/sysdeps/unix/readdir_r.c
+--- a/sysdeps/posix/readdir_r.c
++++ b/sysdeps/posix/readdir_r.c
@@ -114,15 +114,32 @@
if (dp != NULL)
Modified: trunk/glibc-ports/patches/scripts.patch
===================================================================
--- trunk/glibc-ports/patches/scripts.patch 2013-05-07 18:38:27 UTC (rev 4404)
+++ trunk/glibc-ports/patches/scripts.patch 2013-05-07 18:53:19 UTC (rev 4405)
@@ -1,10 +1,11 @@
---
- abi-tags | 2 +-
- configure | 6 +++---
- configure.in | 6 +++---
- linuxthreads/shlib-versions | 3 ++-
- shlib-versions | 4 ++++
- 5 files changed, 13 insertions(+), 8 deletions(-)
+ abi-tags | 2 +-
+ configure | 4 +++-
+ configure.in | 4 +++-
+ linuxthreads/shlib-versions | 3 ++-
+ linuxthreads_db/shlib-versions | 1 +
+ shlib-versions | 4 ++++
+ 6 files changed, 14 insertions(+), 4 deletions(-)
--- a/abi-tags
+++ b/abi-tags
@@ -13,87 +14,67 @@
.*-sun-solaris2.* 2 2.0.0 # just an arbitrary value
-.*-.*-freebsd.*-gnu.* 3 4.0.0 # earliest compatible kernel version
-+.*-.*-kfreebsd.* 3 8.0.0 # earliest compatible kernel version
++.*-.*-kfreebsd.* 3 5.4.0 # earliest compatible kernel version
.*-.*-knetbsd.*-gnu.* 4 1.6.0 # earliest compatible kernel version
--- a/configure
+++ b/configure
-@@ -2282,7 +2282,7 @@
- # i586-linuxaout is mangled into i586-pc-linux-gnuaout
- linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
- ;;
--gnu* | linux* | freebsd* | netbsd* | sysv4* | solaris2* | irix6*)
-+gnu* | linux* | freebsd* | netbsd* | k*bsd* | sysv4* | solaris2* | irix6*)
- # These systems (almost) always use the ELF format.
- elf=yes
- ;;
-@@ -2489,7 +2489,7 @@
+@@ -4045,7 +4045,7 @@
###
if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
case "$machine-$host_os" in
-- *-linux* | *-gnu* | arm*-none* | powerpc-aix4.3.*)
-+ *-linux* | *-gnu* | *-kfreebsd* | arm*-none* | powerpc-aix4.3.*)
+- *-linux* | *-gnu*)
++ *-linux* | *-gnu* | *-kfreebsd*)
;;
*)
echo "*** The GNU C library is currently not available for this platform."
-@@ -2563,7 +2563,7 @@
- test "x$base_os" != x || case "$os" in
- gnu*)
+@@ -4242,6 +4242,8 @@
base_os=mach/hurd ;;
--netbsd* | 386bsd* | freebsd* | bsdi*)
-+netbsd* | 386bsd* | freebsd* | bsdi* | k*bsd*)
- base_os=unix/bsd/bsd4.4 ;;
- osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
- base_os=unix/bsd ;;
+ linux*)
+ base_os=unix/sysv ;;
++k*bsd*)
++ base_os=unix/bsd/bsd4.4 ;;
+ esac
+
+ # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.
--- a/configure.in
+++ b/configure.in
-@@ -283,7 +283,7 @@
- # i586-linuxaout is mangled into i586-pc-linux-gnuaout
- linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
- ;;
--gnu* | linux* | freebsd* | netbsd* | sysv4* | solaris2* | irix6*)
-+gnu* | linux* | freebsd* | netbsd* | k*bsd* | sysv4* | solaris2* | irix6*)
- # These systems (almost) always use the ELF format.
- elf=yes
- ;;
-@@ -469,7 +469,7 @@
+@@ -505,7 +505,7 @@
###
if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
case "$machine-$host_os" in
-- *-linux* | *-gnu* | arm*-none* | powerpc-aix4.3.*)
-+ *-linux* | *-gnu* | *-kfreebsd* | arm*-none* | powerpc-aix4.3.*)
+- *-linux* | *-gnu*)
++ *-linux* | *-gnu* | *-kfreebsd*)
;;
*)
echo "*** The GNU C library is currently not available for this platform."
-@@ -544,7 +544,7 @@
- test "x$base_os" != x || case "$os" in
- gnu*)
+@@ -659,6 +659,8 @@
base_os=mach/hurd ;;
--netbsd* | 386bsd* | freebsd* | bsdi*)
-+netbsd* | 386bsd* | freebsd* | bsdi* | k*bsd*)
- base_os=unix/bsd/bsd4.4 ;;
- osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
- base_os=unix/bsd ;;
+ linux*)
+ base_os=unix/sysv ;;
++k*bsd*)
++ base_os=unix/bsd/bsd4.4 ;;
+ esac
+
+ # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.
--- a/shlib-versions
+++ b/shlib-versions
-@@ -31,6 +31,7 @@
- x86_64-.*-linux.* DEFAULT GLIBC_2.2.5
+@@ -24,6 +24,7 @@
+ s390x-.*-linux.* DEFAULT GLIBC_2.2
powerpc64-.*-linux.* DEFAULT GLIBC_2.3
.*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6
+.*-.*-kfreebsd.* DEFAULT GLIBC_2.3
- # Configuration WORDSIZE[32|64] Alternate configuration
- # ------------- ---------- -----------------------
-@@ -53,6 +54,7 @@
+ # Configuration ABI Identifier for ABI data files
+ # ------------- ---------- -----------------------------
+@@ -38,11 +39,13 @@
sh.*-.*-linux.* libm=6 GLIBC_2.2
.*-.*-linux.* libm=6
.*-.*-gnu-gnu.* libm=6
+.*-.*-kfreebsd.* libm=1
# We provide libc.so.6 for Linux kernel versions 2.0 and later.
- alpha.*-.*-linux.* libc=6.1
-@@ -60,6 +62,7 @@
sh.*-.*-linux.* libc=6 GLIBC_2.2
sparc64.*-.*-linux.* libc=6 GLIBC_2.2
.*-.*-linux.* libc=6
@@ -101,23 +82,21 @@
# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
.*-.*-gnu-gnu.* libmachuser=1
-@@ -81,6 +84,7 @@
- powerpc64.*-.*-linux.* ld=ld64.so.1 GLIBC_2.3
- cris-.*-linux.* ld=ld.so.1 GLIBC_2.2
- x86_64-.*-linux.* ld=ld-linux-x86-64.so.2 GLIBC_2.2.5
+@@ -57,6 +60,7 @@
+ sparc64.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2
+ sparc.*-.*-linux.* ld=ld-linux.so.2
+ sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_2.2
+x86_64-.*-kfreebsd.* ld=ld-kfreebsd-x86-64.so.1
# We use the ELF ABI standard name for the default.
.*-.*-.* ld=ld.so.1
--- a/linuxthreads/shlib-versions
+++ b/linuxthreads/shlib-versions
-@@ -8,4 +8,5 @@
- cris-.*-linux.* libpthread=0 GLIBC_2.2
+@@ -8,3 +8,4 @@
x86_64-.*-linux.* libpthread=0 GLIBC_2.2.5
powerpc64-.*-linux.* libpthread=0 GLIBC_2.3
--.*-.*-linux.* libpthread=0
+ .*-.*-linux.* libpthread=0
+.*-.*-kfreebsd.* libpthread=0 GLIBC_2.3
-+.*-.*-.* libpthread=0
--- a/linuxthreads_db/shlib-versions
+++ b/linuxthreads_db/shlib-versions
@@ -1,2 +1,3 @@
Modified: trunk/glibc-ports/patches/undef-glibc.patch
===================================================================
--- trunk/glibc-ports/patches/undef-glibc.patch 2013-05-07 18:38:27 UTC (rev 4404)
+++ trunk/glibc-ports/patches/undef-glibc.patch 2013-05-07 18:53:19 UTC (rev 4405)
@@ -8,11 +8,11 @@
--- a/include/features.h
+++ b/include/features.h
-@@ -310,6 +310,7 @@
+@@ -355,6 +355,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
+#undef __GLIBC__
#define __GLIBC__ 2
- #define __GLIBC_MINOR__ 8
+ #define __GLIBC_MINOR__ 17
More information about the Glibc-bsd-commits
mailing list