Fix GCC compilation issues in cherrypicks

diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index f00c8e2a6b42e21093344383a4eec109d70f14a1..e4448c12987e05216573b97ef3497d18e82ca978 100644 (file)
--- 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 3bbe6efcbac267144889c2e797b96b89d2bd2251..1f685ee443e815bf57370ff6fb8bb6888964a940 100644 (file)
--- 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 124bd967e18739cad3c3f2227331c858ea682a8e..8992656bad07b540a154daffc4ac1ab749fd952f 100644 (file)
--- 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