summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-10-01 16:03:28 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-10-01 16:03:41 -0700
commit78cf1d74d28c9312d888dea1ad3de01d38c5fc4a (patch)
tree92e83c155360cc3795a821e312422247899fe1ac
parent85b358949d506ddc7c35301e7ae1316d2036a736 (diff)
downloadglibc-78cf1d74d28c9312d888dea1ad3de01d38c5fc4a.tar.gz
glibc-78cf1d74d28c9312d888dea1ad3de01d38c5fc4a.tar.xz
glibc-78cf1d74d28c9312d888dea1ad3de01d38c5fc4a.zip
Hide internal __strsep function [BZ #18822]
Hide internal __strsep function to allow direct access within libc.so and
libc.a without using GOT nor PLT.

	[BZ #18822]
	* include/string.h (__strsep): Add libc_hidden_proto.
	* string/strsep.c (__strsep): Add libc_hidden_def.
-rw-r--r--ChangeLog6
-rw-r--r--include/string.h1
-rw-r--r--string/strsep.c1
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ee7fd4f59..dcf1c0d090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18822]
+	* include/string.h (__strsep): Add libc_hidden_proto.
+	* string/strsep.c (__strsep): Add libc_hidden_def.
+
+2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #18822]
 	* posix/spawn_int.h (__posix_spawn_file_actions_realloc): Add
 	attribute_hidden.
 	(__spawni): Likewise.
diff --git a/include/string.h b/include/string.h
index 069efd0b87..968d6fea05 100644
--- a/include/string.h
+++ b/include/string.h
@@ -12,6 +12,7 @@ extern size_t __strnlen (const char *__string, size_t __maxlen)
      __attribute_pure__;
 
 extern char *__strsep (char **__stringp, const char *__delim);
+libc_hidden_proto (__strsep)
 
 extern int __strverscmp (const char *__s1, const char *__s2)
      __attribute_pure__;
diff --git a/string/strsep.c b/string/strsep.c
index 7091234a6c..b6103657a8 100644
--- a/string/strsep.c
+++ b/string/strsep.c
@@ -46,4 +46,5 @@ __strsep (char **stringp, const char *delim)
 }
 weak_alias (__strsep, strsep)
 strong_alias (__strsep, __strsep_g)
+libc_hidden_def (__strsep)
 libc_hidden_def (__strsep_g)