7ad019ce09
[ Upstream commit aa95073fd290b5b3e45f067fa22bb25e59e1ff7c ]
While building, bpftool makes a skeleton from test_core_extern.c, which
itself includes <stdbool.h> and uses the 'bool' type. However, the skeleton
test_core_extern.skel.h generated *does not* include <stdbool.h> or use the
'bool' type, instead using the C-only '_Bool' type. Compiling test_cpp.cpp
with g++ 12.3 for mips64el/musl-libc then fails with error:
In file included from test_cpp.cpp:9:
test_core_extern.skel.h:45:17: error: '_Bool' does not name a type
45 | _Bool CONFIG_BOOL;
| ^~~~~
This was likely missed previously because glibc uses a GNU extension for
<stdbool.h> with C++ (#define _Bool bool), not supported by musl libc.
Normally, a C fragment would include <stdbool.h> and use the 'bool' type,
and thus cleanly work after import by C++. The ideal fix would be for
'bpftool gen skeleton' to output the correct type/include supporting C++,
but in the meantime add a conditional define as above.
Fixes: 7c8dce4b1661 ("bpftool: Make skeleton C code compilable with C++ compiler")
Signed-off-by: Tony Ambardar <tony.ambardar@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/6fc1dd28b8bda49e51e4f610bdc9d22f4455632d.1722244708.git.tony.ambardar@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
34 lines
613 B
C++
Executable file
34 lines
613 B
C++
Executable file
/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */
|
|
#include <iostream>
|
|
#include <bpf/libbpf.h>
|
|
#include <bpf/bpf.h>
|
|
#include <bpf/btf.h>
|
|
|
|
#ifndef _Bool
|
|
#define _Bool bool
|
|
#endif
|
|
#include "test_core_extern.skel.h"
|
|
|
|
/* do nothing, just make sure we can link successfully */
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
struct test_core_extern *skel;
|
|
|
|
/* libbpf.h */
|
|
libbpf_set_print(NULL);
|
|
|
|
/* bpf.h */
|
|
bpf_prog_get_fd_by_id(0);
|
|
|
|
/* btf.h */
|
|
btf__new(NULL, 0);
|
|
|
|
/* BPF skeleton */
|
|
skel = test_core_extern__open_and_load();
|
|
test_core_extern__destroy(skel);
|
|
|
|
std::cout << "DONE!" << std::endl;
|
|
|
|
return 0;
|
|
}
|