Author: aurel32 Date: 2015-12-03 16:28:23 +0000 (Thu, 03 Dec 2015) New Revision: 6753
Modified: glibc-package/branches/glibc-2.22/debian/changelog glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-fbtl.diff glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff Log: patches/kfreebsd/local-sysdeps.diff, patches/kfreebsd/local-fbtl.diff: update to revision 5854 (from glibc-bsd). Modified: glibc-package/branches/glibc-2.22/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-03 15:04:55 UTC (rev 6752) +++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-03 16:28:23 UTC (rev 6753) @@ -5,7 +5,7 @@ Closes: #806910. * debian/control.in/main, debian/rules: build with gcc-5. * patches/kfreebsd/local-sysdeps.diff, patches/kfreebsd/local-fbtl.diff: - update to revision 5850 (from glibc-bsd): + update to revision 5854 (from glibc-bsd): - Update to glibc 2.22. * debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: new patch to fix tst-malloc-backtrace on GNU/kFreeBSD. Modified: glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-fbtl.diff =================================================================== --- glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-fbtl.diff 2015-12-03 15:04:55 UTC (rev 6752) +++ glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-fbtl.diff 2015-12-03 16:28:23 UTC (rev 6753) @@ -28906,7 +28906,7 @@ + /* Locate the entry for the mapping the caller provided. */ + rec = NULL; + the_sem = sem; -+ twalk (__sem_mappings, walker); ++ __twalk (__sem_mappings, walker); + if (rec != NULL) + { + /* Check the reference counter. If it is going to be zero, free @@ -28914,7 +28914,7 @@ + if (--rec->refcnt == 0) + { + /* Remove the record from the tree. */ -+ (void) tdelete (rec, &__sem_mappings, __sem_search); ++ (void) __tdelete (rec, &__sem_mappings, __sem_search); + + result = munmap (rec->sem, sizeof (sem_t)); + @@ -29109,7 +29109,7 @@ +#endif --- /dev/null +++ b/fbtl/sem_open.c -@@ -0,0 +1,299 @@ +@@ -0,0 +1,300 @@ +/* Copyright (C) 2002-2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drep...@redhat.com>, 2002. @@ -29191,7 +29191,8 @@ + fake->dev = st.st_dev; + fake->ino = st.st_ino; + -+ struct inuse_sem **foundp = tfind (fake, &__sem_mappings, __sem_search); ++ struct inuse_sem **foundp = __tfind (fake, &__sem_mappings, ++ __sem_search); + if (foundp != NULL) + { + /* There is already a mapping. Use it. */ @@ -29220,7 +29221,7 @@ + + /* Insert the new value. */ + if (existing != MAP_FAILED -+ && tsearch (newp, &__sem_mappings, __sem_search) != NULL) ++ && __tsearch (newp, &__sem_mappings, __sem_search) != NULL) + /* Successful. */ + result = existing; + else Modified: glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff =================================================================== --- glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff 2015-12-03 15:04:55 UTC (rev 6752) +++ glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff 2015-12-03 16:28:23 UTC (rev 6753) @@ -1117,14 +1117,14 @@ +#define F_SETLK64 12 /* Set record locking info (non-blocking). */ +#define F_SETLKW64 13 /* Set record locking info (blocking). */ + -+#if defined __USE_MISC || __POSIX_VISIBLE >= 200809 ++#ifdef __USE_XOPEN2K8 +#define F_DUPFD_CLOEXEC 17 /* Like F_DUPFD, but FD_CLOEXEC is set */ +#endif +#if defined __USE_MISC +#define F_DUP2FD_CLOEXEC 18 /* Like F_DUP2FD, but FD_CLOEXEC is set */ +#endif + -+#if defined __USE_MISC || defined __USE_UNIX98 ++#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 +# define F_GETOWN 5 /* Get owner of socket (receiver of SIGIO). */ +# define F_SETOWN 6 /* Set owner of socket (receiver of SIGIO). */ +#endif @@ -15550,7 +15550,7 @@ + getaddrinfo_a F --- /dev/null +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/libc.abilist -@@ -0,0 +1,2205 @@ +@@ -0,0 +1,2208 @@ +GLIBC_2.10 + GLIBC_2.10 A + __cxa_at_quick_exit F @@ -15648,6 +15648,9 @@ +GLIBC_2.21 + GLIBC_2.21 A + __statfs F ++GLIBC_2.22 ++ GLIBC_2.22 A ++ fmemopen F +GLIBC_2.3 + GLIBC_2.3 A + _Exit F @@ -32972,7 +32975,7 @@ + getaddrinfo_a F --- /dev/null +++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/libc.abilist -@@ -0,0 +1,2153 @@ +@@ -0,0 +1,2156 @@ +GLIBC_2.10 + GLIBC_2.10 A + __cxa_at_quick_exit F @@ -33072,6 +33075,9 @@ +GLIBC_2.21 + GLIBC_2.21 A + __statfs F ++GLIBC_2.22 ++ GLIBC_2.22 A ++ fmemopen F +GLIBC_2.3 + GLIBC_2.3 A + _Exit F