commit 1159c196db79993b153114bcc4363f7e0f831773
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 29 21:45:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 29 21:45:35 2016 +0000
tree 85affbc9e948b02a45bd3f544100aacc04b5c449
parent 91583867582e76f87371d23da155332d18252ce1
parent c80ffece02310ecdc8aefce26dd2b5f24cc6d4a9

Merge changes I98c9329f,I40936f7b,I09d20ff1

* changes:
  Defer registration of the arc4random fork-detect handler.
  Make getpid work before the main thread is initialized.
  Take the arc4random lock before forking.

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index ba62592..c7201cb 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1082,6 +1082,8 @@
                     "arch-mips/string/mips_strlen.c",
                 ],
             },
+            // http://b/29771478 - disable integrated-as for Mips
+            asflags: ["-fno-integrated-as"],
         },
         mips64: {
             srcs: [
@@ -1458,6 +1460,8 @@
         },
         mips: {
             srcs: ["arch-mips/syscalls/**/*.S"],
+            // http://b/29771478 - disable integrated-as for Mips
+            asflags: ["-fno-integrated-as"],
         },
         mips64: {
             srcs: ["arch-mips64/syscalls/**/*.S"],

libc/zoneinfo/tzdata

diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index 5229797..e161cec 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ