Snap for 8730993 from 96f0822a64d8c0e7925a414e3c6afd65847ff393 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: I86d877c3876ff6d6a0fe19cef5414605ff4f6778

42 files changed, 0 insertions, 383 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
deleted file mode 100644
index 697b5a9..0000000
--- a/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-# NOTE: THIS FILE IS EXPERIMENTAL FOR THE BAZEL MIGRATION AND NOT USED FOR
-# YOUR BUILDS CURRENTLY.
-#
-# It is not yet the source of truth for your build. If you're looking to modify
-# the build file, modify the Android.bp file instead. Do *not* modify this file
-# unless you have coordinated with the team managing the Soong to Bazel
-# migration.
-
-filegroup(
-    name = "tools",
-    srcs = glob(["**/**"]),
-    visibility = ["//prebuilts/clang/host/linux-x86:__pkg__"],
-)
diff --git a/bin/cloog b/bin/cloog
new file mode 100755
index 0000000..b79cc44
--- /dev/null
+++ b/bin/cloog
diff --git a/bin/x86_64-linux-addr2line b/bin/x86_64-linux-addr2line
new file mode 100755
index 0000000..6a8a2bb
--- /dev/null
+++ b/bin/x86_64-linux-addr2line
diff --git a/bin/x86_64-linux-ar b/bin/x86_64-linux-ar
new file mode 100755
index 0000000..b80fe44
--- /dev/null
+++ b/bin/x86_64-linux-ar
diff --git a/bin/x86_64-linux-as b/bin/x86_64-linux-as
new file mode 100755
index 0000000..59ee5fe
--- /dev/null
+++ b/bin/x86_64-linux-as
diff --git a/bin/x86_64-linux-c++filt b/bin/x86_64-linux-c++filt
new file mode 100755
index 0000000..c357605
--- /dev/null
+++ b/bin/x86_64-linux-c++filt
diff --git a/bin/x86_64-linux-dwp b/bin/x86_64-linux-dwp
new file mode 100755
index 0000000..d329efb
--- /dev/null
+++ b/bin/x86_64-linux-dwp
diff --git a/bin/x86_64-linux-elfedit b/bin/x86_64-linux-elfedit
new file mode 100755
index 0000000..b8447e8
--- /dev/null
+++ b/bin/x86_64-linux-elfedit
diff --git a/bin/x86_64-linux-gcc-ar b/bin/x86_64-linux-gcc-ar
new file mode 100755
index 0000000..2608cb8
--- /dev/null
+++ b/bin/x86_64-linux-gcc-ar
diff --git a/bin/x86_64-linux-gcc-nm b/bin/x86_64-linux-gcc-nm
new file mode 100755
index 0000000..39b0493
--- /dev/null
+++ b/bin/x86_64-linux-gcc-nm
diff --git a/bin/x86_64-linux-gcc-ranlib b/bin/x86_64-linux-gcc-ranlib
new file mode 100755
index 0000000..0c5636e
--- /dev/null
+++ b/bin/x86_64-linux-gcc-ranlib
diff --git a/bin/x86_64-linux-gcov b/bin/x86_64-linux-gcov
new file mode 100755
index 0000000..1b23fa2
--- /dev/null
+++ b/bin/x86_64-linux-gcov
diff --git a/bin/x86_64-linux-gprof b/bin/x86_64-linux-gprof
new file mode 100755
index 0000000..8ff0899
--- /dev/null
+++ b/bin/x86_64-linux-gprof
diff --git a/bin/x86_64-linux-ld b/bin/x86_64-linux-ld
new file mode 100755
index 0000000..b9767a6
--- /dev/null
+++ b/bin/x86_64-linux-ld
diff --git a/bin/x86_64-linux-ld.bfd b/bin/x86_64-linux-ld.bfd
new file mode 100755
index 0000000..1398ac7
--- /dev/null
+++ b/bin/x86_64-linux-ld.bfd
diff --git a/bin/x86_64-linux-ld.gold b/bin/x86_64-linux-ld.gold
new file mode 100755
index 0000000..b9767a6
--- /dev/null
+++ b/bin/x86_64-linux-ld.gold
diff --git a/bin/x86_64-linux-nm b/bin/x86_64-linux-nm
new file mode 100755
index 0000000..0932e9b
--- /dev/null
+++ b/bin/x86_64-linux-nm
diff --git a/bin/x86_64-linux-objcopy b/bin/x86_64-linux-objcopy
new file mode 100755
index 0000000..2627ee5
--- /dev/null
+++ b/bin/x86_64-linux-objcopy
diff --git a/bin/x86_64-linux-objdump b/bin/x86_64-linux-objdump
new file mode 100755
index 0000000..4f195a8
--- /dev/null
+++ b/bin/x86_64-linux-objdump
diff --git a/bin/x86_64-linux-ranlib b/bin/x86_64-linux-ranlib
new file mode 100755
index 0000000..736167b
--- /dev/null
+++ b/bin/x86_64-linux-ranlib
diff --git a/bin/x86_64-linux-readelf b/bin/x86_64-linux-readelf
new file mode 100755
index 0000000..fd74169
--- /dev/null
+++ b/bin/x86_64-linux-readelf
diff --git a/bin/x86_64-linux-size b/bin/x86_64-linux-size
new file mode 100755
index 0000000..e821a70
--- /dev/null
+++ b/bin/x86_64-linux-size
diff --git a/bin/x86_64-linux-strings b/bin/x86_64-linux-strings
new file mode 100755
index 0000000..24a6ced
--- /dev/null
+++ b/bin/x86_64-linux-strings
diff --git a/bin/x86_64-linux-strip b/bin/x86_64-linux-strip
new file mode 100755
index 0000000..85cfb79
--- /dev/null
+++ b/bin/x86_64-linux-strip
diff --git a/sysroot-patches/glibc-2.17-add-userfaultfd.patch b/sysroot-patches/glibc-2.17-add-userfaultfd.patch
deleted file mode 100644
index fb3a19a..0000000
--- a/sysroot-patches/glibc-2.17-add-userfaultfd.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/sysroot/usr/include/linux/userfaultfd.h b/sysroot/usr/include/linux/userfaultfd.h
-new file mode 100644
-index 0000000..ca7b7a5
---- /dev/null
-+++ b/sysroot/usr/include/linux/userfaultfd.h
-@@ -0,0 +1,141 @@
-+/****************************************************************************
-+ ****************************************************************************
-+ ***
-+ ***   This header was automatically generated from a Linux kernel header
-+ ***   of the same name, to make information necessary for userspace to
-+ ***   call into the kernel available to libc.  It contains only constants,
-+ ***   structures, and macros generated from the original header, and thus,
-+ ***   contains no copyrightable information.
-+ ***
-+ ***   To edit the content of this header, modify the corresponding
-+ ***   source file (e.g. under external/kernel-headers/original/) then
-+ ***   run bionic/libc/kernel/tools/update_all.py
-+ ***
-+ ***   Any manual change here will be lost the next time this script will
-+ ***   be run. You've been warned!
-+ ***
-+ ****************************************************************************
-+ ****************************************************************************/
-+#ifndef _LINUX_USERFAULTFD_H
-+#define _LINUX_USERFAULTFD_H
-+#include <linux/types.h>
-+#define UFFD_API ((__u64) 0xAA)
-+#define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | UFFDIO_REGISTER_MODE_WP | UFFDIO_REGISTER_MODE_MINOR)
-+#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM)
-+#define UFFD_API_IOCTLS ((__u64) 1 << _UFFDIO_REGISTER | (__u64) 1 << _UFFDIO_UNREGISTER | (__u64) 1 << _UFFDIO_API)
-+#define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE)
-+#define UFFD_API_RANGE_IOCTLS_BASIC ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_CONTINUE)
-+#define _UFFDIO_REGISTER (0x00)
-+#define _UFFDIO_UNREGISTER (0x01)
-+#define _UFFDIO_WAKE (0x02)
-+#define _UFFDIO_COPY (0x03)
-+#define _UFFDIO_ZEROPAGE (0x04)
-+#define _UFFDIO_WRITEPROTECT (0x06)
-+#define _UFFDIO_CONTINUE (0x07)
-+#define _UFFDIO_API (0x3F)
-+#define UFFDIO 0xAA
-+#define UFFDIO_API _IOWR(UFFDIO, _UFFDIO_API, struct uffdio_api)
-+#define UFFDIO_REGISTER _IOWR(UFFDIO, _UFFDIO_REGISTER, struct uffdio_register)
-+#define UFFDIO_UNREGISTER _IOR(UFFDIO, _UFFDIO_UNREGISTER, struct uffdio_range)
-+#define UFFDIO_WAKE _IOR(UFFDIO, _UFFDIO_WAKE, struct uffdio_range)
-+#define UFFDIO_COPY _IOWR(UFFDIO, _UFFDIO_COPY, struct uffdio_copy)
-+#define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, struct uffdio_zeropage)
-+#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, struct uffdio_writeprotect)
-+#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, struct uffdio_continue)
-+struct uffd_msg {
-+  __u8 event;
-+  __u8 reserved1;
-+  __u16 reserved2;
-+  __u32 reserved3;
-+  union {
-+    struct {
-+      __u64 flags;
-+      __u64 address;
-+      union {
-+        __u32 ptid;
-+      } feat;
-+    } pagefault;
-+    struct {
-+      __u32 ufd;
-+    } fork;
-+    struct {
-+      __u64 from;
-+      __u64 to;
-+      __u64 len;
-+    } remap;
-+    struct {
-+      __u64 start;
-+      __u64 end;
-+    } remove;
-+    struct {
-+      __u64 reserved1;
-+      __u64 reserved2;
-+      __u64 reserved3;
-+    } reserved;
-+  } arg;
-+} __packed;
-+#define UFFD_EVENT_PAGEFAULT 0x12
-+#define UFFD_EVENT_FORK 0x13
-+#define UFFD_EVENT_REMAP 0x14
-+#define UFFD_EVENT_REMOVE 0x15
-+#define UFFD_EVENT_UNMAP 0x16
-+#define UFFD_PAGEFAULT_FLAG_WRITE (1 << 0)
-+#define UFFD_PAGEFAULT_FLAG_WP (1 << 1)
-+#define UFFD_PAGEFAULT_FLAG_MINOR (1 << 2)
-+struct uffdio_api {
-+  __u64 api;
-+#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1 << 0)
-+#define UFFD_FEATURE_EVENT_FORK (1 << 1)
-+#define UFFD_FEATURE_EVENT_REMAP (1 << 2)
-+#define UFFD_FEATURE_EVENT_REMOVE (1 << 3)
-+#define UFFD_FEATURE_MISSING_HUGETLBFS (1 << 4)
-+#define UFFD_FEATURE_MISSING_SHMEM (1 << 5)
-+#define UFFD_FEATURE_EVENT_UNMAP (1 << 6)
-+#define UFFD_FEATURE_SIGBUS (1 << 7)
-+#define UFFD_FEATURE_THREAD_ID (1 << 8)
-+#define UFFD_FEATURE_MINOR_HUGETLBFS (1 << 9)
-+#define UFFD_FEATURE_MINOR_SHMEM (1 << 10)
-+  __u64 features;
-+  __u64 ioctls;
-+};
-+struct uffdio_range {
-+  __u64 start;
-+  __u64 len;
-+};
-+struct uffdio_register {
-+  struct uffdio_range range;
-+#define UFFDIO_REGISTER_MODE_MISSING ((__u64) 1 << 0)
-+#define UFFDIO_REGISTER_MODE_WP ((__u64) 1 << 1)
-+#define UFFDIO_REGISTER_MODE_MINOR ((__u64) 1 << 2)
-+  __u64 mode;
-+  __u64 ioctls;
-+};
-+struct uffdio_copy {
-+  __u64 dst;
-+  __u64 src;
-+  __u64 len;
-+#define UFFDIO_COPY_MODE_DONTWAKE ((__u64) 1 << 0)
-+#define UFFDIO_COPY_MODE_WP ((__u64) 1 << 1)
-+  __u64 mode;
-+  __s64 copy;
-+};
-+struct uffdio_zeropage {
-+  struct uffdio_range range;
-+#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64) 1 << 0)
-+  __u64 mode;
-+  __s64 zeropage;
-+};
-+struct uffdio_writeprotect {
-+  struct uffdio_range range;
-+#define UFFDIO_WRITEPROTECT_MODE_WP ((__u64) 1 << 0)
-+#define UFFDIO_WRITEPROTECT_MODE_DONTWAKE ((__u64) 1 << 1)
-+  __u64 mode;
-+};
-+struct uffdio_continue {
-+  struct uffdio_range range;
-+#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64) 1 << 0)
-+  __u64 mode;
-+  __s64 mapped;
-+};
-+#define UFFD_USER_MODE_ONLY 1
-+#endif
diff --git a/sysroot-patches/glibc-2.17-define-__NR_bpf.patch b/sysroot-patches/glibc-2.17-define-__NR_bpf.patch
deleted file mode 100644
index 71f4c44..0000000
--- a/sysroot-patches/glibc-2.17-define-__NR_bpf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Generating BTF during kernel builds involves building host libbpf, which fails
-unless __NR_bpf is defined.
-
-diff --git a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h
-index 45e32d0..6f6cb88 100644
---- a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h
-+++ b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h
-@@ -348,5 +348,6 @@
- #define __NR_process_vm_writev 348
- #define __NR_kcmp 349
- #define __NR_finit_module 350
-+#define __NR_bpf 357
- 
- #endif /* _ASM_X86_UNISTD_32_H */
-diff --git a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h
-index 82e1308..550dade 100644
---- a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h
-+++ b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h
-@@ -315,5 +315,6 @@
- #define __NR_process_vm_writev 311
- #define __NR_kcmp 312
- #define __NR_finit_module 313
-+#define __NR_bpf 321
- 
- #endif /* _ASM_X86_UNISTD_64_H */
diff --git a/sysroot-patches/glibc-update-perf_event.h-to-build-lldb-on-linux.patch b/sysroot-patches/glibc-update-perf_event.h-to-build-lldb-on-linux.patch
deleted file mode 100644
index 025fa94..0000000
--- a/sysroot-patches/glibc-update-perf_event.h-to-build-lldb-on-linux.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-b/191084510. Update perf_event.h to has aux_size, to fix below error when building lldb on
-linux:
-
-llvm-project/lldb/source/Plugins/Process/Linux/IntelPTManager.cpp:53:23:
-error: no member named 'aux_size' in 'perf_event_mmap_page'
-  return m_mmap_meta->aux_size;
-         ~~~~~~~~~~~~~^
------
-diff --git a/usr/include/linux/perf_event.h b/usr/include/linux/perf_event.h
-index 1c749ee..606f875 100644
---- a/usr/include/linux/perf_event.h
-+++ b/usr/include/linux/perf_event.h
-@@ -433,6 +433,24 @@ struct perf_event_mmap_page {
- 	 */
- 	__u64   data_head;		/* head in the data section */
- 	__u64	data_tail;		/* user-space written tail */
-+	__u64	data_offset;		/* where the buffer starts */
-+	__u64	data_size;		/* data buffer size */
-+
-+	/*
-+	 * AUX area is defined by aux_{offset,size} fields that should be set
-+	 * by the userspace, so that
-+	 *
-+	 *   aux_offset >= data_offset + data_size
-+	 *
-+	 * prior to mmap()ing it. Size of the mmap()ed area should be aux_size.
-+	 *
-+	 * Ring buffer pointers aux_{head,tail} have the same semantics as
-+	 * data_{head,tail} and same ordering rules apply.
-+	 */
-+	__u64	aux_head;
-+	__u64	aux_tail;
-+	__u64	aux_offset;
-+	__u64	aux_size;
- };
- 
- #define PERF_RECORD_MISC_CPUMODE_MASK		(7 << 0)
diff --git a/sysroot/usr/include/linux/perf_event.h b/sysroot/usr/include/linux/perf_event.h
index 606f875..1c749ee 100644
--- a/sysroot/usr/include/linux/perf_event.h
+++ b/sysroot/usr/include/linux/perf_event.h
@@ -433,24 +433,6 @@ struct perf_event_mmap_page {
 	 */
 	__u64   data_head;		/* head in the data section */
 	__u64	data_tail;		/* user-space written tail */
-	__u64	data_offset;		/* where the buffer starts */
-	__u64	data_size;		/* data buffer size */
-
-	/*
-	 * AUX area is defined by aux_{offset,size} fields that should be set
-	 * by the userspace, so that
-	 *
-	 *   aux_offset >= data_offset + data_size
-	 *
-	 * prior to mmap()ing it. Size of the mmap()ed area should be aux_size.
-	 *
-	 * Ring buffer pointers aux_{head,tail} have the same semantics as
-	 * data_{head,tail} and same ordering rules apply.
-	 */
-	__u64	aux_head;
-	__u64	aux_tail;
-	__u64	aux_offset;
-	__u64	aux_size;
 };
 
 #define PERF_RECORD_MISC_CPUMODE_MASK		(7 << 0)
diff --git a/sysroot/usr/include/linux/userfaultfd.h b/sysroot/usr/include/linux/userfaultfd.h
deleted file mode 100644
index ca7b7a5..0000000
--- a/sysroot/usr/include/linux/userfaultfd.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _LINUX_USERFAULTFD_H
-#define _LINUX_USERFAULTFD_H
-#include <linux/types.h>
-#define UFFD_API ((__u64) 0xAA)
-#define UFFD_API_REGISTER_MODES (UFFDIO_REGISTER_MODE_MISSING | UFFDIO_REGISTER_MODE_WP | UFFDIO_REGISTER_MODE_MINOR)
-#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP | UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM | UFFD_FEATURE_SIGBUS | UFFD_FEATURE_THREAD_ID | UFFD_FEATURE_MINOR_HUGETLBFS | UFFD_FEATURE_MINOR_SHMEM)
-#define UFFD_API_IOCTLS ((__u64) 1 << _UFFDIO_REGISTER | (__u64) 1 << _UFFDIO_UNREGISTER | (__u64) 1 << _UFFDIO_API)
-#define UFFD_API_RANGE_IOCTLS ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_ZEROPAGE | (__u64) 1 << _UFFDIO_WRITEPROTECT | (__u64) 1 << _UFFDIO_CONTINUE)
-#define UFFD_API_RANGE_IOCTLS_BASIC ((__u64) 1 << _UFFDIO_WAKE | (__u64) 1 << _UFFDIO_COPY | (__u64) 1 << _UFFDIO_CONTINUE)
-#define _UFFDIO_REGISTER (0x00)
-#define _UFFDIO_UNREGISTER (0x01)
-#define _UFFDIO_WAKE (0x02)
-#define _UFFDIO_COPY (0x03)
-#define _UFFDIO_ZEROPAGE (0x04)
-#define _UFFDIO_WRITEPROTECT (0x06)
-#define _UFFDIO_CONTINUE (0x07)
-#define _UFFDIO_API (0x3F)
-#define UFFDIO 0xAA
-#define UFFDIO_API _IOWR(UFFDIO, _UFFDIO_API, struct uffdio_api)
-#define UFFDIO_REGISTER _IOWR(UFFDIO, _UFFDIO_REGISTER, struct uffdio_register)
-#define UFFDIO_UNREGISTER _IOR(UFFDIO, _UFFDIO_UNREGISTER, struct uffdio_range)
-#define UFFDIO_WAKE _IOR(UFFDIO, _UFFDIO_WAKE, struct uffdio_range)
-#define UFFDIO_COPY _IOWR(UFFDIO, _UFFDIO_COPY, struct uffdio_copy)
-#define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, struct uffdio_zeropage)
-#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, struct uffdio_writeprotect)
-#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, struct uffdio_continue)
-struct uffd_msg {
-  __u8 event;
-  __u8 reserved1;
-  __u16 reserved2;
-  __u32 reserved3;
-  union {
-    struct {
-      __u64 flags;
-      __u64 address;
-      union {
-        __u32 ptid;
-      } feat;
-    } pagefault;
-    struct {
-      __u32 ufd;
-    } fork;
-    struct {
-      __u64 from;
-      __u64 to;
-      __u64 len;
-    } remap;
-    struct {
-      __u64 start;
-      __u64 end;
-    } remove;
-    struct {
-      __u64 reserved1;
-      __u64 reserved2;
-      __u64 reserved3;
-    } reserved;
-  } arg;
-} __packed;
-#define UFFD_EVENT_PAGEFAULT 0x12
-#define UFFD_EVENT_FORK 0x13
-#define UFFD_EVENT_REMAP 0x14
-#define UFFD_EVENT_REMOVE 0x15
-#define UFFD_EVENT_UNMAP 0x16
-#define UFFD_PAGEFAULT_FLAG_WRITE (1 << 0)
-#define UFFD_PAGEFAULT_FLAG_WP (1 << 1)
-#define UFFD_PAGEFAULT_FLAG_MINOR (1 << 2)
-struct uffdio_api {
-  __u64 api;
-#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1 << 0)
-#define UFFD_FEATURE_EVENT_FORK (1 << 1)
-#define UFFD_FEATURE_EVENT_REMAP (1 << 2)
-#define UFFD_FEATURE_EVENT_REMOVE (1 << 3)
-#define UFFD_FEATURE_MISSING_HUGETLBFS (1 << 4)
-#define UFFD_FEATURE_MISSING_SHMEM (1 << 5)
-#define UFFD_FEATURE_EVENT_UNMAP (1 << 6)
-#define UFFD_FEATURE_SIGBUS (1 << 7)
-#define UFFD_FEATURE_THREAD_ID (1 << 8)
-#define UFFD_FEATURE_MINOR_HUGETLBFS (1 << 9)
-#define UFFD_FEATURE_MINOR_SHMEM (1 << 10)
-  __u64 features;
-  __u64 ioctls;
-};
-struct uffdio_range {
-  __u64 start;
-  __u64 len;
-};
-struct uffdio_register {
-  struct uffdio_range range;
-#define UFFDIO_REGISTER_MODE_MISSING ((__u64) 1 << 0)
-#define UFFDIO_REGISTER_MODE_WP ((__u64) 1 << 1)
-#define UFFDIO_REGISTER_MODE_MINOR ((__u64) 1 << 2)
-  __u64 mode;
-  __u64 ioctls;
-};
-struct uffdio_copy {
-  __u64 dst;
-  __u64 src;
-  __u64 len;
-#define UFFDIO_COPY_MODE_DONTWAKE ((__u64) 1 << 0)
-#define UFFDIO_COPY_MODE_WP ((__u64) 1 << 1)
-  __u64 mode;
-  __s64 copy;
-};
-struct uffdio_zeropage {
-  struct uffdio_range range;
-#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64) 1 << 0)
-  __u64 mode;
-  __s64 zeropage;
-};
-struct uffdio_writeprotect {
-  struct uffdio_range range;
-#define UFFDIO_WRITEPROTECT_MODE_WP ((__u64) 1 << 0)
-#define UFFDIO_WRITEPROTECT_MODE_DONTWAKE ((__u64) 1 << 1)
-  __u64 mode;
-};
-struct uffdio_continue {
-  struct uffdio_range range;
-#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64) 1 << 0)
-  __u64 mode;
-  __s64 mapped;
-};
-#define UFFD_USER_MODE_ONLY 1
-#endif
diff --git a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h
index 6f6cb88..45e32d0 100644
--- a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h
+++ b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h
@@ -348,6 +348,5 @@
 #define __NR_process_vm_writev 348
 #define __NR_kcmp 349
 #define __NR_finit_module 350
-#define __NR_bpf 357
 
 #endif /* _ASM_X86_UNISTD_32_H */
diff --git a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h
index 550dade..82e1308 100644
--- a/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h
+++ b/sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h
@@ -315,6 +315,5 @@
 #define __NR_process_vm_writev 311
 #define __NR_kcmp 312
 #define __NR_finit_module 313
-#define __NR_bpf 321
 
 #endif /* _ASM_X86_UNISTD_64_H */
diff --git a/x86_64-linux/bin/ar b/x86_64-linux/bin/ar
new file mode 100755
index 0000000..b80fe44
--- /dev/null
+++ b/x86_64-linux/bin/ar
diff --git a/x86_64-linux/bin/as b/x86_64-linux/bin/as
new file mode 100755
index 0000000..59ee5fe
--- /dev/null
+++ b/x86_64-linux/bin/as
diff --git a/x86_64-linux/bin/ld b/x86_64-linux/bin/ld
new file mode 100755
index 0000000..b9767a6
--- /dev/null
+++ b/x86_64-linux/bin/ld
diff --git a/x86_64-linux/bin/ld.bfd b/x86_64-linux/bin/ld.bfd
new file mode 100755
index 0000000..1398ac7
--- /dev/null
+++ b/x86_64-linux/bin/ld.bfd
diff --git a/x86_64-linux/bin/ld.gold b/x86_64-linux/bin/ld.gold
new file mode 100755
index 0000000..b9767a6
--- /dev/null
+++ b/x86_64-linux/bin/ld.gold
diff --git a/x86_64-linux/bin/nm b/x86_64-linux/bin/nm
new file mode 100755
index 0000000..0932e9b
--- /dev/null
+++ b/x86_64-linux/bin/nm
diff --git a/x86_64-linux/bin/objcopy b/x86_64-linux/bin/objcopy
new file mode 100755
index 0000000..2627ee5
--- /dev/null
+++ b/x86_64-linux/bin/objcopy
diff --git a/x86_64-linux/bin/objdump b/x86_64-linux/bin/objdump
new file mode 100755
index 0000000..4f195a8
--- /dev/null
+++ b/x86_64-linux/bin/objdump
diff --git a/x86_64-linux/bin/ranlib b/x86_64-linux/bin/ranlib
new file mode 100755
index 0000000..736167b
--- /dev/null
+++ b/x86_64-linux/bin/ranlib
diff --git a/x86_64-linux/bin/readelf b/x86_64-linux/bin/readelf
new file mode 100755
index 0000000..fd74169
--- /dev/null
+++ b/x86_64-linux/bin/readelf
diff --git a/x86_64-linux/bin/strip b/x86_64-linux/bin/strip
new file mode 100755
index 0000000..85cfb79
--- /dev/null
+++ b/x86_64-linux/bin/strip