Author: aurel32 Date: 2015-12-12 09:32:42 +0000 (Sat, 12 Dec 2015) New Revision: 6813
Removed: glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff Modified: glibc-package/branches/glibc-2.22/debian/changelog glibc-package/branches/glibc-2.22/debian/patches/series Log: debian/patches/any/local-stdio-lock.diff: drop, it was needed for LinuxThreads support. Modified: glibc-package/branches/glibc-2.22/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-11 23:30:57 UTC (rev 6812) +++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-12 09:32:42 UTC (rev 6813) @@ -18,6 +18,8 @@ another way. * debian/patches/alpha/submitted-rtld-fPIC.diff: drop, fixed upstream another way. + * debian/patches/any/local-stdio-lock.diff: drop, it was needed for + LinuxThreads support. -- Aurelien Jarno <aure...@debian.org> Thu, 10 Dec 2015 23:41:13 +0100 Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff =================================================================== --- glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff 2015-12-11 23:30:57 UTC (rev 6812) +++ glibc-package/branches/glibc-2.22/debian/patches/any/local-stdio-lock.diff 2015-12-12 09:32:42 UTC (rev 6813) @@ -1,32 +0,0 @@ ---- - bits/stdio-lock.h | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - ---- a/bits/stdio-lock.h -+++ b/bits/stdio-lock.h -@@ -46,12 +46,21 @@ - - #if defined _LIBC && IS_IN (libc) - # define _IO_acquire_lock(_fp) \ -- _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ -- _IO_flockfile (_fp) -+ { \ -+ _IO_FILE *_IO_acquire_lock_file = _fp; \ -+ __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_fct, &_IO_acquire_lock_file); \ -+ _IO_flockfile (_IO_acquire_lock_file) -+ -+# define _IO_acquire_lock_clear_flags2(_fp) \ -+ { \ -+ _IO_FILE *_IO_acquire_lock_file = _fp; \ -+ __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_clear_flags2_fct, &_IO_acquire_lock_file); \ -+ _IO_flockfile (_IO_acquire_lock_file) - - # define _IO_release_lock(_fp) \ -- _IO_funlockfile (_fp); \ -- _IO_cleanup_region_end (0) -+ __libc_cleanup_region_end (1); \ -+ } -+ - #endif - - #endif /* bits/stdio-lock.h */ Modified: glibc-package/branches/glibc-2.22/debian/patches/series =================================================================== --- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-11 23:30:57 UTC (rev 6812) +++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-12 09:32:42 UTC (rev 6813) @@ -204,7 +204,6 @@ any/local-no-pagesize.diff any/local-nss-upgrade.diff any/local-stubs_h.diff -any/local-stdio-lock.diff any/local-tcsetaddr.diff any/local-tst-mktime2.diff any/submitted-nis-netgrp.diff