From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 28 Aug 2017 12:19:55 +0000 (+0200)
Subject: hurd: Remove duplicate symbol version
X-Git-Tag: glibc-2.27~1066
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45a4f49ee520eb09b1ff58c4e9dbddb135a14b64;p=thirdparty%2Fglibc.git

hurd: Remove duplicate symbol version

* hurd/Versions (GLIBC_2.4): Remove __stack_chk_fail.
* mach/Versions (GLIBC_2.4): Remove __stack_chk_fail.
---

diff --git a/ChangeLog b/ChangeLog
index 5677c5eb468..2fae663af59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,8 +39,6 @@
 	* 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.
 	* mach/Makefile (CFLAGS-mach_init.o, CFLAGS-RPC_vm_statistics.o,
 	CFLAGS-RPC_vm_map.o, CFLAGS-RPC_vm_protect.o,
 	CFLAGS-RPC_i386_set_gdt.o, CFLAGS-RPC_i386_set_ldt.o,
diff --git a/hurd/Versions b/hurd/Versions
index 392b76444a9..77f5b4271e0 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -129,10 +129,6 @@ 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/mach/Versions b/mach/Versions
index 2c0510e07e6..0097aad59bb 100644
--- a/mach/Versions
+++ b/mach/Versions
@@ -54,10 +54,6 @@ 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_;
   }