From: Andrii Nakryiko <andriin@fb.com>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
<daniel@iogearbox.net>
Cc: <andrii.nakryiko@gmail.com>, <kernel-team@fb.com>,
Andrii Nakryiko <andriin@fb.com>
Subject: [PATCH bpf-next 1/6] selftests/bpf: undo GCC-specific bpf_helpers.h changes
Date: Mon, 30 Sep 2019 11:58:50 -0700 [thread overview]
Message-ID: <20190930185855.4115372-2-andriin@fb.com> (raw)
In-Reply-To: <20190930185855.4115372-1-andriin@fb.com>
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@fb.com>
---
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
next prev parent reply other threads:[~2019-09-30 20:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-30 18:58 [PATCH bpf-next 0/6] Move bpf_helpers and add BPF_CORE_READ macros Andrii Nakryiko
2019-09-30 18:58 ` Andrii Nakryiko [this message]
2019-09-30 22:53 ` [PATCH bpf-next 1/6] selftests/bpf: undo GCC-specific bpf_helpers.h changes Song Liu
2019-10-01 10:25 ` Ilya Leoshkevich
2019-10-01 19:10 ` John Fastabend
2019-09-30 18:58 ` [PATCH bpf-next 2/6] libbpf: move bpf_helpers.h, bpf_endian.h into libbpf Andrii Nakryiko
2019-09-30 22:55 ` Song Liu
2019-09-30 22:58 ` Andrii Nakryiko
2019-09-30 23:18 ` Jakub Kicinski
2019-09-30 23:25 ` Song Liu
2019-09-30 23:36 ` Jakub Kicinski
2019-09-30 23:39 ` Song Liu
2019-09-30 23:30 ` Andrii Nakryiko
2019-09-30 23:43 ` Jakub Kicinski
2019-09-30 23:23 ` Song Liu
2019-09-30 23:27 ` Andrii Nakryiko
2019-09-30 23:35 ` Song Liu
2019-10-01 7:10 ` Toke Høiland-Jørgensen
2019-10-01 19:18 ` John Fastabend
2019-10-01 19:44 ` Andrii Nakryiko
2019-10-01 22:00 ` John Fastabend
2019-10-02 7:25 ` Toke Høiland-Jørgensen
2019-10-01 19:42 ` Andrii Nakryiko
2019-10-02 7:21 ` Toke Høiland-Jørgensen
2019-10-01 21:19 ` Song Liu
2019-10-01 21:28 ` Andrii Nakryiko
2019-10-01 22:45 ` Daniel Borkmann
2019-10-01 23:31 ` Andrii Nakryiko
2019-10-01 23:40 ` Andrii Nakryiko
2019-10-02 9:51 ` Daniel Borkmann
2019-09-30 18:58 ` [PATCH bpf-next 3/6] selftests/bpf: switch test to use libbpf's helpers Andrii Nakryiko
2019-09-30 18:58 ` [PATCH bpf-next 4/6] libbpf: add BPF_CORE_READ/BPF_CORE_READ_INTO helpers Andrii Nakryiko
2019-10-01 19:07 ` John Fastabend
2019-10-01 21:14 ` Song Liu
2019-10-01 21:25 ` Andrii Nakryiko
2019-10-01 21:46 ` Song Liu
2019-10-01 22:42 ` Andrii Nakryiko
2019-10-01 23:44 ` Song Liu
2019-10-02 3:36 ` Andrii Nakryiko
2019-10-02 16:25 ` Song Liu
2019-09-30 18:58 ` [PATCH bpf-next 5/6] selftests/bpf: adjust CO-RE reloc tests for new BPF_CORE_READ macro Andrii Nakryiko
2019-10-01 19:14 ` John Fastabend
2019-10-01 21:31 ` Andrii Nakryiko
2019-10-01 21:47 ` Song Liu
2019-09-30 18:58 ` [PATCH bpf-next 6/6] selftests/bpf: add BPF_CORE_READ and BPF_CORE_READ_STR_INTO macro tests Andrii Nakryiko
2019-10-01 19:19 ` John Fastabend
2019-10-01 21:22 ` Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190930185855.4115372-2-andriin@fb.com \
--to=andriin@fb.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).