master 9699eaf8af: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 9699eaf8af0e9e79e9b4ebd51e23ab81ec90903c
Merge: 00501e82c7 db259d8fd3
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    db259d8fd3 Build Seccomp filter only if we have a 64-bit userspace (B...
---
 configure.ac        | 4 ++++
 lib-src/Makefile.in | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 45b62647e7..87c126ecbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4901,6 +4901,10 @@ AC_SUBST([HAVE_LIBSECCOMP])
 AC_SUBST([LIBSECCOMP_LIBS])
 AC_SUBST([LIBSECCOMP_CFLAGS])
 
+AC_CHECK_SIZEOF([long])
+SIZEOF_LONG="$ac_cv_sizeof_long"
+AC_SUBST([SIZEOF_LONG])
+
 OLD_LIBS=$LIBS
 LIBS="$LIB_PTHREAD $LIB_MATH $LIBS"
 AC_CHECK_FUNCS([accept4 fchdir gethostname \
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 0453b93506..cf4659fc2c 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -210,11 +210,13 @@ HAVE_SECCOMP=@HAVE_SECCOMP@
 HAVE_LIBSECCOMP=@HAVE_LIBSECCOMP@
 LIBSECCOMP_LIBS=@LIBSECCOMP_LIBS@
 LIBSECCOMP_CFLAGS=@LIBSECCOMP_CFLAGS@
+SIZEOF_LONG=@SIZEOF_LONG@
 
 # Currently, we can only generate seccomp filter files for x86-64.
 ifeq ($(HAVE_SECCOMP),yes)
 ifeq ($(HAVE_LIBSECCOMP),yes)
 ifeq ($(shell uname -m),x86_64)
+ifeq ($(SIZEOF_LONG),8)
 # We require SECCOMP_RET_KILL_PROCESS, which is only available in
 # Linux 4.14 and later.
 ifeq ($(shell { echo 4.14; uname -r | cut -d . -f 1-2; } | \
@@ -225,6 +227,7 @@ endif
 endif
 endif
 endif
+endif
 
 ifeq ($(SECCOMP_FILTER),1)
 DONT_INSTALL += seccomp-filter$(EXEEXT)