diff options
| author | Connor O'Brien <connoro@google.com> | 2022-01-18 21:55:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-18 21:55:13 +0000 |
| commit | 9f55e77783f3786883c2c187b418c0e7f58d30f1 (patch) | |
| tree | 029942fa1cee057d47ffd95c6bfe1b755be52664 | |
| parent | baf81d8d657de228e23b8471ec55a35c88bc2221 (diff) | |
| parent | d9edbda42d9fa441b49c50b19903be34c9a5621f (diff) | |
| download | x86_64-linux-glibc2.17-4.8-9f55e77783f3786883c2c187b418c0e7f58d30f1.tar.gz | |
glibc: define __NR_bpf am: d38e3ac65e am: d9edbda42d
Original change: https://android-review.googlesource.com/c/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/+/1944206
Change-Id: Ic9ead93464dafe1a24dbaaffb454d1b482d787b3
| -rw-r--r-- | sysroot-patches/glibc-2.17-define-__NR_bpf.patch | 25 | ||||
| -rw-r--r-- | sysroot/usr/include/x86_64-linux-gnu/asm/unistd_32.h | 1 | ||||
| -rw-r--r-- | sysroot/usr/include/x86_64-linux-gnu/asm/unistd_64.h | 1 |
3 files changed, 27 insertions, 0 deletions
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 */ |