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 | 10 +++++++---
3 files changed, 20 insertions(+), 8 deletions(-)
Index: common/compatibility.h
===================================================================
--- common/compatibility.h.orig 2016-02-18 15:13:55.425131461 +0100
+++ common/compatibility.h 2016-02-18 15:14:01.713096514 +0100
@@ -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 2016-02-18 15:13:55.429131439 +0100
+++ mtcr_ul/packets_common.h 2016-02-18 15:14:01.713096514 +0100
@@ -147,6 +147,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
@@ -160,9 +164,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"
@@ -170,7 +174,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 2016-02-18 15:13:55.429131439 +0100
+++ tools_layouts/adb_to_c_utils.h 2016-02-18 15:15:40.964544848 +0100
@@ -137,6 +137,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
@@ -169,7 +173,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
@@ -180,10 +184,10 @@ 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"
+# define U48H_FMT "0x%012lx"
#else
# error Unknown architecture
#endif /* ARCH */
