Merge changes from topic 'no-bionic-prebuilts'
* changes:
Build the versioner even on unbundled branches.
Revert "Revert "Run the versioner as part of the build.""
diff --git a/libc/arch-arm64/generic/bionic/strcmp.S b/libc/arch-arm64/generic/bionic/strcmp.S
index 3cce478..271452d 100644
--- a/libc/arch-arm64/generic/bionic/strcmp.S
+++ b/libc/arch-arm64/generic/bionic/strcmp.S
@@ -57,6 +57,7 @@
/* Start of performance-critical section -- one 64B cache line. */
ENTRY(strcmp)
+.p2align 6
eor tmp1, src1, src2
mov zeroones, #REP8_01
tst tmp1, #7
diff --git a/libc/seccomp/include/seccomp_policy.h b/libc/seccomp/include/seccomp_policy.h
index 33b5d0e..397f8e4 100644
--- a/libc/seccomp/include/seccomp_policy.h
+++ b/libc/seccomp/include/seccomp_policy.h
@@ -17,6 +17,10 @@
#ifndef SECCOMP_POLICY_H
#define SECCOMP_POLICY_H
+#include <stddef.h>
+#include <linux/filter.h>
+
bool set_seccomp_filter();
+void get_seccomp_filter(const sock_filter*& filter, size_t& filter_size);
#endif
diff --git a/libc/seccomp/seccomp_policy.cpp b/libc/seccomp/seccomp_policy.cpp
index d93ae1e..fd2179b 100644
--- a/libc/seccomp/seccomp_policy.cpp
+++ b/libc/seccomp/seccomp_policy.cpp
@@ -18,7 +18,6 @@
#include <assert.h>
#include <linux/audit.h>
-#include <linux/filter.h>
#include <linux/seccomp.h>
#include <sys/prctl.h>
@@ -154,3 +153,13 @@
return install_filter(f);
}
+
+void get_seccomp_filter(const sock_filter*& filter, size_t& filter_size) {
+#if defined __aarch64__ || defined __x86_64__ || defined __mips64__
+ filter = primary_filter;
+ filter_size = primary_filter_size;
+#else
+ filter = secondary_filter;
+ filter_size = secondary_filter_size;
+#endif
+}
diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 5ccd656..96dd477 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -48,6 +48,7 @@
char* old_value = *dlerror_slot;
*dlerror_slot = new_value;
+ LD_LOG(kLogErrors, "%s\n", new_value);
return old_value;
}
diff --git a/linker/linker.cpp b/linker/linker.cpp
index ff16b03..60dff98 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2081,8 +2081,7 @@
"(anonymous)",
nullptr,
library_search_path,
- // TODO (dimitry): change to isolated eventually.
- ANDROID_NAMESPACE_TYPE_REGULAR,
+ ANDROID_NAMESPACE_TYPE_ISOLATED,
nullptr,
&g_default_namespace);
diff --git a/linker/linker_globals.h b/linker/linker_globals.h
index b6f8a04..e4e3d97 100644
--- a/linker/linker_globals.h
+++ b/linker/linker_globals.h
@@ -38,7 +38,6 @@
do { \
__libc_format_buffer(linker_get_error_buffer(), linker_get_error_buffer_size(), fmt, ##x); \
/* If LD_DEBUG is set high enough, log every dlerror(3) message. */ \
- LD_LOG(kLogErrors, "%s\n", linker_get_error_buffer()); \
} while (false)
#define DL_WARN(fmt, x...) \