Skip to contentSkip to conversation

tools/bpf: fix core_reloc.c compilation error

PATCH Applied Yonghong Song 2 participants 2 messages Aug 8, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/bpf: fix core_reloc.c compilation error

On my local machine, I have the following compilation errors:
=====
In file included from prog_tests/core_reloc.c:3:0:
./progs/core_reloc_types.h:517:46: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘fancy_char_ptr_t’
typedef const char * const volatile restrict fancy_char_ptr_t;

                                              ^
  ./progs/core_reloc_types.h:527:2: error: unknown type name ‘fancy_char_ptr_t’
    fancy_char_ptr_t d;
    ^

=====

I am using gcc 4.8.5. Later compilers may change their behavior not emitting the error. Nevertheless, let us fix the issue. "restrict" can be tested without typedef.

Fixes 9654e2ae908e ("selftests/bpf: add CO-RE relocs modifiers/typedef tests")
Cc Andrii Nakryiko <[email protected]>
---
 tools/testing/selftests/bpf/progs/core_reloc_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/progs/core_reloc_types.h +1 -1
index 10a252b6da55..f686a8138d90 100644
@@ -514,7 +514,7 @@ typedef arr1_t arr2_t;
 typedef arr2_t arr3_t;
 typedef arr3_t arr4_t;
 
-typedef const char * const volatile restrict fancy_char_ptr_t;
+typedef const char * const volatile fancy_char_ptr_t;
 
 typedef core_reloc_mods_substruct_t core_reloc_mods_substruct_tt;
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 12 lines · Yonghong Song

On my local machine, I have the following compilation errors:
=====
In file included from prog_tests/core_reloc.c:3:0:
./progs/core_reloc_types.h:517:46: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘fancy_char_ptr_t’
typedef const char * const volatile restrict fancy_char_ptr_t;

                                              ^
  ./progs/core_reloc_types.h:527:2: error: unknown type name ‘fancy_char_ptr_t’
    fancy_char_ptr_t d;
    ^

=====

Quoted 7 lines

I am using gcc 4.8.5. Later compilers may change their behavior not emitting the error. Nevertheless, let us fix the issue. "restrict" can be tested without typedef.

Fixes 9654e2ae908e ("selftests/bpf: add CO-RE relocs modifiers/typedef tests")
Cc Andrii Nakryiko <[email protected]>

Applied. Thanks.