[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 02/02: debian/patches/any/local-no-pagesize.diff: drop, obsolete.



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.23
in repository glibc.

commit e309a44395c6d410129cd4890e6d53e18c81cf17
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Mon Mar 28 13:26:00 2016 +0200

    debian/patches/any/local-no-pagesize.diff: drop, obsolete.
---
 debian/changelog                          |  1 +
 debian/patches/any/local-no-pagesize.diff | 50 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 914cf3d..74869d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ glibc (2.23-0experimental2) UNRELEASED; urgency=medium
   * debian/rules, debian/rules.d/build.mk: rename localedir into complocaledir
     following upstream change.
   * debian/patches/local-allocalim-header.diff: drop, obsolete.
+  * debian/patches/any/local-no-pagesize.diff: drop, obsolete.
 
   [ Adam Conrad ]
   * debian/testsuite-xfail-debian.mk: Also allow tst-malloc-thread-fail to
diff --git a/debian/patches/any/local-no-pagesize.diff b/debian/patches/any/local-no-pagesize.diff
deleted file mode 100644
index 5919841..0000000
--- a/debian/patches/any/local-no-pagesize.diff
+++ /dev/null
@@ -1,50 +0,0 @@
----
- sysdeps/unix/sysv/linux/check_native.c        |    6 ------
- sysdeps/unix/sysv/linux/check_pf.c            |    6 ------
- sysdeps/unix/sysv/linux/ifaddrs.c             |    6 ------
- sysdeps/unix/sysv/linux/x86/sys/user.h        |    2 ++
- 6 files changed, 6 insertions(+), 21 deletions(-)
-
---- a/sysdeps/unix/sysv/linux/x86/sys/user.h
-+++ b/sysdeps/unix/sysv/linux/x86/sys/user.h
-@@ -22,6 +22,8 @@
-    too much into it.  Don't use it for anything other than GDB unless
-    you know what you are doing.  */
- 
-+#include <unistd.h>
-+
- #ifdef __x86_64__
- 
- struct user_fpregs_struct
---- a/sysdeps/unix/sysv/linux/check_native.c
-+++ b/sysdeps/unix/sysv/linux/check_native.c
-@@ -77,13 +77,7 @@
-   memset (&nladdr, '\0', sizeof (nladdr));
-   nladdr.nl_family = AF_NETLINK;
- 
--#ifdef PAGE_SIZE
--  /* Help the compiler optimize out the malloc call if PAGE_SIZE
--     is constant and smaller or equal to PTHREAD_STACK_MIN/4.  */
--  const size_t buf_size = PAGE_SIZE;
--#else
-   const size_t buf_size = __getpagesize ();
--#endif
-   bool use_malloc = false;
-   char *buf;
- 
---- a/sysdeps/unix/sysv/linux/ifaddrs.c
-+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
-@@ -143,13 +143,7 @@
-   ssize_t read_len;
-   bool done = false;
- 
--#ifdef PAGE_SIZE
--  /* Help the compiler optimize out the malloc call if PAGE_SIZE
--     is constant and smaller or equal to PTHREAD_STACK_MIN/4.  */
--  const size_t buf_size = PAGE_SIZE;
--#else
-   const size_t buf_size = __getpagesize ();
--#endif
-   bool use_malloc = false;
-   char *buf;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9ca7808..c33c886 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -193,7 +193,6 @@ any/local-ldconfig-fsync.diff
 any/local-libgcc-compat-main.diff
 any/local-libgcc-compat-ports.diff
 any/local-libgcc-compat-abilists.diff
-any/local-no-pagesize.diff
 any/local-nss-upgrade.diff
 any/local-stubs_h.diff
 any/local-tcsetaddr.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: