Export a __secure_getenv symbol for link-time compatibility with GRTEv3. Tested:

diff --git a/README.google b/README.google
index f8224bb4445b2975f3975ebe326fcff412b3100c..6ffe14b2e16149295ed90389cd2818cfd5579ea6 100644 (file)
--- a/README.google
+++ b/README.google
@@ -384,3 +384,9 @@ elf/ldd.bash.in
   Import ldd patches from Ubuntu source package.  This fixes the ability
   of ldd to trace dependencies in non-executable dynamic libraries.
   (bmoses, google-local)
+
+stdlib/secure-getenv.c
+  Export a __secure_getenv weak symbol for backwards compatibility at link
+  time.
+  (bmoses, google-local)
+

diff --git a/stdlib/secure-getenv.c b/stdlib/secure-getenv.c
index 5dc48d9dcb6a82eb87f7d5cb549c520cec695c25..b6486b48ce33ca6ab9f9ba92567f62024bc42656 100644 (file)
--- a/stdlib/secure-getenv.c
+++ b/stdlib/secure-getenv.c
@@ -32,6 +32,9 @@ __libc_secure_getenv (name)
 weak_alias (__libc_secure_getenv, secure_getenv)
 libc_hidden_weak (__libc_secure_getenv)
 
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_17)
-compat_symbol (libc, __libc_secure_getenv, __secure_getenv, GLIBC_2_0);
-#endif
+/* Google-local: Export __secure_getenv to avoid linker errors during
+   the GRTEv3 to GRTEv4 transition period.  */
+//#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_17)
+//compat_symbol (libc, __libc_secure_getenv, __secure_getenv, GLIBC_2_0);
+//#endif
+weak_alias (__libc_secure_getenv, __secure_getenv);