system/strace: FTBFS: xlat/fcntlcmds.h:54:7: error: ‘F_GETLK64’ undeclared here (not in a function); did you mean ‘F_GETLK’?

Found on aarch64:

...
gcc -DHAVE_CONFIG_H   -I./linux/aarch64 -I./linux/aarch64 -I./linux/generic -I./linux/generic -I. -I.  -DIN_STRACE=1       -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wdate-time -Wformat-security -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wtrampolines -Wundef -Wwrite-strings -Werror   -O2 -fno-omit-frame-pointer -ggdb -march=armv8-a -mtune=cortex-a53 -g -Dsigcontext_struct=sigcontext -MT libstrace_a-kd_mpers_ioctl.o -MD -MP -MF .deps/libstrace_a-kd_mpers_ioctl.Tpo -c -o libstrace_a-kd_mpers_ioctl.o `test -f 'kd_mpers_ioctl.c' || echo './'`kd_mpers_ioctl.c
In file included from defs.h:404,
                 from fcntl.c:12:
xlat/fcntlcmds.h:54:7: error: ‘F_GETLK64’ undeclared here (not in a function); did you mean ‘F_GETLK’?
  XLAT(F_GETLK64),
       ^~~~~~~~~
xlat.h:64:35: note: in definition of macro ‘XLAT’
 # define XLAT(val)   { (unsigned)(val), #val }
                                   ^~~
xlat/fcntlcmds.h:57:7: error: ‘F_SETLK64’ undeclared here (not in a function); did you mean ‘F_SETLK’?
  XLAT(F_SETLK64),
       ^~~~~~~~~
xlat.h:64:35: note: in definition of macro ‘XLAT’
 # define XLAT(val)   { (unsigned)(val), #val }
                                   ^~~
xlat/fcntlcmds.h:60:7: error: ‘F_SETLKW64’ undeclared here (not in a function); did you mean ‘F_SETLKW’?
  XLAT(F_SETLKW64),
       ^~~~~~~~~~
xlat.h:64:35: note: in definition of macro ‘XLAT’
 # define XLAT(val)   { (unsigned)(val), #val }
                                   ^~~
make[3]: *** [Makefile:4982: libstrace_a-fcntl.o] Error 1

leix.txt

marked this issue as related to #1019

So we should be bumping strace anyway to accomodate shipping kernel-6.6; can we please update to strace >=6.6 (I have 6.9 running on several musl boxes, which is ~six months old now) and see if this error continues to exist?

I don't see the value in patching a much older version of strace if upstream has potentially already fixed something, so I'm going to try to build strace-6.9 and see what breaks. If no breakage, I'll see about rebasing our patches (if necessary) and then aim for a version bump.

If this FTB can repro on strace-6.9 (chosen because it's what I can verify works here), then we can figure out what's going on and potentially involve upstream.

If it repros on 6.9, we can check against 6.12 also - we have some wiggle room to move forward.

6.9 hasn't blown up on x86_64. If 6.9 doesn't break on AArch64 we have a win, if it does we have to remove the LARGEFILE type macros from the fcntlcmds.in list, as the .h is generated during build.

Pending testing on AArch64, version bump to 6.9 and then potentially patch that version.

mentioned in commit e83dfc3c

mentioned in merge request !793 (merged)

closed with merge request !793 (merged)

closed with commit e83dfc3c