| Message ID | 20240227190435.35750-6-cupertino.miranda@oracle.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/5] btf: fixed type id in BTF_KIND_FUNC struct data. | expand |
On 2/27/24 11:04, Cupertino Miranda wrote: > gcc/ChangeLog: > > * config.gcc (target_gtfiles): Changes coreout to btfext-out. > (extra_objs): Changes coreout to btfext-out. > * config/bpf/coreout.cc: Renamed to btfext-out.cc. > * config/bpf/btfext-out.cc: Added. > * config/bpf/coreout.h: Renamed to btfext-out.h. > * config/bpf/btfext-out.h: Added. > * config/bpf/core-builtins.cc: Changes include. > * config/bpf/core-builtins.h: Changes include. > * config/bpf/t-bpf: Renamed file. This last entry is confusing, sounds like t-bpf is renamed, which it isn't. I'd suggest to just say "accomodate renamed files" or so. Similar to prior patches, there is a mix of present and past tenses here. Please stick with the present. Changes -> Change Added -> Add (or just "New.") Renamed -> Rename. OK with those changes. Thanks. > --- > gcc/config.gcc | 4 ++-- > gcc/config/bpf/{coreout.cc => btfext-out.cc} | 4 ++-- > gcc/config/bpf/{coreout.h => btfext-out.h} | 2 +- > gcc/config/bpf/core-builtins.cc | 2 +- > gcc/config/bpf/core-builtins.h | 2 +- > gcc/config/bpf/t-bpf | 4 ++-- > 6 files changed, 9 insertions(+), 9 deletions(-) > rename gcc/config/bpf/{coreout.cc => btfext-out.cc} (99%) > rename gcc/config/bpf/{coreout.h => btfext-out.h} (98%) > > diff --git a/gcc/config.gcc b/gcc/config.gcc > index a0f9c6723083..1ca033d75b66 100644 > --- a/gcc/config.gcc > +++ b/gcc/config.gcc > @@ -1653,8 +1653,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 31b2abc3151b..4281cca83e13 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. > @@ -618,4 +618,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 1c26b9274739..b36309475c97 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 aa75fd68cae6..8d8c54c1fb3d 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 c54f6ddac812..e56b55b94e0c 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 18f1fa67794d..dc50332350c4 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) >
Corrected and Pushed. Thanks, Cupertino David Faust writes: > On 2/27/24 11:04, Cupertino Miranda wrote: >> gcc/ChangeLog: >> >> * config.gcc (target_gtfiles): Changes coreout to btfext-out. >> (extra_objs): Changes coreout to btfext-out. >> * config/bpf/coreout.cc: Renamed to btfext-out.cc. >> * config/bpf/btfext-out.cc: Added. >> * config/bpf/coreout.h: Renamed to btfext-out.h. >> * config/bpf/btfext-out.h: Added. >> * config/bpf/core-builtins.cc: Changes include. >> * config/bpf/core-builtins.h: Changes include. >> * config/bpf/t-bpf: Renamed file. > This last entry is confusing, sounds like t-bpf is renamed, which it > isn't. I'd suggest to just say "accomodate renamed files" or so. > > Similar to prior patches, there is a mix of present and past tenses here. > Please stick with the present. > > Changes -> Change > Added -> Add (or just "New.") > Renamed -> Rename. > > OK with those changes. > Thanks. > >> --- >> gcc/config.gcc | 4 ++-- >> gcc/config/bpf/{coreout.cc => btfext-out.cc} | 4 ++-- >> gcc/config/bpf/{coreout.h => btfext-out.h} | 2 +- >> gcc/config/bpf/core-builtins.cc | 2 +- >> gcc/config/bpf/core-builtins.h | 2 +- >> gcc/config/bpf/t-bpf | 4 ++-- >> 6 files changed, 9 insertions(+), 9 deletions(-) >> rename gcc/config/bpf/{coreout.cc => btfext-out.cc} (99%) >> rename gcc/config/bpf/{coreout.h => btfext-out.h} (98%) >> >> diff --git a/gcc/config.gcc b/gcc/config.gcc >> index a0f9c6723083..1ca033d75b66 100644 >> --- a/gcc/config.gcc >> +++ b/gcc/config.gcc >> @@ -1653,8 +1653,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 31b2abc3151b..4281cca83e13 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. >> @@ -618,4 +618,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 1c26b9274739..b36309475c97 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 aa75fd68cae6..8d8c54c1fb3d 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 c54f6ddac812..e56b55b94e0c 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 18f1fa67794d..dc50332350c4 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) >>
diff --git a/gcc/config.gcc b/gcc/config.gcc index a0f9c6723083..1ca033d75b66 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1653,8 +1653,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 31b2abc3151b..4281cca83e13 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. @@ -618,4 +618,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 1c26b9274739..b36309475c97 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 aa75fd68cae6..8d8c54c1fb3d 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 c54f6ddac812..e56b55b94e0c 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 18f1fa67794d..dc50332350c4 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)
gcc/ChangeLog: * config.gcc (target_gtfiles): Changes coreout to btfext-out. (extra_objs): Changes coreout to btfext-out. * config/bpf/coreout.cc: Renamed to btfext-out.cc. * config/bpf/btfext-out.cc: Added. * config/bpf/coreout.h: Renamed to btfext-out.h. * config/bpf/btfext-out.h: Added. * config/bpf/core-builtins.cc: Changes include. * config/bpf/core-builtins.h: Changes include. * config/bpf/t-bpf: Renamed file. --- gcc/config.gcc | 4 ++-- gcc/config/bpf/{coreout.cc => btfext-out.cc} | 4 ++-- gcc/config/bpf/{coreout.h => btfext-out.h} | 2 +- gcc/config/bpf/core-builtins.cc | 2 +- gcc/config/bpf/core-builtins.h | 2 +- gcc/config/bpf/t-bpf | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename gcc/config/bpf/{coreout.cc => btfext-out.cc} (99%) rename gcc/config/bpf/{coreout.h => btfext-out.h} (98%)