mips: Fix conditional inclusion of <asm/sgidefs.h>

systemd now has a system call wrapper that does a long series of #ifdef's to
differentiate between architectures and ABIs. This wrapper has two problems.

1. On mips, it needs to differentiate between O32, N32, N64 ABI. It does that
via a code block in src/include/override/sys/generate-syscall.py (and derived
files):

     76 #  elif defined(_MIPS_SIM)
     77 #    if _MIPS_SIM == _MIPS_SIM_ABI32
     78 #      define systemd_NR_{syscall} {nr_mipso32}
     79 #    elif _MIPS_SIM == _MIPS_SIM_NABI32
     80 #      define systemd_NR_{syscall} {nr_mips64n32}
     81 #    elif _MIPS_SIM == _MIPS_SIM_ABI64
     82 #      define systemd_NR_{syscall} {nr_mips64}
     83 #    else
     84 #      error "Unknown MIPS ABI"
     85 #    endif
     86 #  elif defined(__hppa__)

Now the _MIPS_SIM* constants stem from a vendor-specific header file sgidefs.h,
which is included with glibc, but not with musl. It is however always present
in the Linux kernel headers as asm/sgidefs.h ...

2. To work around this, the syscall wrapper already has a block

     47 #ifdef ARCH_MIPS
     48 #include <asm/sgidefs.h>
     49 #endif

Turns out, ARCH_MIPS is defined nowhere in Gentoo, neither on glibc nor on musl.
As a result the code (by accident, probably sgidefs.h is included transitively
somehow) works on glibc, but not on musl.

The simplest fix is to replace line 47 in the generator and the derived file
with

     47 #ifdef __mips__

Two other source code files require a similar fix since they rely on the
constants.

Bug: https://github.com/systemd/systemd/issues/41239
Bug: https://bugs.gentoo.org/971376
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel
2026-03-22 20:02:13 +01:00
committed by Daan De Meyer
parent 9d844012bc
commit beef155b12
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ HEADER = '''\
#include_next <sys/syscall.h> /* IWYU pragma: export */
#ifdef ARCH_MIPS
#ifdef __mips__
#include <asm/sgidefs.h>
#endif
+1 -1
View File
@@ -11,7 +11,7 @@
#include_next <sys/syscall.h> /* IWYU pragma: export */
#ifdef ARCH_MIPS
#ifdef __mips__
#include <asm/sgidefs.h>
#endif
+1 -1
View File
@@ -5,7 +5,7 @@
#include <syslog.h>
#include <unistd.h>
#ifdef ARCH_MIPS
#ifdef __mips__
#include <asm/sgidefs.h>
#endif
+1 -1
View File
@@ -12,7 +12,7 @@
#include <sys/shm.h>
#include <sys/stat.h>
#ifdef ARCH_MIPS
#ifdef __mips__
#include <asm/sgidefs.h>
#endif