Re: [PATCH] tools: Rename __fallthrough to fallthrough

Arnaldo Carvalho de Melo
2023-04-06T21:31:45Z

Em Thu, Apr 06, 2023 at 06:11:03PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Thu, Apr 06, 2023 at 10:02:57PM +0200, Miguel Ojeda escreveu:
> > On Thu, Apr 6, 2023 at 9:58 PM Liam R. Howlett <Liam.Howlett@oracle.com> wrote:
> > >
> > > Any chance of this being accepted? I'm looking to use this in the radix
> > > test suite and would rather not duplicate code.
> >
> > That would be up to the `tools/perf/` maintainers.
>
> Thanks, applied,

So, I noticed some missing conversions, fixed that, but then when trying
to test build it with:

make -C tools/perf build-test

I stumbled on this:

make_with_gtk2: cd . && make GTK2=1 -j32 DESTDIR=/tmp/tmp.5AP8tPJgiT
cd . && make GTK2=1 -j32 DESTDIR=/tmp/tmp.5AP8tPJgiT
BUILD: Doing 'make -j32' parallel build
HOSTCC fixdep.o
HOSTLD fixdep-in.o
<SNIP>
CC trace/beauty/ioctl.o
In file included from /usr/lib64/glib-2.0/include/glibconfig.h:9,
from /usr/include/glib-2.0/glib/gtypes.h:34,
from /usr/include/glib-2.0/glib/galloca.h:34,
from /usr/include/glib-2.0/glib.h:32,
from /usr/include/glib-2.0/gobject/gbinding.h:30,
from /usr/include/glib-2.0/glib-object.h:24,
from /usr/include/glib-2.0/gio/gioenums.h:30,
from /usr/include/glib-2.0/gio/giotypes.h:30,
from /usr/include/glib-2.0/gio/gio.h:28,
from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
from /usr/include/gtk-2.0/gdk/gdk.h:32,
from /usr/include/gtk-2.0/gtk/gtk.h:32,
from ui/gtk/gtk.h:8,
from ui/gtk/helpline.c:6:
/usr/include/glib-2.0/glib/gmacros.h:637:28: error: missing ')' after "__has_attribute"
637 | #if g_macro__has_attribute(fallthrough)
| ^~~~~~~~~~~
In file included from /var/home/acme/git/perf-tools-next/tools/include/linux/compiler_types.h:36,
from /var/home/acme/git/perf-tools-next/tools/include/linux/compiler.h:5,
from /var/home/acme/git/perf-tools-next/tools/include/linux/build_bug.h:5,
from /var/home/acme/git/perf-tools-next/tools/include/linux/kernel.h:8,
from ui/gtk/helpline.c:4:
/var/home/acme/git/perf-tools-next/tools/include/linux/compiler-gcc.h:16:55: error: missing binary operator before token "("
16 | # define fallthrough __attribute__((__fallthrough__))
| ^
/usr/include/glib-2.0/glib/gmacros.h:637:28: note: in expansion of macro ‘fallthrough’
637 | #if g_macro__has_attribute(fallthrough)
| ^~~~~~~~~~~
CC trace/beauty/kcmp.o
CC bench/sched-messaging.o
CC trace/beauty/mount_flags.o

I'm trying to fix this now...

- Arnaldo