commit 67ff8b5f9cb1af1a633e96a771e386d3305c6799
author Ryan Prichard <rprichard@google.com> Fri Oct 04 18:25:36 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 04 18:25:36 2019 +0000
tree e2672b6bcc95d7dafa2ab4096910d3d687b698e1
parent 3e565bd7eebeab285cb2edfb6cc5fd3a32cf78a5
parent c6bec07fb69426aa88c52e99651cac5feae50759

Merge "Inline soinfo::get_tls"

linker/linker_soinfo.cpp

diff --git a/linker/linker_soinfo.cpp b/linker/linker_soinfo.cpp
index d4b2541..14293d9 100644
--- a/linker/linker_soinfo.cpp
+++ b/linker/linker_soinfo.cpp
@@ -651,10 +651,6 @@
   return secondary_namespaces_;
 }
 
-soinfo_tls* soinfo::get_tls() const {
-  return has_min_version(5) ? tls_.get() : nullptr;
-}
-
 ElfW(Addr) soinfo::resolve_symbol_address(const ElfW(Sym)* s) const {
   if (ELF_ST_TYPE(s->st_info) == STT_GNU_IFUNC) {
     return call_ifunc_resolver(s->st_value + load_bias);

linker/linker_soinfo.h

diff --git a/linker/linker_soinfo.h b/linker/linker_soinfo.h
index 27032c2..dd3817c 100644
--- a/linker/linker_soinfo.h
+++ b/linker/linker_soinfo.h
@@ -294,7 +294,9 @@
   void add_secondary_namespace(android_namespace_t* secondary_ns);
   android_namespace_list_t& get_secondary_namespaces();
 
-  soinfo_tls* get_tls() const;
+  soinfo_tls* get_tls() const {
+    return has_min_version(5) ? tls_.get() : nullptr;
+  }
 
   void set_mapped_by_caller(bool reserved_map);
   bool is_mapped_by_caller() const;