File mstflint-s390_arch.patch of Package mstflint

From: Philipp Thomas <pth@suse.de>
Date: 2014-03-03 16:52:28+01:00
Subject: Add defines for s390x

---
 common/compatibility.h         |    8 ++++++--
 mtcr_ul/packets_common.h       |   10 +++++++---
 tools_layouts/adb_to_c_utils.h |    8 ++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

Index: common/compatibility.h
===================================================================
--- common/compatibility.h.orig	2014-04-10 15:37:31.000000000 +0200
+++ common/compatibility.h	2014-05-16 13:32:41.440750201 +0200
@@ -61,6 +61,10 @@
 #       define ARCH_ppc
 #   elif defined(__aarch64__)
 #       define ARCH_arm64
+#   elif defined(__s390__)
+#       define ARCH_s390
+#   elif defined(__s390x__)
+#       define ARCH_s390x
 #   else
 #       error Unknown CPU architecture using the linux OS
 #   endif
@@ -92,7 +96,7 @@
 #define U16H_FMT    "0x%04x"
 #define U8H_FMT     "0x%02x"
 
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD)
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390)
 #   if defined(__MINGW32__) || defined(__MINGW64__)
 #       include <inttypes.h>
 #       define U64D_FMT    "0x%"PRId64
@@ -107,7 +111,7 @@
 #       define U48H_FMT     "0x%012llx"
 #       define U64D_FMT_GEN "llu"
 #   endif
-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
+#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_s390x)
 #    define U64D_FMT     "%lu"
 #    define U64H_FMT     "0x%016lx"
 #    define U48H_FMT     "0x%012lx"
Index: mtcr_ul/packets_common.h
===================================================================
--- mtcr_ul/packets_common.h.orig	2014-04-10 15:37:32.000000000 +0200
+++ mtcr_ul/packets_common.h	2014-05-16 13:41:15.870778141 +0200
@@ -148,6 +148,10 @@
 #       define ARCH_ppc
 #   elif defined(__aarch64__)
 #       define ARCH_arm64
+#   elif defined(__s390__)
+#       define ARCH_s390
+#   elif defined(__s390x__)
+#       define ARCH_s390x
 #   else
 #       error Unknown CPU architecture using the linux OS
 #   endif
@@ -161,9 +165,9 @@
 
 /**********************************/
 /* define macros for print fields */
-//#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)
+//#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_s390x)
 /*
-#if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__))
+#if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)) || defined(ARCH_s390x)
 #   define U64H_FMT "0x%016lx"
 #   define U64D_FMT "%lu"
 #   define U32H_FMT "0x%08x"
@@ -171,7 +175,7 @@
 #   define U8H_FMT  "0x%02x"
 #   define U32D_FMT "%u"
 #   define STR_FMT "%s"
-#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD)
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_s390)
 #   define U64H_FMT "0x%016llx"
 #   define U64D_FMT "%llu"
 #   define U32H_FMT "0x%08x"
Index: tools_layouts/adb_to_c_utils.h
===================================================================
--- tools_layouts/adb_to_c_utils.h.orig	2014-04-10 15:37:32.000000000 +0200
+++ tools_layouts/adb_to_c_utils.h	2014-05-16 13:29:37.380740505 +0200
@@ -133,6 +133,10 @@ extern "C" {
 #       define ARCH_ppc
 #   elif defined(__aarch64__)
 #       define ARCH_arm64
+#   elif defined(__s390__)
+#       define ARCH_s390
+#   elif defined(__s390x__)
+#       define ARCH_s390x
 #   else
 #       error Unknown CPU architecture using the linux OS
 #   endif
@@ -165,7 +169,7 @@ extern "C" {
 #define U16H_FMT    "0x%04x"
 #define U8H_FMT     "0x%02x"
 
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD)
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390)
 #   if defined(__MINGW32__) || defined(__MINGW64__)
 #       include <inttypes.h>
 #       define U64D_FMT    "0x%"PRId64
@@ -176,7 +180,7 @@ extern "C" {
 #       define U64H_FMT    "0x%016llx"
 #       define U48H_FMT    "0x%012llx"
 #   endif
-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
+#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_s390x)
 #    define U64D_FMT    "%lu"
 #    define U64H_FMT    "0x%016lx"
 #	 define U48H_FMT	"0x%012lx"