Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I1d55a786c4ec7706edf8d32ba1866214896651f4
Change-Id: I72486868e7d0576f4c4bbd2ab717eaf8e1770e98
diff --git a/sysroot-patches/glibc-2.17-define-__NR_bpf.patch b/sysroot-patches/glibc-2.17-define-__NR_bpf.patch
new file mode 100644
index 0000000..71f4c44
--- /dev/null
+++ b/sysroot-patches/glibc-2.17-define-__NR_bpf.patch
@@ -0,0 +1,25 @@
+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/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 */
