From 5ca08b7fac24f21cfd1ae02dbc10e3886f68d858 Mon Sep 17 00:00:00 2001
From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Thu, 10 Oct 2019 11:23:00 +0200
Subject: [PATCH 55/76] xlat: provide fallback definitions for XDP_FLAGS_*
 constants

* xlat/xdp_flags.in: Add fallback definitions.

References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201
---
 xlat/xdp_flags.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: strace-5.1/xlat/xdp_flags.in
===================================================================
--- strace-5.1.orig/xlat/xdp_flags.in	2017-09-03 17:39:24.000000000 +0200
+++ strace-5.1/xlat/xdp_flags.in	2020-01-29 12:16:20.823861980 +0100
@@ -1,5 +1,5 @@
-XDP_FLAGS_MODES
-XDP_FLAGS_UPDATE_IF_NOEXIST
-XDP_FLAGS_SKB_MODE
-XDP_FLAGS_DRV_MODE
-XDP_FLAGS_HW_MODE
+XDP_FLAGS_MODES			0xe
+XDP_FLAGS_UPDATE_IF_NOEXIST	0x1
+XDP_FLAGS_SKB_MODE		0x2
+XDP_FLAGS_DRV_MODE		0x4
+XDP_FLAGS_HW_MODE		0x8
Index: strace-5.1/xlat/xdp_flags.h
===================================================================
--- strace-5.1.orig/xlat/xdp_flags.h	2019-05-22 15:08:31.000000000 +0200
+++ strace-5.1/xlat/xdp_flags.h	2020-01-29 12:16:47.515705540 +0100
@@ -3,6 +3,41 @@
 #include "gcc_compat.h"
 #include "static_assert.h"
 
+#if defined(XDP_FLAGS_MODES) || (defined(HAVE_DECL_XDP_FLAGS_MODES) && HAVE_DECL_XDP_FLAGS_MODES)
+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+static_assert((XDP_FLAGS_MODES) == (0xe), "XDP_FLAGS_MODES != 0xe");
+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+#else
+# define XDP_FLAGS_MODES 0xe
+#endif
+#if defined(XDP_FLAGS_UPDATE_IF_NOEXIST) || (defined(HAVE_DECL_XDP_FLAGS_UPDATE_IF_NOEXIST) && HAVE_DECL_XDP_FLAGS_UPDATE_IF_NOEXIST)
+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+static_assert((XDP_FLAGS_UPDATE_IF_NOEXIST) == (0x1), "XDP_FLAGS_UPDATE_IF_NOEXIST != 0x1");
+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+#else
+# define XDP_FLAGS_UPDATE_IF_NOEXIST 0x1
+#endif
+#if defined(XDP_FLAGS_SKB_MODE) || (defined(HAVE_DECL_XDP_FLAGS_SKB_MODE) && HAVE_DECL_XDP_FLAGS_SKB_MODE)
+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+static_assert((XDP_FLAGS_SKB_MODE) == (0x2), "XDP_FLAGS_SKB_MODE != 0x2");
+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+#else
+# define XDP_FLAGS_SKB_MODE 0x2
+#endif
+#if defined(XDP_FLAGS_DRV_MODE) || (defined(HAVE_DECL_XDP_FLAGS_DRV_MODE) && HAVE_DECL_XDP_FLAGS_DRV_MODE)
+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+static_assert((XDP_FLAGS_DRV_MODE) == (0x4), "XDP_FLAGS_DRV_MODE != 0x4");
+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+#else
+# define XDP_FLAGS_DRV_MODE 0x4
+#endif
+#if defined(XDP_FLAGS_HW_MODE) || (defined(HAVE_DECL_XDP_FLAGS_HW_MODE) && HAVE_DECL_XDP_FLAGS_HW_MODE)
+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+static_assert((XDP_FLAGS_HW_MODE) == (0x8), "XDP_FLAGS_HW_MODE != 0x8");
+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
+#else
+# define XDP_FLAGS_HW_MODE 0x8
+#endif
 
 #ifndef XLAT_MACROS_ONLY
 
@@ -14,21 +49,11 @@
 
 static
 const struct xlat xdp_flags[] = {
-#if defined(XDP_FLAGS_MODES) || (defined(HAVE_DECL_XDP_FLAGS_MODES) && HAVE_DECL_XDP_FLAGS_MODES)
-  XLAT(XDP_FLAGS_MODES),
-#endif
-#if defined(XDP_FLAGS_UPDATE_IF_NOEXIST) || (defined(HAVE_DECL_XDP_FLAGS_UPDATE_IF_NOEXIST) && HAVE_DECL_XDP_FLAGS_UPDATE_IF_NOEXIST)
-  XLAT(XDP_FLAGS_UPDATE_IF_NOEXIST),
-#endif
-#if defined(XDP_FLAGS_SKB_MODE) || (defined(HAVE_DECL_XDP_FLAGS_SKB_MODE) && HAVE_DECL_XDP_FLAGS_SKB_MODE)
-  XLAT(XDP_FLAGS_SKB_MODE),
-#endif
-#if defined(XDP_FLAGS_DRV_MODE) || (defined(HAVE_DECL_XDP_FLAGS_DRV_MODE) && HAVE_DECL_XDP_FLAGS_DRV_MODE)
-  XLAT(XDP_FLAGS_DRV_MODE),
-#endif
-#if defined(XDP_FLAGS_HW_MODE) || (defined(HAVE_DECL_XDP_FLAGS_HW_MODE) && HAVE_DECL_XDP_FLAGS_HW_MODE)
-  XLAT(XDP_FLAGS_HW_MODE),
-#endif
+ XLAT(XDP_FLAGS_MODES),
+ XLAT(XDP_FLAGS_UPDATE_IF_NOEXIST),
+ XLAT(XDP_FLAGS_SKB_MODE),
+ XLAT(XDP_FLAGS_DRV_MODE),
+ XLAT(XDP_FLAGS_HW_MODE),
  XLAT_END
 };