diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2018-12-25 15:46:24 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@sifive.com> | 2019-01-07 07:59:28 -0800 |
| commit | d0df00e30e4bf9bc27ddbd092ad683ff6121b360 (patch) | |
| tree | 628f671fa34b72793c18a4a435f7a1b1c002613f /tools/include | |
| parent | 22e6a2e14cb8ebcae059488cf24e778e4058c2bf (diff) | |
| download | linux-stable-d0df00e30e4bf9bc27ddbd092ad683ff6121b360.tar.gz linux-stable-d0df00e30e4bf9bc27ddbd092ad683ff6121b360.tar.bz2 linux-stable-d0df00e30e4bf9bc27ddbd092ad683ff6121b360.zip | |
tools uapi: fix RISC-V 64-bit support
The BPF library is not built on 64-bit RISC-V, as the BPF feature is
not detected. Looking more in details, feature/test-bpf.c fails to build
with the following error:
| In file included from /tmp/linux-4.19.12/tools/include/uapi/asm/bitsperlong.h:17,
| from /tmp/linux-4.19.12/tools/include/uapi/asm-generic/unistd.h:2,
| from /usr/include/riscv64-linux-gnu/asm/unistd.h:1,
| from test-bpf.c:2:
| /tmp/linux-4.19.12/tools/include/asm-generic/bitsperlong.h:14:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
| #error Inconsistent word size. Check asm/bitsperlong.h
| ^~~~~
The UAPI from the tools directory is missing RISC-V support, therefore
bitsperlong.h from asm-generic is used, defaulting to 32 bits.
Fix that by adding tools/arch/riscv/include/uapi/asm/bitsperlong.h as
a copy of arch/riscv/include/uapi/asm/bitsperlong.h and by updating
tools/include/uapi/asm/bitsperlong.h.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/asm/bitsperlong.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/include/uapi/asm/bitsperlong.h b/tools/include/uapi/asm/bitsperlong.h index 8dd6aefdafa4..fd92ce8388fc 100644 --- a/tools/include/uapi/asm/bitsperlong.h +++ b/tools/include/uapi/asm/bitsperlong.h @@ -13,6 +13,8 @@ #include "../../arch/mips/include/uapi/asm/bitsperlong.h" #elif defined(__ia64__) #include "../../arch/ia64/include/uapi/asm/bitsperlong.h" +#elif defined(__riscv) +#include "../../arch/riscv/include/uapi/asm/bitsperlong.h" #else #include <asm-generic/bitsperlong.h> #endif |