commit 82f28565ce8f6f45ac0b269819d8242a94dad637
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 16 20:42:07 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 16 20:42:07 2017 +0000
tree f61aaf2ee8a35f1f2c91b7a090a9f94d57142c2e
parent f2c203f188a134bc03bf8dc9771e4ac74aff6ebe
parent 3f7e65e66e63113d2556df517647c812d21f8817

Merge "Add guards for things the versioner can't catch."

libc/bionic/pthread_create.cpp

diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
index 9197aa3..9be86f1 100644
--- a/libc/bionic/pthread_create.cpp
+++ b/libc/bionic/pthread_create.cpp
@@ -278,7 +278,7 @@
       munmap(thread->attr.stack_base, thread->mmap_size);
     }
     async_safe_format_log(ANDROID_LOG_WARN, "libc", "pthread_create failed: clone failed: %s",
-                          strerror(errno));
+                          strerror(clone_errno));
     return clone_errno;
   }
 

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index a212624..8aadd14 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3506,6 +3506,9 @@
   g_default_namespace.set_permitted_paths(default_ns_config->permitted_paths());
 
   namespaces[default_ns_config->name()] = &g_default_namespace;
+  if (default_ns_config->visible()) {
+    g_exported_namespaces[default_ns_config->name()] = &g_default_namespace;
+  }
 
   // 2. Initialize other namespaces