From 59c04e67631d370738b80923d42d4d1539d8f95f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 1 Oct 2017 15:51:44 -0700
Subject: Mark internal utmp functions with attribute_hidden [BZ #18822]

Mark internal utmp functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.

	[BZ #18822]
	* include/utmp.h (__updwtmp): Add libc_hidden_proto.
	(__getutent): Likewise.
	(__getutid): Likewise.
	(__getutline): Likewise.
	(__pututline): Likewise.
	(__getutent_r): Likewise.
	(__getutid_r): Likewise.
	(__getutline_r): Likewise.
	(__utmpname): Add attribute_hidden.
	(__setutent): Likewise.
	(__endutent): Likewise.
	* login/getutent.c (__getutent): Add libc_hidden_def.
	* login/getutent_r.c (__getutent_r): Likewise.
	(__pututline): Likewise.
	* login/getutid.c (__getutid): Likewise.
	* login/getutid_r.c (__getutid_r): Likewise.
	* login/getutline.c (__getutline): Likewise.
	* login/getutline_r.c (__getutline_r): Likewise.
	* login/updwtmp.c (__updwtmp): Likewise.
---
 login/getutent.c    | 1 +
 login/getutent_r.c  | 2 ++
 login/getutid.c     | 1 +
 login/getutid_r.c   | 1 +
 login/getutline.c   | 1 +
 login/getutline_r.c | 1 +
 login/updwtmp.c     | 1 +
 7 files changed, 8 insertions(+)

(limited to 'login')

diff --git a/login/getutent.c b/login/getutent.c
index 114f7dbbc7..2f6ccf0d3b 100644
--- a/login/getutent.c
+++ b/login/getutent.c
@@ -41,4 +41,5 @@ __getutent (void)
 
   return result;
 }
+libc_hidden_def (__getutent)
 weak_alias (__getutent, getutent)
diff --git a/login/getutent_r.c b/login/getutent_r.c
index 62272a2841..1b126f088a 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -151,6 +151,7 @@ __getutent_r (struct utmp *buffer, struct utmp **result)
 
   return retval;
 }
+libc_hidden_def (__getutent_r)
 weak_alias (__getutent_r, getutent_r)
 
 
@@ -167,6 +168,7 @@ __pututline (const struct utmp *data)
 
   return buffer;
 }
+libc_hidden_def (__pututline)
 weak_alias (__pututline, pututline)
 
 
diff --git a/login/getutid.c b/login/getutid.c
index 003bc657e6..62924f0fcf 100644
--- a/login/getutid.c
+++ b/login/getutid.c
@@ -39,4 +39,5 @@ __getutid (const struct utmp *id)
 
   return result;
 }
+libc_hidden_def (__getutid)
 weak_alias (__getutid, getutid)
diff --git a/login/getutid_r.c b/login/getutid_r.c
index f82301322f..36ddbb228a 100644
--- a/login/getutid_r.c
+++ b/login/getutid_r.c
@@ -59,4 +59,5 @@ __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result)
   return -1;
 #endif
 }
+libc_hidden_def (__getutid_r)
 weak_alias (__getutid_r, getutid_r)
diff --git a/login/getutline.c b/login/getutline.c
index f5291e8a8e..636b8feec8 100644
--- a/login/getutline.c
+++ b/login/getutline.c
@@ -40,4 +40,5 @@ __getutline (const struct utmp *line)
 
   return result;
 }
+libc_hidden_def (__getutline)
 weak_alias (__getutline, getutline)
diff --git a/login/getutline_r.c b/login/getutline_r.c
index 1a6f1688ee..3adc3d0d66 100644
--- a/login/getutline_r.c
+++ b/login/getutline_r.c
@@ -42,4 +42,5 @@ __getutline_r (const struct utmp *line, struct utmp *buffer,
 
   return retval;
 }
+libc_hidden_def (__getutline_r)
 weak_alias (__getutline_r, getutline_r)
diff --git a/login/updwtmp.c b/login/updwtmp.c
index 7788614ed3..3fcbaf643d 100644
--- a/login/updwtmp.c
+++ b/login/updwtmp.c
@@ -31,4 +31,5 @@ __updwtmp (const char *wtmp_file, const struct utmp *utmp)
 
   (*__libc_utmp_file_functions.updwtmp) (file_name, utmp);
 }
+libc_hidden_def (__updwtmp)
 weak_alias (__updwtmp, updwtmp)
-- 
cgit 1.4.1