Author: aurel32
Date: 2015-12-02 21:49:46 +0000 (Wed, 02 Dec 2015)
New Revision: 6741
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 5850 (from glibc-bsd):
- Update to glibc 2.22.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 21:47:19 UTC
(rev 6740)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 21:49:46 UTC
(rev 6741)
@@ -3,7 +3,9 @@
[ Aurelien Jarno ]
* debian/debhelper.in/libc-dev.install: install libmvec_nonshared.a.
* debian/control.in/main, debian/rules: build with gcc-5.
- * kfreebsd/local-sysdeps.diff: update to revision 5845 (from glibc-bsd).
+ * patches/kfreebsd/local-sysdeps.diff, patches/kfreebsd/local-fbtl.diff:
+ update to revision 5850 (from glibc-bsd):
+ - Update to glibc 2.22.
* debian/sysdeps/ppc64el.mk: use default gcc options.
* debian/rules.d/build.mk: explicitly disable mathvec when mvec=no.
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-02 21:47:19 UTC (rev 6740)
+++ glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-fbtl.diff
2015-12-02 21:49:46 UTC (rev 6741)
@@ -17129,14 +17129,14 @@
+
+/* We need to have the error status variable of the resolver
+ accessible in the libc. */
-+extern __thread int h_errno;
++extern __thread int __h_errno;
+
+
+/* When threaded, h_errno may be a per-thread variable. */
+int *
+__h_errno_location (void)
+{
-+ return &h_errno;
++ return &__h_errno;
+}
--- /dev/null
+++ b/fbtl/libc-cancellation.c
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-02 21:47:19 UTC (rev 6740)
+++
glibc-package/branches/glibc-2.22/debian/patches/kfreebsd/local-sysdeps.diff
2015-12-02 21:49:46 UTC (rev 6741)
@@ -319,7 +319,7 @@
+}
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/_exit.S
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
+/* Copyright (C) 1991,92,97,99,2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -344,6 +344,7 @@
+ /* Shouldn't get here. */
+PSEUDO_END(_exit)
+libc_hidden_def (_exit)
++rtld_hidden_def (_exit)
+weak_alias (_exit, _Exit)
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/a.out.h
@@ -13634,7 +13635,7 @@
+}
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/getlogin_r.c
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,73 @@
+/* Reentrant function to return the current login name. FreeBSD version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -13678,7 +13679,7 @@
+ but SUSV2 wants a return type of 'int'. */
+
+int
-+getlogin_r (char *name, size_t name_len)
++__getlogin_r (char *name, size_t name_len)
+{
+ size_t len;
+
@@ -13704,7 +13705,10 @@
+ return ERANGE;
+ }
+}
-+libc_hidden_def (getlogin_r)
++libc_hidden_def (__getlogin_r)
++weak_alias (__getlogin_r, getlogin_r)
++libc_hidden_weak (getlogin_r)
++
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/getmntinfo.c
@@ -0,0 +1,80 @@
@@ -29528,7 +29532,7 @@
+getppid - getppid i:
__getppid getppid
+getresgid - getresgid i:ppp
getresgid
+getresuid - getresuid i:ppp
getresuid
-+getrlimit - getrlimit i:ip
__getrlimit getrlimit getrlimit64
++getrlimit - getrlimit i:ip
__getrlimit getrlimit getrlimit64 __getrlimit64
+getsid - getsid i:i
getsid
+issetugid - issetugid i:
issetugid
+jail - jail i:p jail
