Andrii Nakryiko wrote:
> Having GCC provide its own bpf-helper.h is not the right approach and is
> going to be changed. Undo bpf_helpers.h change before moving
> bpf_helpers.h into libbpf.
>
> Signed-off-by: Andrii Nakryiko <andriin@xxxxxx>
> ---
> tools/testing/selftests/bpf/bpf_helpers.h | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h
> index 54a50699bbfd..a1d9b97b8e15 100644
> --- a/tools/testing/selftests/bpf/bpf_helpers.h
> +++ b/tools/testing/selftests/bpf/bpf_helpers.h
> @@ -13,8 +13,6 @@
> ##__VA_ARGS__); \
> })
>
> -#ifdef __clang__
> -
> /* helper macro to place programs, maps, license in
> * different sections in elf_bpf file. Section names
> * are interpreted by elf_bpf loader
> @@ -258,12 +256,6 @@ struct bpf_map_def {
> unsigned int numa_node;
> };
>
> -#else
> -
> -#include <bpf-helpers.h>
> -
> -#endif
> -
> #define BPF_ANNOTATE_KV_PAIR(name, type_key, type_val) \
> struct ____btf_map_##name { \
> type_key key; \
> --
> 2.17.1
>
Acked-by: John Fastabend <john.fastabend@xxxxxxxxx>
