Hi, On Thu, Jun 6, 2024 at 7:05 PM Andrew Pinski <pins...@gmail.com> wrote: > > On Thu, Jun 6, 2024 at 9:00 AM David Malcolm <dmalc...@redhat.com> wrote: > > > > On Thu, 2024-06-06 at 08:40 -0700, Andrew Pinski wrote: > > > On Thu, Jun 6, 2024 at 6:02 AM Bert Wesarg > > > <bert.wes...@googlemail.com> wrote: > > > > > > > > Dear David, > > > > > > > > On Tue, May 28, 2024 at 10:07 PM David Malcolm > > > > <dmalc...@redhat.com> wrote: > > > > > > > > > > No functional change intended. > > > > > > > > > > Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. > > > > > Pushed to trunk as r15-874-g9bda2c4c81b668. > > > > > > > > > > libcpp/ChangeLog: > > > > > * Makefile.in (TAGS_SOURCES): Add include/label-text.h. > > > > > * include/label-text.h: New file. > > > > > * include/rich-location.h: Include "label-text.h". > > > > > (class label_text): Move to label-text.h. > > > > > > > > > > Signed-off-by: David Malcolm <dmalc...@redhat.com> > > > > > --- > > > > > libcpp/Makefile.in | 2 +- > > > > > libcpp/include/label-text.h | 102 > > > > > +++++++++++++++++++++++++++++++++ > > > > > libcpp/include/rich-location.h | 79 +------------------------ > > > > > 3 files changed, 105 insertions(+), 78 deletions(-) > > > > > create mode 100644 libcpp/include/label-text.h > > > > > > > > > > diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in > > > > > index ebbca37777fb..7e47153264c0 100644 > > > > > --- a/libcpp/Makefile.in > > > > > +++ b/libcpp/Makefile.in > > > > > @@ -271,7 +271,7 @@ ETAGS = @ETAGS@ > > > > > > > > > > TAGS_SOURCES = $(libcpp_a_SOURCES) internal.h system.h ucnid.h \ > > > > > include/cpplib.h include/line-map.h include/mkdeps.h > > > > > include/symtab.h \ > > > > > - include/rich-location.h > > > > > + include/rich-location.h include/label-text.h > > > > > > > > this does not seem to be enough that the new header will be > > > > installed. > > > > I get compile errors when compiling an plug-in with this patch: > > > > > > > > In file included from > > > > /home/bitten/opt/gcc-15-20240602/lib/gcc/x86_64-pc-linux- > > > > gnu/15.0.0/plugin/include/diagnostic.h:24, > > > > from > > > > /home/bitten/builds/oCyPvWN6/1/perftools/cicd/scorep/src/build-gcc- > > > > plugin/../src/adapters/compiler/gcc- > > > > plugin/scorep_plugin_inst_descriptor.cpp:43: > > > > /home/bitten/opt/gcc-15-20240602/lib/gcc/x86_64-pc-linux- > > > > gnu/15.0.0/plugin/include/rich-location.h:25:10: > > > > fatal error: label-text.h: No such file or directory > > > > 25 | #include "label-text.h" > > > > > ^~~~~~~~~~~~~~ > > > > compilation terminated. > > > > > > I have a fix which I am testing. > > > > Likewise (and sorry about the breakage) > > Committed as r15-1076-g6e6471806d886b .
Thanks. I can confirm, that my external plugin builds again. Bert > > > > > Dave > >
