aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-10-01 17:37:27 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-10-01 17:37:42 -0700
commitd19033298f832f5b3e10da6f07e7959f0483df74 (patch)
treeccc048009846edff2cf5a06146fff03e0bb1f760
parentb4744101f36021bf2dde713682abbd0cc6935168 (diff)
downloadglibc-d19033298f832f5b3e10da6f07e7959f0483df74.tar
glibc-d19033298f832f5b3e10da6f07e7959f0483df74.tar.gz
glibc-d19033298f832f5b3e10da6f07e7959f0483df74.tar.bz2
glibc-d19033298f832f5b3e10da6f07e7959f0483df74.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--include/mntent.h1
-rw-r--r--misc/mntent_r.c1
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7514e861dd..24de2e0a6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
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]
* include/ifreq.h: New file.
* sysdeps/generic/ifreq.h (__if_nextreq): Removed.
(__ifreq): Likewise.
diff --git a/include/mntent.h b/include/mntent.h
index 169210fc66..a16298ed6e 100644
--- 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 30f55212be..96bd1e2fb4 100644
--- 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)