4641787595
- Adapt mstflint-s390_arch.patch to work with s390 and s390x OBS-URL: https://build.opensuse.org/request/show/495827 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=9
109 lines
4.1 KiB
Diff
109 lines
4.1 KiB
Diff
diff --git common/compatibility.h common/compatibility.h
|
|
index e202b42..7c42fa7 100644
|
|
--- common/compatibility.h
|
|
+++ common/compatibility.h
|
|
@@ -61,6 +61,10 @@
|
|
# define ARCH_ppc
|
|
# elif defined(__aarch64__)
|
|
# define ARCH_arm64
|
|
+# elif defined(__s390x__)
|
|
+# define ARCH_s390x
|
|
+# elif defined(__s390__)
|
|
+# define ARCH_s390
|
|
# 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"
|
|
diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h
|
|
index dd02b71..0963ba7 100644
|
|
--- mtcr_ul/packets_common.h
|
|
+++ mtcr_ul/packets_common.h
|
|
@@ -150,6 +150,10 @@
|
|
# define ARCH_ppc
|
|
# elif defined(__aarch64__)
|
|
# define ARCH_arm64
|
|
+# elif defined(__s390x__)
|
|
+# define ARCH_s390x
|
|
+# elif defined(__s390__)
|
|
+# define ARCH_s390
|
|
# else
|
|
# error Unknown CPU architecture using the linux OS
|
|
# endif
|
|
@@ -163,9 +167,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"
|
|
@@ -173,7 +177,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"
|
|
diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h
|
|
index 6268b69..26adb09 100644
|
|
--- tools_layouts/adb_to_c_utils.h
|
|
+++ tools_layouts/adb_to_c_utils.h
|
|
@@ -137,6 +137,10 @@ extern "C" {
|
|
# define ARCH_ppc
|
|
# elif defined(__aarch64__)
|
|
# define ARCH_arm64
|
|
+# elif defined(__s390x__)
|
|
+# define ARCH_s390x
|
|
+# elif defined(__s390__)
|
|
+# define ARCH_s390
|
|
# else
|
|
# error Unknown CPU architecture using the linux OS
|
|
# endif
|
|
@@ -169,7 +173,11 @@ 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_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"
|
|
+#elif 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 +188,6 @@ 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)
|
|
-# define U64D_FMT "%lu"
|
|
-# define U64H_FMT "0x%016lx"
|
|
-# define U48H_FMT "0x%012lx"
|
|
#else
|
|
# error Unknown architecture
|
|
#endif /* ARCH */
|