--- strace-5.4/xlat/msgctl_flags.h.old	2019-11-28 22:53:27.000000000 +0000
+++ strace-5.4/xlat/msgctl_flags.h	2019-12-23 02:41:44.904239378 +0000
@@ -19,7 +19,7 @@
 #endif
 #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((IPC_STAT) == (2), "IPC_STAT != 2");
+static_assert((IPC_STAT & ~IPC_64) == (2), "IPC_STAT != 2");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define IPC_STAT 2
@@ -33,7 +33,7 @@
 #endif
 #if defined(MSG_STAT) || (defined(HAVE_DECL_MSG_STAT) && HAVE_DECL_MSG_STAT)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((MSG_STAT) == (11), "MSG_STAT != 11");
+static_assert((MSG_STAT & ~IPC_64) == (11), "MSG_STAT != 11");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define MSG_STAT 11
@@ -47,7 +47,7 @@
 #endif
 #if defined(MSG_STAT_ANY) || (defined(HAVE_DECL_MSG_STAT_ANY) && HAVE_DECL_MSG_STAT_ANY)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((MSG_STAT_ANY) == (13), "MSG_STAT_ANY != 13");
+static_assert((MSG_STAT_ANY & ~IPC_64) == (13), "MSG_STAT_ANY != 13");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define MSG_STAT_ANY 13
--- strace-5.4/xlat/semctl_flags.h.old	2019-11-28 22:53:27.000000000 +0000
+++ strace-5.4/xlat/semctl_flags.h	2019-12-23 02:42:10.811448260 +0000
@@ -19,7 +19,7 @@
 #endif
 #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((IPC_STAT) == (2), "IPC_STAT != 2");
+static_assert((IPC_STAT & ~IPC_64) == (2), "IPC_STAT != 2");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define IPC_STAT 2
@@ -82,7 +82,7 @@
 #endif
 #if defined(SEM_STAT) || (defined(HAVE_DECL_SEM_STAT) && HAVE_DECL_SEM_STAT)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((SEM_STAT) == (18), "SEM_STAT != 18");
+static_assert((SEM_STAT & ~IPC_64) == (18), "SEM_STAT != 18");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define SEM_STAT 18
@@ -96,7 +96,7 @@
 #endif
 #if defined(SEM_STAT_ANY) || (defined(HAVE_DECL_SEM_STAT_ANY) && HAVE_DECL_SEM_STAT_ANY)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((SEM_STAT_ANY) == (20), "SEM_STAT_ANY != 20");
+static_assert((SEM_STAT_ANY & ~IPC_64) == (20), "SEM_STAT_ANY != 20");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define SEM_STAT_ANY 20
--- strace-5.4/xlat/shmctl_flags.h.old	2019-11-28 22:53:27.000000000 +0000
+++ strace-5.4/xlat/shmctl_flags.h	2019-12-23 02:42:30.879286249 +0000
@@ -19,7 +19,7 @@
 #endif
 #if defined(IPC_STAT) || (defined(HAVE_DECL_IPC_STAT) && HAVE_DECL_IPC_STAT)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((IPC_STAT) == (2), "IPC_STAT != 2");
+static_assert((IPC_STAT & ~IPC_64) == (2), "IPC_STAT != 2");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define IPC_STAT 2
@@ -47,7 +47,7 @@
 #endif
 #if defined(SHM_STAT) || (defined(HAVE_DECL_SHM_STAT) && HAVE_DECL_SHM_STAT)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((SHM_STAT) == (13), "SHM_STAT != 13");
+static_assert((SHM_STAT & ~IPC_64) == (13), "SHM_STAT != 13");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define SHM_STAT 13
@@ -61,7 +61,7 @@
 #endif
 #if defined(SHM_STAT_ANY) || (defined(HAVE_DECL_SHM_STAT_ANY) && HAVE_DECL_SHM_STAT_ANY)
 DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-static_assert((SHM_STAT_ANY) == (15), "SHM_STAT_ANY != 15");
+static_assert((SHM_STAT_ANY & ~IPC_64) == (15), "SHM_STAT_ANY != 15");
 DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
 #else
 # define SHM_STAT_ANY 15