This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-188-g97e02ad
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Aug 2017 20:12:09 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-188-g97e02ad
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 97e02ad23392f929862d6a04643e7f2fd91baebc (commit)
from 2ef8d46913b10cb1cf8adddfe80ce8d1b57d4f46 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=97e02ad23392f929862d6a04643e7f2fd91baebc
commit 97e02ad23392f929862d6a04643e7f2fd91baebc
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Aug 27 22:10:17 2017 +0200
hurd: fix build with -fstack-protector-strong
libmachuser and libhurduser also need stack_chk_fail_local and they do not
link against libc_nonshared.
* mach/stack_chk_fail_local.c: New file.
* hurd/stack_chk_fail_local.c: New file.
* mach/Machrules ($(interface-library)-routines): Add
stack_chk_fail_local.
* mach/Versions (GLIBC_2.4): Add __stack_chk_fail.
* hurd/Versions (GLIBC_2.4): Add __stack_chk_fail.
diff --git a/ChangeLog b/ChangeLog
index 1b0f155..4d94fee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2017-08-27 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/bits/sysmacros.h: New file.
+ * mach/stack_chk_fail_local.c: New file.
+ * hurd/stack_chk_fail_local.c: New file.
+ * mach/Machrules ($(interface-library)-routines): Add
+ stack_chk_fail_local.
+ * mach/Versions (GLIBC_2.4): Add __stack_chk_fail.
+ * hurd/Versions (GLIBC_2.4): Add __stack_chk_fail.
2017-08-25 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/hurd/Versions b/hurd/Versions
index 77f5b42..011edc7 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -129,6 +129,10 @@ libc {
# functions used in macros & inline functions
__errno_location;
}
+ GLIBC_2.4 {
+ # functions used by RPC stubs
+ __stack_chk_fail
+ }
HURD_CTHREADS_0.3 {
# weak refs to libthreads functions that libc calls iff libthreads in use
diff --git a/hurd/stack_chk_fail_local.c b/hurd/stack_chk_fail_local.c
new file mode 100644
index 0000000..305871f
--- /dev/null
+++ b/hurd/stack_chk_fail_local.c
@@ -0,0 +1 @@
+#include <debug/stack_chk_fail_local.c>
diff --git a/mach/Machrules b/mach/Machrules
index 36adfc7..29114b1 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -221,7 +221,7 @@ endif
ifdef interface-library
-$(interface-library)-routines = $(interface-routines)
+$(interface-library)-routines = $(interface-routines) stack_chk_fail_local
extra-libs += $(interface-library)
extra-libs-others += $(interface-library)
diff --git a/mach/Versions b/mach/Versions
index 0097aad..b22fda4 100644
--- a/mach/Versions
+++ b/mach/Versions
@@ -54,6 +54,10 @@ libc {
# This was always there, but not exported as it should have been.
mig_strncpy;
}
+ GLIBC_2.4 {
+ # functions used by RPC stubs
+ __stack_chk_fail
+ }
GLIBC_2.23 {
__mach_host_self_;
}
diff --git a/mach/stack_chk_fail_local.c b/mach/stack_chk_fail_local.c
new file mode 100644
index 0000000..305871f
--- /dev/null
+++ b/mach/stack_chk_fail_local.c
@@ -0,0 +1 @@
+#include <debug/stack_chk_fail_local.c>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
hurd/Versions | 4 ++++
hurd/stack_chk_fail_local.c | 1 +
mach/Machrules | 2 +-
mach/Versions | 4 ++++
mach/stack_chk_fail_local.c | 1 +
6 files changed, 17 insertions(+), 1 deletions(-)
create mode 100644 hurd/stack_chk_fail_local.c
create mode 100644 mach/stack_chk_fail_local.c
hooks/post-receive
--
GNU C Library master sources