Disable static linking warning for dlopen and dlmopen, and disable linking warning...

diff --git a/README.google b/README.google
index 32e6dcf4e6e9fda6026c4fad4f77b586ad58d8cb..d8d27656cb10ffaa5d4e6f97f4fa007c275246e7 100644 (file)
--- a/README.google
+++ b/README.google
@@ -92,3 +92,11 @@ sysdeps/x86_64/elf/start.S
   Forward-ported from cl/51271693 (from cl/38027-p2).
   (ppluzhnikov, google-local)
 
+dlfcn/dlmopen.c
+dlfcn/dlopen.c
+sysdeps/gnu/errlist-compat.awk
+  Disable static linking warning for dlopen and dlmopen, and disable linking
+  warning for sys_errlist and sys_nerr.
+  Forward-ported from part of cl/51276043 (from cl/38025-p2).
+  (ppluzhnikov, google-local)
+

diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c
index 1e2cbcfdb492752f327fe61884501a185679e4d0..9e50603a10ffab3a429e1ec3df89b7b522e482dd 100644 (file)
--- a/dlfcn/dlmopen.c
+++ b/dlfcn/dlmopen.c
@@ -30,7 +30,9 @@ dlmopen (Lmid_t nsid, const char *file, int mode)
 {
   return __dlmopen (nsid, file, mode, RETURN_ADDRESS (0));
 }
+#if 0  // Google-local
 static_link_warning (dlmopen)
+#endif
 
 #else
 

diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 2db6610a77e6bf432a02f5274478cbd95f98cd2b..c6c0c583a97754d5c2ab101ea804fd445d5c1d36 100644 (file)
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -29,7 +29,9 @@ dlopen (const char *file, int mode)
 {
   return __dlopen (file, mode, RETURN_ADDRESS (0));
 }
+#if 0  // Google-local
 static_link_warning (dlopen)
+#endif
 
 #else
 

diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk
index 1461ae499a4aaed3ea1d10b0ad686d4c0cda7134..3237e1dd99a7e19f9127818d6e16114fbfe827fe 100644 (file)
--- a/sysdeps/gnu/errlist-compat.awk
+++ b/sysdeps/gnu/errlist-compat.awk
@@ -126,8 +126,13 @@ versioned_symbol (libc, __sys_nerr_internal, _sys_nerr, %s);\n", \
     lastv, lastv, lastv, lastv;
 
   print "\n\
+/* Google-local:\n\
+   Disable deprecation warnings; they're emitted even if referenced\n\
+   only by debug info. */\n\
+#if 0\n\
 link_warning (sys_errlist, \"\
 `sys_errlist' is deprecated; use `strerror' or `strerror_r' instead\")\n\
 link_warning (sys_nerr, \"\
-`sys_nerr' is deprecated; use `strerror' or `strerror_r' instead\")";
+`sys_nerr' is deprecated; use `strerror' or `strerror_r' instead\")\n\
+#endif";
 }