[glibc/maskray/grte] Fix GCC compilation issues in cherrypicks

[glibc/maskray/grte] Fix GCC compilation issues in cherrypicks

[Fangrui Song]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=349ff1d0d5ea752b277798137bb00174694ea212

commit 349ff1d0d5ea752b277798137bb00174694ea212
Author: Stan Shebs <stanshebs@google.com>
Date:   Wed Mar 28 19:31:45 2018 -0700

    Fix GCC compilation issues in cherrypicks

Diff:
---
 elf/dl-dst.h                       | 2 +-
 nss/nss_borg/borg-pwd.c            | 2 +-
 sysdeps/unix/sysv/linux/x86/time.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index f00c8e2a6b..e4448c1298 100644
--- a/elf/dl-dst.h
+++ b/elf/dl-dst.h
@@ -66,7 +66,7 @@
 	  dst_len = (l)->l_origin == (char *) -1			      \
 	    ? 0 : strlen ((l)->l_origin);				      \
                                                                               \
-	char *exec_origin = GLRO(google_exec_origin_dir);		      \
+	const char *exec_origin = GLRO(google_exec_origin_dir);		      \
 	size_t exec_origin_len =					      \
 	  (exec_origin == NULL) ? 0 : strlen (exec_origin);		      \
 									      \
diff --git a/nss/nss_borg/borg-pwd.c b/nss/nss_borg/borg-pwd.c
index 3bbe6efcba..1f685ee443 100644
--- a/nss/nss_borg/borg-pwd.c
+++ b/nss/nss_borg/borg-pwd.c
@@ -70,7 +70,7 @@ static enum nss_status _nss_borg_endpwent_locked(void) {
 // _nss_borg_endpwent()
 // Called by NSS to close the passwd file
 
-enum nss_status _nss_borg_endpwent() {
+enum nss_status _nss_borg_endpwent(void) {
   enum nss_status ret;
   NSSBORG_LOCK;
   ret = _nss_borg_endpwent_locked();
diff --git a/sysdeps/unix/sysv/linux/x86/time.c b/sysdeps/unix/sysv/linux/x86/time.c
index 124bd967e1..8992656bad 100644
--- a/sysdeps/unix/sysv/linux/x86/time.c
+++ b/sysdeps/unix/sysv/linux/x86/time.c
@@ -59,4 +59,6 @@ time (time_t *t)
 
 #endif
 
+#if defined(__clang__)
 libc_hidden_weak (time)
+#endif