Hide internal __hasmntopt function [BZ #18822]

Hide internal __hasmntopt function to allow direct access within libc.so
and libc.a without using GOT nor PLT.

	[BZ #18822]
	* include/mntent.h (__hasmntopt): Add libc_hidden_proto.
	* misc/mntent_r.c (__hasmntopt): Add libc_hidden_def.

diff --git a/ChangeLog b/ChangeLog
index 7514e861dde53c1e18611c5a9619ddf8f17f6180..24de2e0a6d34df39aa8cb5c0edb26b1abef63a75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #18822]
+       * include/mntent.h (__hasmntopt): Add libc_hidden_proto.
+       * misc/mntent_r.c (__hasmntopt): Add libc_hidden_def.
+
 2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #18822]

diff --git a/include/mntent.h b/include/mntent.h
index 169210fc6602efe6eabb177cc3d51f1a4f0f6ee0..a16298ed6e061b0ce7e6258b4bd928a73a741bb1 100644 (file)
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -15,6 +15,7 @@ extern char *__hasmntopt (const struct mntent *__mnt, const char *__opt);
 libc_hidden_proto (__setmntent)
 libc_hidden_proto (__getmntent_r)
 libc_hidden_proto (__endmntent)
+libc_hidden_proto (__hasmntopt)
 
 # endif /* !_ISOMAC */
 #endif

diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 30f55212be3b9bfc784d91e2c56a90f737195a2c..96bd1e2fb4f79947fe77af05c2679afba123ebf0 100644 (file)
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -293,4 +293,5 @@ __hasmntopt (const struct mntent *mnt, const char *opt)
 
   return NULL;
 }
+libc_hidden_def (__hasmntopt)
 weak_alias (__hasmntopt, hasmntopt)