loader: fix leak of child-to-parent links on dlclose() am: 46c3aa2c0e -s ours am: 02b94ea8ff am: 623d83754a am: 254aec13d0 am: c65740f4a5 am: 59abd613d4 am: 2514cb784d am: f3537c61bf am: be8327ce71 am: 6be47949d6
am: 4852206c8b
Change-Id: I2ffa928ec3f42c062a8dd8ed71ef74ba2012a754
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index 57bff7b..577ede6 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ
diff --git a/tests/sys_prctl_test.cpp b/tests/sys_prctl_test.cpp
index b7c542b..f0ac1c3 100644
--- a/tests/sys_prctl_test.cpp
+++ b/tests/sys_prctl_test.cpp
@@ -41,7 +41,6 @@
std::string file_data;
ASSERT_TRUE(android::base::ReadFileToString("/proc/self/maps", &file_data));
- uintptr_t last_start = 0;
uintptr_t last_end = 0;
std::vector<std::string> lines = android::base::Split(file_data, "\n");
for (size_t i = 0; i < lines.size(); i++) {
@@ -55,7 +54,6 @@
// This will never fail on the first line, so no need to do any special checking.
ASSERT_GE(start, last_end)
<< "Overlapping map detected:\n" << lines[i -1] << '\n' << lines[i] << '\n';
- last_start = start;
last_end = end;
}