commit f29640c2d8920c98f4cfd461d80c297a1cafa86a
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 29 23:44:57 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 29 23:44:57 2015 +0000
tree 921bb4cac7bcf8fe53fc0c0e6a76b8031142fa46
parent c6b9b254dc042c9c2b8be72430a9f59803eb0794
parent b4e5067cab9f17fa76bd7695f41a0b5070e10df8

Merge "linker: initialize system properties"

libc/bionic/libc_logging.cpp

diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp
index 7ad21c4..cb0b334 100644
--- a/libc/bionic/libc_logging.cpp
+++ b/libc/bionic/libc_logging.cpp
@@ -56,6 +56,7 @@
   EVENT_TYPE_LONG     = 1,
   EVENT_TYPE_STRING   = 2,
   EVENT_TYPE_LIST     = 3,
+  EVENT_TYPE_FLOAT    = 4,
 };
 
 struct BufferOutputStream {

libc/zoneinfo/tzdata

diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index cbb22bc..2c734fa 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index cea3a88..ceee3a5 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2429,7 +2429,7 @@
   /* We can't log anything until the linker is relocated */
   bool relocating_linker = (flags_ & FLAG_LINKER) != 0;
   if (!relocating_linker) {
-    INFO("[ linking %s ]", get_soname());
+    INFO("[ linking %s ]", get_realpath());
     DEBUG("si->base = %p si->flags = 0x%08x", reinterpret_cast<void*>(base), flags_);
   }
 
@@ -3140,6 +3140,7 @@
   for (const auto& ld_preload_name : g_ld_preload_names) {
     needed_library_name_list.push_back(ld_preload_name.c_str());
     ++needed_libraries_count;
+    ++ld_preloads_count;
   }
 
   for_each_dt_needed(si, [&](const char* name) {

linker/linker_mips.cpp

diff --git a/linker/linker_mips.cpp b/linker/linker_mips.cpp
index 0769f82..87b811f 100644
--- a/linker/linker_mips.cpp
+++ b/linker/linker_mips.cpp
@@ -128,7 +128,7 @@
         if (s != nullptr) {
           *reinterpret_cast<ElfW(Addr)*>(reloc) += sym_addr;
         } else {
-          *reinterpret_cast<ElfW(Addr)*>(reloc) += base;
+          *reinterpret_cast<ElfW(Addr)*>(reloc) += load_bias;
         }
         break;
       default: