diff --git a/gcc/config.gcc b/gcc/config.gcc index 2e35a112040..a1480b72c46 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1654,8 +1654,8 @@ bpf-*-*) tmake_file="${tmake_file} bpf/t-bpf" use_collect2=no use_gcc_stdint=provide - extra_objs="coreout.o core-builtins.o" - target_gtfiles="$target_gtfiles \$(srcdir)/config/bpf/coreout.cc \$(srcdir)/config/bpf/core-builtins.cc" + extra_objs="btfext-out.o core-builtins.o" + target_gtfiles="$target_gtfiles \$(srcdir)/config/bpf/btfext-out.cc \$(srcdir)/config/bpf/core-builtins.cc" ;; cris-*-elf | cris-*-none) tm_file="elfos.h newlib-stdint.h ${tm_file}" diff --git a/gcc/config/bpf/coreout.cc b/gcc/config/bpf/btfext-out.cc similarity index 99% rename from gcc/config/bpf/coreout.cc rename to gcc/config/bpf/btfext-out.cc index 14066523682..00d2501a976 100644 --- a/gcc/config/bpf/coreout.cc +++ b/gcc/config/bpf/btfext-out.cc @@ -33,7 +33,7 @@ #include "tree-pretty-print.h" #include "cgraph.h" -#include "coreout.h" +#include "btfext-out.h" /* This file contains data structures and routines for construction and output of BPF Compile Once - Run Everywhere (BPF CO-RE) information. @@ -614,4 +614,4 @@ btf_ext_output (void) dw2_asm_output_data (4, 0, "Required padding by libbpf structs"); } -#include "gt-coreout.h" +#include "gt-btfext-out.h" diff --git a/gcc/config/bpf/coreout.h b/gcc/config/bpf/btfext-out.h similarity index 98% rename from gcc/config/bpf/coreout.h rename to gcc/config/bpf/btfext-out.h index 1c26b927473..b36309475c9 100644 --- a/gcc/config/bpf/coreout.h +++ b/gcc/config/bpf/btfext-out.h @@ -1,4 +1,4 @@ -/* coreout.h - Declarations and definitions related to +/* btfext-out.h - Declarations and definitions related to BPF Compile Once - Run Everywhere (CO-RE) support. Copyright (C) 2021-2024 Free Software Foundation, Inc. diff --git a/gcc/config/bpf/core-builtins.cc b/gcc/config/bpf/core-builtins.cc index aa75fd68cae..8d8c54c1fb3 100644 --- a/gcc/config/bpf/core-builtins.cc +++ b/gcc/config/bpf/core-builtins.cc @@ -45,7 +45,7 @@ along with GCC; see the file COPYING3. If not see #include "ctfc.h" #include "btf.h" -#include "coreout.h" +#include "btfext-out.h" #include "core-builtins.h" /* BPF CO-RE builtins definition. diff --git a/gcc/config/bpf/core-builtins.h b/gcc/config/bpf/core-builtins.h index c54f6ddac81..e56b55b94e0 100644 --- a/gcc/config/bpf/core-builtins.h +++ b/gcc/config/bpf/core-builtins.h @@ -1,7 +1,7 @@ #ifndef BPF_CORE_BUILTINS_H #define BPF_CORE_BUILTINS_H -#include "coreout.h" +#include "btfext-out.h" enum bpf_builtins { diff --git a/gcc/config/bpf/t-bpf b/gcc/config/bpf/t-bpf index 18f1fa67794..dc50332350c 100644 --- a/gcc/config/bpf/t-bpf +++ b/gcc/config/bpf/t-bpf @@ -1,7 +1,7 @@ -TM_H += $(srcdir)/config/bpf/coreout.h $(srcdir)/config/bpf/core-builtins.h +TM_H += $(srcdir)/config/bpf/btfext-out.h $(srcdir)/config/bpf/core-builtins.h -coreout.o: $(srcdir)/config/bpf/coreout.cc +btfext-out.o: $(srcdir)/config/bpf/btfext-out.cc $(COMPILE) $< $(POSTCOMPILE)