Merge "Make sys_resource test more robust." into lollipop-cts-dev

Make sys_resource test more robust.
Bug: 19482626 "ulimit -c xxx" command may run before bionic-unit-tests. Make sure sys_resource test fails gently in that case. Change-Id: Ic3b5ed8b20acba56df8c5ef082c88e5050e761aa (cherry picked from commit 4853f40f3f)
2015-06-02 22:02:29 +00:00 · 2015-06-02 14:40:26 -07:00 · 2014-10-09 18:31:01 -07:00 · 2014-10-09 11:10:23 -07:00 · 2014-10-07 23:17:14 +00:00 · 2014-10-07 15:27:36 +00:00
1369 changed files with 6254 additions and 4419 deletions
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -81,13 +81,6 @@ libc/
  private/
    # These are private header files meant for use within bionic itself.

-  stdio/
-  stdlib/
-  unistd/
-    # These are legacy files of unknown provenance. In the past, bionic was a
-    # mess of random versions of random files from all three of FreeBSD, NetBSD,
-    # and OpenBSD! We've been working to clean that up, but these directories
-    # are basically where all the stuff we haven't got to yet lives.
  dns/
    # Contains the DNS resolver (originates from NetBSD code).

@@ -114,6 +107,10 @@ libc/
    # current upstream source in one of the upstream directories or by
    # switching the file to C++ and cleaning it up.

+  stdio/
+    # These are legacy files of dubious provenance. We're working to clean
+    # this mess up, and this directory should disappear.
+
  tools/
    # Various tools used to maintain bionic.

--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -54,7 +54,7 @@ LOCAL_SHARED_LIBRARIES += libstlport
 LOCAL_SRC_FILES := $(benchmark_src_files)
 include $(BUILD_EXECUTABLE)

-ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
+ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
 ifeq ($(TARGET_ARCH),x86)
 LINKER = linker
 NATIVE_SUFFIX=32
--- a/benchmarks/property_benchmark.cpp
+++ b/benchmarks/property_benchmark.cpp
@@ -28,12 +28,14 @@

 extern void *__system_property_area__;

+// Do not exceed 512, that is about the largest number of properties
+// that can be created with the current property area size.
 #define TEST_NUM_PROPS \
-    Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(256)->Arg(512)->Arg(1024)
+    Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(256)->Arg(512)

 struct LocalPropertyTestState {
    LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
-        static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_";
+        static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_.";

        const char* android_data = getenv("ANDROID_DATA");
        if (android_data == NULL) {
@@ -66,18 +68,38 @@ struct LocalPropertyTestState {
        srandom(nprops);

        for (int i = 0; i < nprops; i++) {
-            name_lens[i] = random() % PROP_NAME_MAX;
+            // Make sure the name has at least 10 characters to make
+            // it very unlikely to generate the same random name.
+            name_lens[i] = (random() % (PROP_NAME_MAX - 10)) + 10;
            names[i] = new char[PROP_NAME_MAX + 1];
+            size_t prop_name_len = sizeof(prop_name_chars) - 1;
            for (int j = 0; j < name_lens[i]; j++) {
-                names[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)];
+                if (j == 0 || names[i][j-1] == '.' || j == name_lens[i] - 1) {
+                    // Certain values are not allowed:
+                    // - Don't start name with '.'
+                    // - Don't allow '.' to appear twice in a row
+                    // - Don't allow the name to end with '.'
+                    // This assumes that '.' is the last character in the
+                    // array so that decrementing the length by one removes
+                    // the value from the possible values.
+                    prop_name_len--;
+                }
+                names[i][j] = prop_name_chars[random() % prop_name_len];
            }
            names[i][name_lens[i]] = 0;
-            value_lens[i] = random() % PROP_VALUE_MAX;
+
+            // Make sure the value contains at least 1 character.
+            value_lens[i] = (random() % (PROP_VALUE_MAX - 1)) + 1;
            values[i] = new char[PROP_VALUE_MAX];
            for (int j = 0; j < value_lens[i]; j++) {
                values[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)];
            }
-            __system_property_add(names[i], name_lens[i], values[i], value_lens[i]);
+
+            if (__system_property_add(names[i], name_lens[i], values[i], value_lens[i]) < 0) {
+                printf("Failed to add a property, terminating...\n");
+                printf("%s = %.*s\n", names[i], value_lens[i], values[i]);
+                exit(1);
+            }
        }

        valid = true;
--- a/benchmarks/time_benchmark.cpp
+++ b/benchmarks/time_benchmark.cpp
@@ -16,32 +16,13 @@

 #include "benchmark.h"

+#include <sys/syscall.h>
 #include <time.h>

-#if defined(__BIONIC__)
-
-// Used by the horrible android.text.format.Time class, which is used by Calendar. http://b/8270865.
-extern "C" void localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz);
-
-static void BM_time_localtime_tz(int iters) {
-  StartBenchmarkTiming();
-
-  time_t now(time(NULL));
-  tm broken_down_time;
-  for (int i = 0; i < iters; ++i) {
-    localtime_tz(&now, &broken_down_time, "Europe/Berlin");
-  }
-
-  StopBenchmarkTiming();
-}
-BENCHMARK(BM_time_localtime_tz);
-
-#endif
-
 static void BM_time_clock_gettime(int iters) {
  StartBenchmarkTiming();

-  struct timespec t;
+  timespec t;
  for (int i = 0; i < iters; ++i) {
    clock_gettime(CLOCK_MONOTONIC, &t);
  }
@@ -49,3 +30,50 @@ static void BM_time_clock_gettime(int iters) {
  StopBenchmarkTiming();
 }
 BENCHMARK(BM_time_clock_gettime);
+
+static void BM_time_clock_gettime_syscall(int iters) {
+  StartBenchmarkTiming();
+
+  timespec t;
+  for (int i = 0; i < iters; ++i) {
+    syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &t);
+  }
+
+  StopBenchmarkTiming();
+}
+BENCHMARK(BM_time_clock_gettime_syscall);
+
+static void BM_time_gettimeofday(int iters) {
+  StartBenchmarkTiming();
+
+  timeval tv;
+  for (int i = 0; i < iters; ++i) {
+    gettimeofday(&tv, NULL);
+  }
+
+  StopBenchmarkTiming();
+}
+BENCHMARK(BM_time_gettimeofday);
+
+static void BM_time_gettimeofday_syscall(int iters) {
+  StartBenchmarkTiming();
+
+  timeval tv;
+  for (int i = 0; i < iters; ++i) {
+    syscall(__NR_gettimeofday, &tv, NULL);
+  }
+
+  StopBenchmarkTiming();
+}
+BENCHMARK(BM_time_gettimeofday_syscall);
+
+static void BM_time_time(int iters) {
+  StartBenchmarkTiming();
+
+  for (int i = 0; i < iters; ++i) {
+    time(NULL);
+  }
+
+  StopBenchmarkTiming();
+}
+BENCHMARK(BM_time_time);
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -37,7 +37,6 @@ endif
 # Define the common source files for all the libc instances
 # =========================================================
 libc_common_src_files := \
-    bionic/arc4random.c \
    bionic/bindresvport.c \
    bionic/daemon.c \
    bionic/err.c \
@@ -46,7 +45,6 @@ libc_common_src_files := \
    bionic/fts.c \
    bionic/gethostname.c \
    bionic/getpriority.c \
-    bionic/getpt.c \
    bionic/if_indextoname.c \
    bionic/if_nametoindex.c \
    bionic/initgroups.c \
@@ -54,8 +52,6 @@ libc_common_src_files := \
    bionic/isatty.c \
    bionic/memmem.c \
    bionic/pathconf.c \
-    bionic/ptsname.c \
-    bionic/ptsname_r.c \
    bionic/pututline.c \
    bionic/sched_cpualloc.c \
    bionic/sched_cpucount.c \
@@ -64,11 +60,8 @@ libc_common_src_files := \
    bionic/siginterrupt.c \
    bionic/sigsetmask.c \
    bionic/system_properties_compat.c \
-    bionic/unlockpt.c \
    stdio/snprintf.c\
    stdio/sprintf.c \
-    stdlib/atexit.c \
-    unistd/syslog.c \

 # Fortify implementations of libc functions.
 libc_common_src_files += \
@@ -97,7 +90,6 @@ libc_bionic_src_files := \
    bionic/access.cpp \
    bionic/assert.cpp \
    bionic/atof.cpp \
-    bionic/__bionic_name_mem.cpp \
    bionic/bionic_time_conversions.cpp \
    bionic/brk.cpp \
    bionic/c16rtomb.cpp \
@@ -110,8 +102,6 @@ libc_bionic_src_files := \
    bionic/__cmsg_nxthdr.cpp \
    bionic/connect.cpp \
    bionic/ctype.cpp \
-    bionic/__cxa_guard.cpp \
-    bionic/__cxa_pure_virtual.cpp \
    bionic/dirent.cpp \
    bionic/dup2.cpp \
    bionic/epoll_create.cpp \
@@ -127,6 +117,7 @@ libc_bionic_src_files := \
    bionic/futimens.cpp \
    bionic/getauxval.cpp \
    bionic/getcwd.cpp \
+    bionic/getentropy_linux.c \
    bionic/getpgrp.cpp \
    bionic/getpid.cpp \
    bionic/gettid.cpp \
@@ -149,11 +140,11 @@ libc_bionic_src_files := \
    bionic/mknod.cpp \
    bionic/mntent.cpp \
    bionic/NetdClientDispatch.cpp \
-    bionic/new.cpp \
    bionic/open.cpp \
    bionic/pause.cpp \
    bionic/pipe.cpp \
    bionic/poll.cpp \
+    bionic/posix_fadvise.cpp \
    bionic/posix_fallocate.cpp \
    bionic/posix_timers.cpp \
    bionic/pthread_atfork.cpp \
@@ -165,6 +156,7 @@ libc_bionic_src_files := \
    bionic/pthread_exit.cpp \
    bionic/pthread_getcpuclockid.cpp \
    bionic/pthread_getschedparam.cpp \
+    bionic/pthread_gettid_np.cpp \
    bionic/pthread_internals.cpp \
    bionic/pthread_join.cpp \
    bionic/pthread_key.cpp \
@@ -177,7 +169,9 @@ libc_bionic_src_files := \
    bionic/pthread_setschedparam.cpp \
    bionic/pthread_sigmask.cpp \
    bionic/ptrace.cpp \
+    bionic/pty.cpp \
    bionic/raise.cpp \
+    bionic/rand.cpp \
    bionic/readlink.cpp \
    bionic/reboot.cpp \
    bionic/recv.cpp \
@@ -219,6 +213,7 @@ libc_bionic_src_files := \
    bionic/stubs.cpp \
    bionic/symlink.cpp \
    bionic/sysconf.cpp \
+    bionic/syslog.cpp \
    bionic/sys_siglist.c \
    bionic/sys_signame.c \
    bionic/system_properties.cpp \
@@ -229,11 +224,16 @@ libc_bionic_src_files := \
    bionic/umount.cpp \
    bionic/unlink.cpp \
    bionic/utimes.cpp \
-    bionic/vfork.cpp \
+    bionic/vdso.cpp \
    bionic/wait.cpp \
    bionic/wchar.cpp \
    bionic/wctype.cpp \

+libc_cxa_src_files := \
+    bionic/__cxa_guard.cpp \
+    bionic/__cxa_pure_virtual.cpp \
+    bionic/new.cpp \
+
 libc_upstream_freebsd_src_files := \
    upstream-freebsd/lib/libc/gen/ldexp.c \
    upstream-freebsd/lib/libc/gen/sleep.c \
@@ -282,31 +282,26 @@ libc_upstream_netbsd_src_files := \
    upstream-netbsd/lib/libc/regex/regerror.c \
    upstream-netbsd/lib/libc/regex/regexec.c \
    upstream-netbsd/lib/libc/regex/regfree.c \
-    upstream-netbsd/lib/libc/resolv/mtctxres.c \
    upstream-netbsd/lib/libc/stdlib/bsearch.c \
    upstream-netbsd/lib/libc/stdlib/div.c \
    upstream-netbsd/lib/libc/stdlib/drand48.c \
    upstream-netbsd/lib/libc/stdlib/erand48.c \
+    upstream-netbsd/lib/libc/stdlib/insque.c \
    upstream-netbsd/lib/libc/stdlib/jrand48.c \
    upstream-netbsd/lib/libc/stdlib/ldiv.c \
    upstream-netbsd/lib/libc/stdlib/lldiv.c \
    upstream-netbsd/lib/libc/stdlib/lrand48.c \
-    upstream-netbsd/lib/libc/stdlib/lsearch.c \
    upstream-netbsd/lib/libc/stdlib/mrand48.c \
    upstream-netbsd/lib/libc/stdlib/nrand48.c \
    upstream-netbsd/lib/libc/stdlib/_rand48.c \
-    upstream-netbsd/lib/libc/stdlib/rand.c \
    upstream-netbsd/lib/libc/stdlib/rand_r.c \
+    upstream-netbsd/lib/libc/stdlib/remque.c \
    upstream-netbsd/lib/libc/stdlib/seed48.c \
    upstream-netbsd/lib/libc/stdlib/srand48.c \
-    upstream-netbsd/lib/libc/stdlib/tdelete.c \
-    upstream-netbsd/lib/libc/stdlib/tfind.c \
-    upstream-netbsd/lib/libc/stdlib/tsearch.c \
    upstream-netbsd/lib/libc/string/memccpy.c \
    upstream-netbsd/lib/libc/string/strcasestr.c \
    upstream-netbsd/lib/libc/string/strcoll.c \
    upstream-netbsd/lib/libc/string/strxfrm.c \
-    upstream-netbsd/lib/libc/thread-stub/__isthreaded.c \
    upstream-netbsd/lib/libc/unistd/killpg.c \

 libc_upstream_openbsd_gdtoa_src_files := \
@@ -337,6 +332,8 @@ libc_upstream_openbsd_gdtoa_src_files_64 := \
    upstream-openbsd/lib/libc/gdtoa/strtorQ.c \

 libc_upstream_openbsd_src_files := \
+    upstream-openbsd/lib/libc/crypt/arc4random.c \
+    upstream-openbsd/lib/libc/crypt/arc4random_uniform.c \
    upstream-openbsd/lib/libc/gen/alarm.c \
    upstream-openbsd/lib/libc/gen/ctype_.c \
    upstream-openbsd/lib/libc/gen/exec.c \
@@ -463,11 +460,13 @@ libc_upstream_openbsd_src_files := \
    upstream-openbsd/lib/libc/stdio/wprintf.c \
    upstream-openbsd/lib/libc/stdio/wscanf.c \
    upstream-openbsd/lib/libc/stdio/wsetup.c \
+    upstream-openbsd/lib/libc/stdlib/atexit.c \
    upstream-openbsd/lib/libc/stdlib/atoi.c \
    upstream-openbsd/lib/libc/stdlib/atol.c \
    upstream-openbsd/lib/libc/stdlib/atoll.c \
    upstream-openbsd/lib/libc/stdlib/exit.c \
    upstream-openbsd/lib/libc/stdlib/getenv.c \
+    upstream-openbsd/lib/libc/stdlib/lsearch.c \
    upstream-openbsd/lib/libc/stdlib/setenv.c \
    upstream-openbsd/lib/libc/stdlib/strtoimax.c \
    upstream-openbsd/lib/libc/stdlib/strtol.c \
@@ -476,6 +475,8 @@ libc_upstream_openbsd_src_files := \
    upstream-openbsd/lib/libc/stdlib/strtoull.c \
    upstream-openbsd/lib/libc/stdlib/strtoumax.c \
    upstream-openbsd/lib/libc/stdlib/system.c \
+    upstream-openbsd/lib/libc/stdlib/tfind.c \
+    upstream-openbsd/lib/libc/stdlib/tsearch.c \
    upstream-openbsd/lib/libc/string/strcasecmp.c \
    upstream-openbsd/lib/libc/string/strcspn.c \
    upstream-openbsd/lib/libc/string/strdup.c \
@@ -549,7 +550,6 @@ libc_common_cppflags := \
 # Define some common includes
 # ========================================================
 libc_common_c_includes += \
-    $(LOCAL_PATH)/stdlib  \
    $(LOCAL_PATH)/stdio   \

 # ========================================================
@@ -637,6 +637,7 @@ LOCAL_SRC_FILES := \
    $(call all-c-files-under,dns) \
    upstream-netbsd/lib/libc/isc/ev_streams.c \
    upstream-netbsd/lib/libc/isc/ev_timers.c \
+    upstream-netbsd/lib/libc/resolv/mtctxres.c \

 LOCAL_CFLAGS := \
    $(libc_common_cflags) \
@@ -735,6 +736,7 @@ LOCAL_SRC_FILES := $(libc_upstream_openbsd_src_files)
 LOCAL_CFLAGS := \
    $(libc_common_cflags) \
    -Wno-sign-compare -Wno-uninitialized -Wno-unused-parameter \
+    -I$(LOCAL_PATH)/private \
    -I$(LOCAL_PATH)/upstream-openbsd/android/include \
    -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \
    -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/gdtoa/ \
@@ -767,6 +769,7 @@ LOCAL_CFLAGS := \
    $(libc_common_cflags) \
    -Wno-sign-compare -Wno-uninitialized \
    -fvisibility=hidden \
+    -I$(LOCAL_PATH)/private \
    -I$(LOCAL_PATH)/upstream-openbsd/android/include \
    -I$(LOCAL_PATH)/upstream-openbsd/lib/libc/include \
    -include openbsd-compat.h \
@@ -806,6 +809,28 @@ $(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_bionic_src_files
 include $(BUILD_STATIC_LIBRARY)


+# ========================================================
+# libc_cxa.a - Things traditionally in libstdc++
+# ========================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libc_cxa_src_files)
+LOCAL_CFLAGS := $(libc_common_cflags) \
+    -fvisibility=hidden \
+
+LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
+LOCAL_CPPFLAGS := $(libc_common_cppflags)
+LOCAL_C_INCLUDES := $(libc_common_c_includes)
+LOCAL_MODULE := libc_cxa
+# GCC refuses to hide new/delete
+LOCAL_CLANG := true
+LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
+
+include $(BUILD_STATIC_LIBRARY)
+
+
 # ========================================================
 # libc_syscalls.a
 # ========================================================
@@ -858,6 +883,7 @@ LOCAL_CLANG := $(use_clang)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
 LOCAL_WHOLE_STATIC_LIBRARIES := \
    libc_bionic \
+    libc_cxa \
    libc_dns \
    libc_freebsd \
    libc_gdtoa \
@@ -979,8 +1005,6 @@ LOCAL_SRC_FILES := \
    $(libc_arch_dynamic_src_files) \
    $(libc_static_common_src_files) \
    bionic/malloc_debug_common.cpp \
-    bionic/debug_mapinfo.cpp \
-    bionic/debug_stacktrace.cpp \
    bionic/libc_init_dynamic.cpp \
    bionic/NetdClient.cpp \

@@ -1046,7 +1070,9 @@ LOCAL_CFLAGS := \
 LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
 LOCAL_CPPFLAGS := $(libc_common_cppflags)

-LOCAL_C_INCLUDES := $(libc_common_c_includes)
+# Make sure that unwind.h comes from libunwind.
+LOCAL_C_INCLUDES := \
+    $(libc_common_c_includes) \

 LOCAL_SRC_FILES := \
    bionic/debug_mapinfo.cpp \
@@ -1061,6 +1087,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)

 LOCAL_SHARED_LIBRARIES := libc libdl
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
+# Only need this for arm since libc++ uses its own unwind code that
+# doesn't mix with the other default unwind code.
+LOCAL_STATIC_LIBRARIES_arm := libc++
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true

 # Don't install on release build
@@ -1103,6 +1132,36 @@ include $(BUILD_SHARED_LIBRARY)

 endif  #!user

+# ========================================================
+# libstdc++.so
+# ========================================================
+libstdcxx_common_src_files := \
+    bionic/__cxa_guard.cpp \
+    bionic/__cxa_pure_virtual.cpp \
+    bionic/new.cpp \
+    bionic/libc_logging.cpp \
+
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES := $(libc_common_c_includes)
+LOCAL_CFLAGS := $(libc_common_cflags)
+LOCAL_SRC_FILES := $(libstdcxx_common_src_files)
+LOCAL_MODULE:= libstdc++
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_SYSTEM_SHARED_LIBRARIES := libc
+include $(BUILD_SHARED_LIBRARY)
+
+# ========================================================
+# libstdc++.a
+# ========================================================
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES := $(libc_common_c_includes)
+LOCAL_CFLAGS := $(libc_common_cflags)
+LOCAL_SRC_FILES := $(libstdcxx_common_src_files)
+LOCAL_MODULE:= libstdc++
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_SYSTEM_SHARED_LIBRARIES := libc
+include $(BUILD_STATIC_LIBRARY)
+

 # ========================================================
 include $(call all-makefiles-under,$(LOCAL_PATH))
--- a/libc/NOTICE
+++ b/libc/NOTICE
@@ -3,12 +3,12 @@

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-      Redistributions of source code must retain the above copyright
+       * Redistributions of source code must retain the above copyright
         notice, this list of conditions and the following disclaimer.
-      Redistributions in binary form must reproduce the above copyright
+       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
-      Neither the name of the Linaro nor the
+       * Neither the name of the Linaro nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.

@@ -34,12 +34,12 @@

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-      Redistributions of source code must retain the above copyright
+       * Redistributions of source code must retain the above copyright
         notice, this list of conditions and the following disclaimer.
-      Redistributions in binary form must reproduce the above copyright
+       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
-      Neither the name of the company nor the names of its contributors
+       * Neither the name of the company nor the names of its contributors
         may be used to endorse or promote products derived from this
         software without specific prior written permission.

@@ -55,6 +55,34 @@
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+-------------------------------------------------------------------
+
+ Copyright (c) 1993 John Brezak
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
 -------------------------------------------------------------------

 ====================================================
@@ -184,9 +212,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -228,9 +256,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -257,9 +285,9 @@ Copyright (c) 2013-2014, NVIDIA Corporation.  All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -285,9 +313,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -329,9 +357,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -373,9 +401,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -448,9 +476,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -492,9 +520,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -536,9 +564,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -565,9 +593,9 @@ Copyright (c) 2013-2014 NVIDIA Corporation.  All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -594,9 +622,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -638,9 +666,9 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
-Redistributions of source code must retain the above copyright
+ * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in
   the documentation and/or other materials provided with the
   distribution.
@@ -804,35 +832,6 @@ SUCH DAMAGE.

 -------------------------------------------------------------------

-Copyright (c) 1983, 1988, 1993
-   The Regents of the University of California.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-------------------------------------------------------------------
-
 Copyright (c) 1983, 1989
   The Regents of the University of California.  All rights reserved.

@@ -3164,35 +3163,6 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

 -------------------------------------------------------------------

-Copyright (c) 1999 The NetBSD Foundation, Inc.
-All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation
-by Michael Graff.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-------------------------------------------------------------------
-
 Copyright (c) 2000 Ben Harris.
 Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 All rights reserved.
@@ -4132,6 +4102,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 -------------------------------------------------------------------

+Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+-------------------------------------------------------------------
+
 Copyright (c) 2009
     MIPS Technologies, Inc., California.

@@ -4253,13 +4239,13 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:

-    Redistributions of source code must retain the above copyright
+     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
-    Redistributions in binary form must reproduce the above copyright
+     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer
       in the documentation and/or other materials provided with
       the distribution.
-    Neither the name of MIPS Technologies Inc. nor the names of its
+     * Neither the name of MIPS Technologies Inc. nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.

@@ -4299,16 +4285,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    * this list of conditions and the following disclaimer in the documentation
+    * and/or other materials provided with the distribution.

-   Neither the name of Intel Corporation nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+    * Neither the name of Intel Corporation nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -4329,16 +4315,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    * this list of conditions and the following disclaimer in the documentation
+    * and/or other materials provided with the distribution.

-   Neither the name of Intel Corporation nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+    * Neither the name of Intel Corporation nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -4412,16 +4398,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    * this list of conditions and the following disclaimer in the documentation
+    * and/or other materials provided with the distribution.

-   Neither the name of Intel Corporation nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+    * Neither the name of Intel Corporation nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -4471,16 +4457,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    * this list of conditions and the following disclaimer in the documentation
+    * and/or other materials provided with the distribution.

-   Neither the name of Intel Corporation nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+    * Neither the name of Intel Corporation nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -4501,16 +4487,16 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    * this list of conditions and the following disclaimer in the documentation
+    * and/or other materials provided with the distribution.

-   Neither the name of Intel Corporation nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+    * Neither the name of Intel Corporation nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -4530,12 +4516,12 @@ All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-   Redistributions of source code must retain the above copyright
+    * Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
-   Redistributions in binary form must reproduce the above copyright
+    * Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in the
      documentation and/or other materials provided with the distribution.
-   Neither the name of the VMware, Inc. nor the names of its contributors
+    * Neither the name of the VMware, Inc. nor the names of its contributors
      may be used to endorse or promote products derived from this software
      without specific prior written permission.

@@ -4557,12 +4543,12 @@ Copyright (c) 2012, Linaro Limited

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-      Redistributions of source code must retain the above copyright
+       * Redistributions of source code must retain the above copyright
         notice, this list of conditions and the following disclaimer.
-      Redistributions in binary form must reproduce the above copyright
+       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
-      Neither the name of the Linaro nor the
+       * Neither the name of the Linaro nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.

@@ -4586,12 +4572,12 @@ Copyright (c) 2012, Linaro Limited

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-      Redistributions of source code must retain the above copyright
+       * Redistributions of source code must retain the above copyright
         notice, this list of conditions and the following disclaimer.
-      Redistributions in binary form must reproduce the above copyright
+       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
-      Neither the name of the Linaro nor the
+       * Neither the name of the Linaro nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.

@@ -4660,14 +4646,14 @@ Copyright (c) 2013, Linaro Limited
   modification, are permitted provided that the following conditions
   are met:

-     Redistributions of source code must retain the above copyright
+      * Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.

-     Redistributions in binary form must reproduce the above copyright
+      * Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in the
      documentation and/or other materials provided with the distribution.

-     Neither the name of Linaro Limited nor the names of its
+      * Neither the name of Linaro Limited nor the names of its
      contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.

@@ -4685,22 +4671,42 @@ Copyright (c) 2013, Linaro Limited

 -------------------------------------------------------------------

+Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
+Copyright (c) 2014 Bob Beck <beck@obtuse.com>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Emulation of getentropy(2) as documented at:
+http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man2/getentropy.2
+
+-------------------------------------------------------------------
+
 Copyright (c) 2014, Intel Corporation
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

-   Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
+    * Redistributions of source code must retain the above copyright notice,
+    * this list of conditions and the following disclaimer.

-   Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+    * Redistributions in binary form must reproduce the above copyright notice,
+    * this list of conditions and the following disclaimer in the documentation
+    * and/or other materials provided with the distribution.

-   Neither the name of Intel Corporation nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
+    * Neither the name of Intel Corporation nor the names of its contributors
+    * may be used to endorse or promote products derived from this software
+    * without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -4720,12 +4726,12 @@ Copyright (c) 2014, Linaro Limited

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
-      Redistributions of source code must retain the above copyright
+       * Redistributions of source code must retain the above copyright
         notice, this list of conditions and the following disclaimer.
-      Redistributions in binary form must reproduce the above copyright
+       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
-      Neither the name of the Linaro nor the
+       * Neither the name of the Linaro nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.

@@ -5149,3 +5155,34 @@ THIS SOFTWARE.

 -------------------------------------------------------------------

+memchr - find a character in a memory zone
+
+Copyright (c) 2014, ARM Limited
+All rights Reserved.
+Copyright (c) 2014, Linaro Ltd.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the company nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------
+
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -77,12 +77,11 @@ int prlimit64(pid_t, int, struct rlimit64*, const struct rlimit64*)  arm,mips,x8
 int     setgroups:setgroups32(int, const gid_t*)   arm,x86
 int     setgroups:setgroups(int, const gid_t*)     arm64,mips,mips64,x86_64
 int     setpgid(pid_t, pid_t)  all
+pid_t   vfork(void)  arm
 int     setregid:setregid32(gid_t, gid_t)  arm,x86
 int     setregid:setregid(gid_t, gid_t)    arm64,mips,mips64,x86_64
 int     chroot(const char*)  all
-# IMPORTANT: Even though <sys/prctl.h> declares prctl(int, ...), the syscall stub must take 6 arguments
-#            to match the kernel implementation.
-int     prctl(int option, unsigned int arg2, unsigned int arg3, unsigned int arg4, unsigned int arg5) all
+int     prctl(int, unsigned long, unsigned long, unsigned long, unsigned long) all
 long    __arch_prctl:arch_prctl(int, unsigned long) x86_64
 int     capget(cap_user_header_t header, cap_user_data_t data) all
 int     capset(cap_user_header_t header, const cap_user_data_t data) all
@@ -168,6 +167,12 @@ void* mmap|mmap64(void*, size_t, int, int, int, off_t)  arm64,mips64,x86_64
 int fallocate64:fallocate(int, int, off64_t, off64_t) arm,mips,x86
 int fallocate|fallocate64(int, int, off_t, off_t) arm64,mips64,x86_64

+# posix_fadvise64 is awkward: arm has shuffled arguments,
+# the POSIX functions don't set errno, and no architecture has posix_fadvise.
+int __arm_fadvise64_64:arm_fadvise64_64(int, int, off64_t, off64_t) arm
+int __fadvise64:fadvise64_64(int, off64_t, off64_t, int) x86
+int __fadvise64:fadvise64(int, off64_t, off64_t, int) arm64,mips,mips64,x86_64
+
 int __fstatfs64:fstatfs64(int, size_t, struct statfs*)  arm,mips,x86
 int fstatfs64|fstatfs:fstatfs(int, struct statfs*)  arm64,mips64,x86_64
 int __statfs64:statfs64(const char*, size_t, struct statfs*)  arm,mips,x86
@@ -194,11 +199,9 @@ int     swapon(const char*, int) all
 int     swapoff(const char*) all

 # time
-int           gettimeofday(struct timeval*, struct timezone*)       all
 int           settimeofday(const struct timeval*, const struct timezone*)   all
 clock_t       times(struct tms*)       all
 int           nanosleep(const struct timespec*, struct timespec*)   all
-int           clock_gettime(clockid_t clk_id, struct timespec* tp)    all
 int           clock_settime(clockid_t clk_id, const struct timespec* tp)  all
 int           clock_getres(clockid_t clk_id, struct timespec* res)   all
 int           clock_nanosleep(clockid_t clock_id, int flags, const struct timespec* req, struct timespec* rem)  all
@@ -307,6 +310,9 @@ int __ppoll:ppoll(pollfd*, unsigned int, timespec*, const sigset_t*, size_t)  al

 int __set_tid_address:set_tid_address(int*)  all

+int setfsgid(gid_t)  all
+int setfsuid(uid_t)  all
+
 pid_t wait4(pid_t, int*, int, struct rusage*)  all
 int __waitid:waitid(int, pid_t, struct siginfo_t*, int, void*)  all

@@ -320,3 +326,9 @@ int     __set_tls:set_thread_area(void*) mips,mips64

 # x86-specific
 int     __set_thread_area:set_thread_area(void*) x86
+
+# vdso stuff.
+int clock_gettime(clockid_t, timespec*)                 arm,mips,mips64,x86
+int __clock_gettime:clock_gettime(clockid_t, timespec*) arm64,x86_64
+int gettimeofday(timeval*, timezone*)                   arm,mips,mips64,x86
+int __gettimeofday:gettimeofday(timeval*, timezone*)    arm64,x86_64
--- a/libc/arch-arm/arm.mk
+++ b/libc/arch-arm/arm.mk
@@ -53,7 +53,6 @@ libc_bionic_src_files_arm += \
    arch-arm/bionic/atomics_arm.c \
    arch-arm/bionic/__bionic_clone.S \
    arch-arm/bionic/_exit_with_stack_teardown.S \
-    arch-arm/bionic/__get_sp.S \
    arch-arm/bionic/libgcc_compat.c \
    arch-arm/bionic/memcmp.S \
    arch-arm/bionic/_setjmp.S \
--- a/libc/arch-arm/bionic/__bionic_clone.S
+++ b/libc/arch-arm/bionic/__bionic_clone.S
@@ -57,7 +57,7 @@ ENTRY(__bionic_clone)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal

 1:  # The child.
    # Setting lr to 0 will make the unwinder stop at __start_thread
--- a/libc/arch-arm/bionic/syscall.S
+++ b/libc/arch-arm/bionic/syscall.S
@@ -47,5 +47,5 @@ ENTRY(syscall)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(syscall)
--- a/libc/arch-arm/syscalls/__accept4.S
+++ b/libc/arch-arm/syscalls/__accept4.S
@@ -10,5 +10,5 @@ ENTRY(__accept4)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__accept4)
--- a/libc/arch-arm/syscalls/__arm_fadvise64_64.S
+++ b/libc/arch-arm/syscalls/__arm_fadvise64_64.S
@@ -0,0 +1,22 @@
+/* Generated by gensyscalls.py. Do not edit. */
+
+#include <private/bionic_asm.h>
+
+ENTRY(__arm_fadvise64_64)
+    mov     ip, sp
+    stmfd   sp!, {r4, r5, r6, r7}
+    .cfi_def_cfa_offset 16
+    .cfi_rel_offset r4, 0
+    .cfi_rel_offset r5, 4
+    .cfi_rel_offset r6, 8
+    .cfi_rel_offset r7, 12
+    ldmfd   ip, {r4, r5, r6}
+    ldr     r7, =__NR_arm_fadvise64_64
+    swi     #0
+    ldmfd   sp!, {r4, r5, r6, r7}
+    .cfi_def_cfa_offset 0
+    cmn     r0, #(MAX_ERRNO + 1)
+    bxls    lr
+    neg     r0, r0
+    b       __set_errno_internal
+END(__arm_fadvise64_64)
--- a/libc/arch-arm/syscalls/__brk.S
+++ b/libc/arch-arm/syscalls/__brk.S
@@ -10,5 +10,5 @@ ENTRY(__brk)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__brk)
--- a/libc/arch-arm/syscalls/__connect.S
+++ b/libc/arch-arm/syscalls/__connect.S
@@ -10,5 +10,5 @@ ENTRY(__connect)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__connect)
--- a/libc/arch-arm/syscalls/__epoll_pwait.S
+++ b/libc/arch-arm/syscalls/__epoll_pwait.S
@@ -18,5 +18,5 @@ ENTRY(__epoll_pwait)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__epoll_pwait)
--- a/libc/arch-arm/syscalls/__exit.S
+++ b/libc/arch-arm/syscalls/__exit.S
@@ -10,5 +10,5 @@ ENTRY(__exit)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__exit)
--- a/libc/arch-arm/syscalls/__fcntl64.S
+++ b/libc/arch-arm/syscalls/__fcntl64.S
@@ -10,5 +10,5 @@ ENTRY(__fcntl64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__fcntl64)
--- a/libc/arch-arm/syscalls/__fstatfs64.S
+++ b/libc/arch-arm/syscalls/__fstatfs64.S
@@ -10,5 +10,5 @@ ENTRY(__fstatfs64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__fstatfs64)
--- a/libc/arch-arm/syscalls/__getcpu.S
+++ b/libc/arch-arm/syscalls/__getcpu.S
@@ -10,5 +10,5 @@ ENTRY(__getcpu)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__getcpu)
--- a/libc/arch-arm/syscalls/__getcwd.S
+++ b/libc/arch-arm/syscalls/__getcwd.S
@@ -10,5 +10,5 @@ ENTRY(__getcwd)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__getcwd)
--- a/libc/arch-arm/syscalls/__getdents64.S
+++ b/libc/arch-arm/syscalls/__getdents64.S
@@ -10,5 +10,5 @@ ENTRY(__getdents64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__getdents64)
--- a/libc/arch-arm/syscalls/__getpid.S
+++ b/libc/arch-arm/syscalls/__getpid.S
@@ -10,5 +10,5 @@ ENTRY(__getpid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__getpid)
--- a/libc/arch-arm/syscalls/__getpriority.S
+++ b/libc/arch-arm/syscalls/__getpriority.S
@@ -10,5 +10,5 @@ ENTRY(__getpriority)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__getpriority)
--- a/libc/arch-arm/syscalls/__ioctl.S
+++ b/libc/arch-arm/syscalls/__ioctl.S
@@ -10,5 +10,5 @@ ENTRY(__ioctl)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__ioctl)
--- a/libc/arch-arm/syscalls/__llseek.S
+++ b/libc/arch-arm/syscalls/__llseek.S
@@ -18,5 +18,5 @@ ENTRY(__llseek)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__llseek)
--- a/libc/arch-arm/syscalls/__mmap2.S
+++ b/libc/arch-arm/syscalls/__mmap2.S
@@ -18,5 +18,5 @@ ENTRY(__mmap2)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__mmap2)
--- a/libc/arch-arm/syscalls/__openat.S
+++ b/libc/arch-arm/syscalls/__openat.S
@@ -10,5 +10,5 @@ ENTRY(__openat)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__openat)
--- a/libc/arch-arm/syscalls/__ppoll.S
+++ b/libc/arch-arm/syscalls/__ppoll.S
@@ -18,5 +18,5 @@ ENTRY(__ppoll)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__ppoll)
--- a/libc/arch-arm/syscalls/__pselect6.S
+++ b/libc/arch-arm/syscalls/__pselect6.S
@@ -18,5 +18,5 @@ ENTRY(__pselect6)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__pselect6)
--- a/libc/arch-arm/syscalls/__ptrace.S
+++ b/libc/arch-arm/syscalls/__ptrace.S
@@ -10,5 +10,5 @@ ENTRY(__ptrace)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__ptrace)
--- a/libc/arch-arm/syscalls/__reboot.S
+++ b/libc/arch-arm/syscalls/__reboot.S
@@ -10,5 +10,5 @@ ENTRY(__reboot)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__reboot)
--- a/libc/arch-arm/syscalls/__rt_sigaction.S
+++ b/libc/arch-arm/syscalls/__rt_sigaction.S
@@ -10,5 +10,5 @@ ENTRY(__rt_sigaction)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__rt_sigaction)
--- a/libc/arch-arm/syscalls/__rt_sigpending.S
+++ b/libc/arch-arm/syscalls/__rt_sigpending.S
@@ -10,5 +10,5 @@ ENTRY(__rt_sigpending)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__rt_sigpending)
--- a/libc/arch-arm/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-arm/syscalls/__rt_sigprocmask.S
@@ -10,5 +10,5 @@ ENTRY(__rt_sigprocmask)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__rt_sigprocmask)
--- a/libc/arch-arm/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-arm/syscalls/__rt_sigsuspend.S
@@ -10,5 +10,5 @@ ENTRY(__rt_sigsuspend)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__rt_sigsuspend)
--- a/libc/arch-arm/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-arm/syscalls/__rt_sigtimedwait.S
@@ -10,5 +10,5 @@ ENTRY(__rt_sigtimedwait)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__rt_sigtimedwait)
--- a/libc/arch-arm/syscalls/__sched_getaffinity.S
+++ b/libc/arch-arm/syscalls/__sched_getaffinity.S
@@ -10,5 +10,5 @@ ENTRY(__sched_getaffinity)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__sched_getaffinity)
--- a/libc/arch-arm/syscalls/__set_tid_address.S
+++ b/libc/arch-arm/syscalls/__set_tid_address.S
@@ -10,5 +10,5 @@ ENTRY(__set_tid_address)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__set_tid_address)
--- a/libc/arch-arm/syscalls/__set_tls.S
+++ b/libc/arch-arm/syscalls/__set_tls.S
@@ -10,5 +10,5 @@ ENTRY(__set_tls)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__set_tls)
--- a/libc/arch-arm/syscalls/__sigaction.S
+++ b/libc/arch-arm/syscalls/__sigaction.S
@@ -10,5 +10,5 @@ ENTRY(__sigaction)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__sigaction)
--- a/libc/arch-arm/syscalls/__signalfd4.S
+++ b/libc/arch-arm/syscalls/__signalfd4.S
@@ -10,5 +10,5 @@ ENTRY(__signalfd4)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__signalfd4)
--- a/libc/arch-arm/syscalls/__socket.S
+++ b/libc/arch-arm/syscalls/__socket.S
@@ -10,5 +10,5 @@ ENTRY(__socket)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__socket)
--- a/libc/arch-arm/syscalls/__statfs64.S
+++ b/libc/arch-arm/syscalls/__statfs64.S
@@ -10,5 +10,5 @@ ENTRY(__statfs64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__statfs64)
--- a/libc/arch-arm/syscalls/__timer_create.S
+++ b/libc/arch-arm/syscalls/__timer_create.S
@@ -10,5 +10,5 @@ ENTRY(__timer_create)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__timer_create)
--- a/libc/arch-arm/syscalls/__timer_delete.S
+++ b/libc/arch-arm/syscalls/__timer_delete.S
@@ -10,5 +10,5 @@ ENTRY(__timer_delete)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__timer_delete)
--- a/libc/arch-arm/syscalls/__timer_getoverrun.S
+++ b/libc/arch-arm/syscalls/__timer_getoverrun.S
@@ -10,5 +10,5 @@ ENTRY(__timer_getoverrun)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__timer_getoverrun)
--- a/libc/arch-arm/syscalls/__timer_gettime.S
+++ b/libc/arch-arm/syscalls/__timer_gettime.S
@@ -10,5 +10,5 @@ ENTRY(__timer_gettime)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__timer_gettime)
--- a/libc/arch-arm/syscalls/__timer_settime.S
+++ b/libc/arch-arm/syscalls/__timer_settime.S
@@ -10,5 +10,5 @@ ENTRY(__timer_settime)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__timer_settime)
--- a/libc/arch-arm/syscalls/__waitid.S
+++ b/libc/arch-arm/syscalls/__waitid.S
@@ -18,5 +18,5 @@ ENTRY(__waitid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(__waitid)
--- a/libc/arch-arm/syscalls/_exit.S
+++ b/libc/arch-arm/syscalls/_exit.S
@@ -10,7 +10,7 @@ ENTRY(_exit)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(_exit)

    .globl _Exit
--- a/libc/arch-arm/syscalls/acct.S
+++ b/libc/arch-arm/syscalls/acct.S
@@ -10,5 +10,5 @@ ENTRY(acct)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(acct)
--- a/libc/arch-arm/syscalls/bind.S
+++ b/libc/arch-arm/syscalls/bind.S
@@ -10,5 +10,5 @@ ENTRY(bind)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(bind)
--- a/libc/arch-arm/syscalls/cacheflush.S
+++ b/libc/arch-arm/syscalls/cacheflush.S
@@ -10,5 +10,5 @@ ENTRY(cacheflush)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(cacheflush)
--- a/libc/arch-arm/syscalls/capget.S
+++ b/libc/arch-arm/syscalls/capget.S
@@ -10,5 +10,5 @@ ENTRY(capget)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(capget)
--- a/libc/arch-arm/syscalls/capset.S
+++ b/libc/arch-arm/syscalls/capset.S
@@ -10,5 +10,5 @@ ENTRY(capset)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(capset)
--- a/libc/arch-arm/syscalls/chdir.S
+++ b/libc/arch-arm/syscalls/chdir.S
@@ -10,5 +10,5 @@ ENTRY(chdir)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(chdir)
--- a/libc/arch-arm/syscalls/chroot.S
+++ b/libc/arch-arm/syscalls/chroot.S
@@ -10,5 +10,5 @@ ENTRY(chroot)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(chroot)
--- a/libc/arch-arm/syscalls/clock_getres.S
+++ b/libc/arch-arm/syscalls/clock_getres.S
@@ -10,5 +10,5 @@ ENTRY(clock_getres)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(clock_getres)
--- a/libc/arch-arm/syscalls/clock_gettime.S
+++ b/libc/arch-arm/syscalls/clock_gettime.S
@@ -10,5 +10,5 @@ ENTRY(clock_gettime)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(clock_gettime)
--- a/libc/arch-arm/syscalls/clock_nanosleep.S
+++ b/libc/arch-arm/syscalls/clock_nanosleep.S
@@ -10,5 +10,5 @@ ENTRY(clock_nanosleep)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(clock_nanosleep)
--- a/libc/arch-arm/syscalls/clock_settime.S
+++ b/libc/arch-arm/syscalls/clock_settime.S
@@ -10,5 +10,5 @@ ENTRY(clock_settime)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(clock_settime)
--- a/libc/arch-arm/syscalls/close.S
+++ b/libc/arch-arm/syscalls/close.S
@@ -10,5 +10,5 @@ ENTRY(close)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(close)
--- a/libc/arch-arm/syscalls/delete_module.S
+++ b/libc/arch-arm/syscalls/delete_module.S
@@ -10,5 +10,5 @@ ENTRY(delete_module)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(delete_module)
--- a/libc/arch-arm/syscalls/dup.S
+++ b/libc/arch-arm/syscalls/dup.S
@@ -10,5 +10,5 @@ ENTRY(dup)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(dup)
--- a/libc/arch-arm/syscalls/dup3.S
+++ b/libc/arch-arm/syscalls/dup3.S
@@ -10,5 +10,5 @@ ENTRY(dup3)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(dup3)
--- a/libc/arch-arm/syscalls/epoll_create1.S
+++ b/libc/arch-arm/syscalls/epoll_create1.S
@@ -10,5 +10,5 @@ ENTRY(epoll_create1)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(epoll_create1)
--- a/libc/arch-arm/syscalls/epoll_ctl.S
+++ b/libc/arch-arm/syscalls/epoll_ctl.S
@@ -10,5 +10,5 @@ ENTRY(epoll_ctl)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(epoll_ctl)
--- a/libc/arch-arm/syscalls/eventfd.S
+++ b/libc/arch-arm/syscalls/eventfd.S
@@ -10,5 +10,5 @@ ENTRY(eventfd)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(eventfd)
--- a/libc/arch-arm/syscalls/execve.S
+++ b/libc/arch-arm/syscalls/execve.S
@@ -10,5 +10,5 @@ ENTRY(execve)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(execve)
--- a/libc/arch-arm/syscalls/faccessat.S
+++ b/libc/arch-arm/syscalls/faccessat.S
@@ -10,5 +10,5 @@ ENTRY(faccessat)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(faccessat)
--- a/libc/arch-arm/syscalls/fallocate64.S
+++ b/libc/arch-arm/syscalls/fallocate64.S
@@ -18,5 +18,5 @@ ENTRY(fallocate64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fallocate64)
--- a/libc/arch-arm/syscalls/fchdir.S
+++ b/libc/arch-arm/syscalls/fchdir.S
@@ -10,5 +10,5 @@ ENTRY(fchdir)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fchdir)
--- a/libc/arch-arm/syscalls/fchmod.S
+++ b/libc/arch-arm/syscalls/fchmod.S
@@ -10,5 +10,5 @@ ENTRY(fchmod)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fchmod)
--- a/libc/arch-arm/syscalls/fchmodat.S
+++ b/libc/arch-arm/syscalls/fchmodat.S
@@ -10,5 +10,5 @@ ENTRY(fchmodat)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fchmodat)
--- a/libc/arch-arm/syscalls/fchown.S
+++ b/libc/arch-arm/syscalls/fchown.S
@@ -10,5 +10,5 @@ ENTRY(fchown)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fchown)
--- a/libc/arch-arm/syscalls/fchownat.S
+++ b/libc/arch-arm/syscalls/fchownat.S
@@ -18,5 +18,5 @@ ENTRY(fchownat)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fchownat)
--- a/libc/arch-arm/syscalls/fdatasync.S
+++ b/libc/arch-arm/syscalls/fdatasync.S
@@ -10,5 +10,5 @@ ENTRY(fdatasync)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fdatasync)
--- a/libc/arch-arm/syscalls/fgetxattr.S
+++ b/libc/arch-arm/syscalls/fgetxattr.S
@@ -10,5 +10,5 @@ ENTRY(fgetxattr)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fgetxattr)
--- a/libc/arch-arm/syscalls/flistxattr.S
+++ b/libc/arch-arm/syscalls/flistxattr.S
@@ -10,5 +10,5 @@ ENTRY(flistxattr)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(flistxattr)
--- a/libc/arch-arm/syscalls/flock.S
+++ b/libc/arch-arm/syscalls/flock.S
@@ -10,5 +10,5 @@ ENTRY(flock)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(flock)
--- a/libc/arch-arm/syscalls/fremovexattr.S
+++ b/libc/arch-arm/syscalls/fremovexattr.S
@@ -10,5 +10,5 @@ ENTRY(fremovexattr)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fremovexattr)
--- a/libc/arch-arm/syscalls/fsetxattr.S
+++ b/libc/arch-arm/syscalls/fsetxattr.S
@@ -18,5 +18,5 @@ ENTRY(fsetxattr)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fsetxattr)
--- a/libc/arch-arm/syscalls/fstat64.S
+++ b/libc/arch-arm/syscalls/fstat64.S
@@ -10,7 +10,7 @@ ENTRY(fstat64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fstat64)

    .globl fstat
--- a/libc/arch-arm/syscalls/fstatat64.S
+++ b/libc/arch-arm/syscalls/fstatat64.S
@@ -10,7 +10,7 @@ ENTRY(fstatat64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fstatat64)

    .globl fstatat
--- a/libc/arch-arm/syscalls/fsync.S
+++ b/libc/arch-arm/syscalls/fsync.S
@@ -10,5 +10,5 @@ ENTRY(fsync)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(fsync)
--- a/libc/arch-arm/syscalls/ftruncate.S
+++ b/libc/arch-arm/syscalls/ftruncate.S
@@ -10,5 +10,5 @@ ENTRY(ftruncate)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(ftruncate)
--- a/libc/arch-arm/syscalls/ftruncate64.S
+++ b/libc/arch-arm/syscalls/ftruncate64.S
@@ -10,5 +10,5 @@ ENTRY(ftruncate64)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(ftruncate64)
--- a/libc/arch-arm/syscalls/getegid.S
+++ b/libc/arch-arm/syscalls/getegid.S
@@ -10,5 +10,5 @@ ENTRY(getegid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getegid)
--- a/libc/arch-arm/syscalls/geteuid.S
+++ b/libc/arch-arm/syscalls/geteuid.S
@@ -10,5 +10,5 @@ ENTRY(geteuid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(geteuid)
--- a/libc/arch-arm/syscalls/getgid.S
+++ b/libc/arch-arm/syscalls/getgid.S
@@ -10,5 +10,5 @@ ENTRY(getgid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getgid)
--- a/libc/arch-arm/syscalls/getgroups.S
+++ b/libc/arch-arm/syscalls/getgroups.S
@@ -10,5 +10,5 @@ ENTRY(getgroups)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getgroups)
--- a/libc/arch-arm/syscalls/getitimer.S
+++ b/libc/arch-arm/syscalls/getitimer.S
@@ -10,5 +10,5 @@ ENTRY(getitimer)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getitimer)
--- a/libc/arch-arm/syscalls/getpeername.S
+++ b/libc/arch-arm/syscalls/getpeername.S
@@ -10,5 +10,5 @@ ENTRY(getpeername)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getpeername)
--- a/libc/arch-arm/syscalls/getpgid.S
+++ b/libc/arch-arm/syscalls/getpgid.S
@@ -10,5 +10,5 @@ ENTRY(getpgid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getpgid)
--- a/libc/arch-arm/syscalls/getppid.S
+++ b/libc/arch-arm/syscalls/getppid.S
@@ -10,5 +10,5 @@ ENTRY(getppid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getppid)
--- a/libc/arch-arm/syscalls/getresgid.S
+++ b/libc/arch-arm/syscalls/getresgid.S
@@ -10,5 +10,5 @@ ENTRY(getresgid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getresgid)
--- a/libc/arch-arm/syscalls/getresuid.S
+++ b/libc/arch-arm/syscalls/getresuid.S
@@ -10,5 +10,5 @@ ENTRY(getresuid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getresuid)
--- a/libc/arch-arm/syscalls/getrlimit.S
+++ b/libc/arch-arm/syscalls/getrlimit.S
@@ -10,5 +10,5 @@ ENTRY(getrlimit)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getrlimit)
--- a/libc/arch-arm/syscalls/getrusage.S
+++ b/libc/arch-arm/syscalls/getrusage.S
@@ -10,5 +10,5 @@ ENTRY(getrusage)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getrusage)
--- a/libc/arch-arm/syscalls/getsid.S
+++ b/libc/arch-arm/syscalls/getsid.S
@@ -10,5 +10,5 @@ ENTRY(getsid)
    cmn     r0, #(MAX_ERRNO + 1)
    bxls    lr
    neg     r0, r0
-    b       __set_errno
+    b       __set_errno_internal
 END(getsid)
--- a/Show More
+++ b/Show More