[glibc/google/grte/v5-2.27/master] Revert "Comment out second appearances of symbols in version scripts, lld errors out instead of just

[Shu-Chun Weng <scw at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=403fd5aa86bd03cc6fd3abeb7fa12a245eb0c721

commit 403fd5aa86bd03cc6fd3abeb7fa12a245eb0c721
Author: Shu-Chun Weng <scw@google.com>
Date:   Tue Oct 22 10:45:09 2019 -0700

    Revert "Comment out second appearances of symbols in version scripts, lld errors out instead of just warning"
    
    This reverts commit 0eee22b49ee34d852e79c6b65598b72f504ccebd.
    
    It appears lld no longer throws an error with these duplicated symbols.
    
    Signed-off-by: Shu-Chun Weng <scw@google.com>

Diff:
---
 math/Versions   | 3 +--
 misc/Versions   | 6 ++----
 posix/Versions  | 3 +--
 socket/Versions | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/math/Versions b/math/Versions
index 8334118..01ed388 100644
--- a/math/Versions
+++ b/math/Versions
@@ -169,8 +169,7 @@ libm {
     # in GLIBC_2.1 as it should have on platforms using that
     # implementation file.  On others, sysdeps/CPU/Versions now
     # puts exp2l in GLIBC_2.1, which will override this entry.
-    # Disable for now, as a workaround for new lld error.
-    # exp2l;
+    exp2l;
   }
   GLIBC_2.15 {
     # Optimized -ffinite-math-only entry points
diff --git a/misc/Versions b/misc/Versions
index 4d00aad..bfbda50 100644
--- a/misc/Versions
+++ b/misc/Versions
@@ -153,8 +153,7 @@ libc {
     # SHLIB_COMPAT(GLIBC_2_0, GLIBC_2_23) used in regexp.c
   }
   GLIBC_2.25 {
-    # Disable for now, as a workaround for new lld error.
-    # gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
+    gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
   }
   GLIBC_2.26 {
     preadv2; preadv64v2; pwritev2; pwritev64v2;
@@ -165,7 +164,6 @@ libc {
     __libc_ifunc_impl_list;
     __tdelete; __tfind; __tsearch; __twalk;
     __mmap; __munmap; __mprotect;
-    # Disable for now, as a workaround for new lld error.
-    # __sched_get_priority_min; __sched_get_priority_max;
+    __sched_get_priority_min; __sched_get_priority_max;
   }
 }
diff --git a/posix/Versions b/posix/Versions
index cdbee3c..65e9687 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -114,8 +114,7 @@ libc {
     # under GLIBC_2.0; the first instance in the script is taken as the
     # default, so linux configurations put them in GLIBC_2.0 while other
     # configuration put them in GLIBC_2.3.2.
-    # Disable for now, as a workaround for new lld error.
-    # getresgid; getresuid; setresgid; setresuid;
+    getresgid; getresuid; setresgid; setresuid;
   }
   GLIBC_2.3.3 {
     sched_getaffinity; sched_setaffinity;
diff --git a/socket/Versions b/socket/Versions
index b51d9f0..7ce6f43 100644
--- a/socket/Versions
+++ b/socket/Versions
@@ -35,8 +35,7 @@ libc {
     accept4;
   }
   GLIBC_2.17 {
-    # Disable for now, as a workaround for new lld error.
-    # recvmmsg; sendmmsg;
+    recvmmsg; sendmmsg;
   }
   GLIBC_PRIVATE {
     __sendmmsg;