diff --git a/mstflint-armv7_arch.patch b/mstflint-armv7_arch.patch new file mode 100644 index 0000000..fb2880d --- /dev/null +++ b/mstflint-armv7_arch.patch @@ -0,0 +1,66 @@ +diff --git common/compatibility.h common/compatibility.h +index 7c42fa7..46cd928 100644 +--- common/compatibility.h ++++ common/compatibility.h +@@ -59,6 +59,8 @@ + # define ARCH_ppc64 + # elif defined(__PPC__) + # define ARCH_ppc ++# elif defined(__ARM_ARCH_7A__) ++# define ARCH_armv7 + # elif defined(__aarch64__) + # define ARCH_arm64 + # elif defined(__s390x__) +@@ -96,7 +98,7 @@ + #define U16H_FMT "0x%04x" + #define U8H_FMT "0x%02x" + +-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) ++#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) + # if defined(__MINGW32__) || defined(__MINGW64__) + # include + # define U64D_FMT "0x%" PRId64 +diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h +index 0963ba7..618a2f9 100644 +--- mtcr_ul/packets_common.h ++++ mtcr_ul/packets_common.h +@@ -148,6 +148,8 @@ + # define ARCH_ppc64 + # elif defined(__PPC__) + # define ARCH_ppc ++# elif defined(__ARM_ARCH_7A__) ++# define ARCH_armv7 + # elif defined(__aarch64__) + # define ARCH_arm64 + # elif defined(__s390x__) +@@ -177,7 +179,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) || defined(ARCH_s390) ++#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) + # 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 26adb09..f60d217 100644 +--- tools_layouts/adb_to_c_utils.h ++++ tools_layouts/adb_to_c_utils.h +@@ -137,6 +137,8 @@ extern "C" { + # define ARCH_ppc + # elif defined(__aarch64__) + # define ARCH_arm64 ++# elif defined(__ARM_ARCH_7A__) ++# define ARCH_armv7 + # elif defined(__s390x__) + # define ARCH_s390x + # elif defined(__s390__) +@@ -177,7 +179,7 @@ extern "C" { + # 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) ++#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) + # if defined(__MINGW32__) || defined(__MINGW64__) + # include + # define U64D_FMT "0x%" PRId64 diff --git a/mstflint-s390_arch.patch b/mstflint-s390_arch.patch index f648f9b..4b15a22 100644 --- a/mstflint-s390_arch.patch +++ b/mstflint-s390_arch.patch @@ -1,25 +1,15 @@ -From: Philipp Thomas -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 | 6 +++++- - 3 files changed, 18 insertions(+), 6 deletions(-) - -Index: common/compatibility.h -=================================================================== ---- common/compatibility.h.orig 2016-09-14 13:16:26.000000000 +0200 -+++ common/compatibility.h 2017-03-20 12:03:15.259518742 +0100 +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(__s390__) -+# define ARCH_s390 +# elif defined(__s390x__) +# define ARCH_s390x ++# elif defined(__s390__) ++# define ARCH_s390 # else # error Unknown CPU architecture using the linux OS # endif @@ -41,18 +31,18 @@ Index: common/compatibility.h # 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-09-14 13:16:31.000000000 +0200 -+++ mtcr_ul/packets_common.h 2017-03-20 12:01:53.115447515 +0100 +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(__s390__) -+# define ARCH_s390 +# elif defined(__s390x__) +# define ARCH_s390x ++# elif defined(__s390__) ++# define ARCH_s390 # else # error Unknown CPU architecture using the linux OS # endif @@ -77,27 +67,42 @@ Index: mtcr_ul/packets_common.h # 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-09-14 13:16:31.000000000 +0200 -+++ tools_layouts/adb_to_c_utils.h 2017-03-20 12:01:53.115447515 +0100 +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(__s390__) -+# define ARCH_s390 +# elif defined(__s390x__) +# define ARCH_s390x ++# elif defined(__s390__) ++# define ARCH_s390 # else # error Unknown CPU architecture using the linux OS # endif -@@ -180,7 +184,7 @@ extern "C" { +@@ -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 + # 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) -+#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 U64D_FMT "%lu" +-# define U64H_FMT "0x%016lx" +-# define U48H_FMT "0x%012lx" + #else + # error Unknown architecture + #endif /* ARCH */ diff --git a/mstflint.changes b/mstflint.changes index 590c2e1..97d01a5 100644 --- a/mstflint.changes +++ b/mstflint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 18 05:54:00 UTC 2017 - nmoreychaisemartin@suse.com + +- Add mstflint-armv7_arch.patch to support build on armv7l +- Adapt mstflint-s390_arch.patch to work with s390 and s390x + ------------------------------------------------------------------- Fri Mar 31 11:21:24 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/mstflint.spec b/mstflint.spec index bf24a9e..7f622ae 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -36,6 +36,8 @@ Patch1: mstflint-s390_arch.patch Patch2: mstflint-4.4.0-implicit-declaration.patch # PATCH-FIX-UPSTREAM no __DATE__ and __TIME__ in codes Patch3: mstflint-4.4.0-no-date-time.patch +# PATCH-FIX-UPSTREAM Add all needed defines to get it built on armv7 +Patch4: mstflint-armv7_arch.patch BuildRequires: gcc-c++ BuildRequires: libibmad-devel @@ -58,6 +60,7 @@ the downloads page at the Mellanox web site. %patch1 %patch2 %patch3 +%patch4 %build ./autogen.sh