From 4f82c11ce8db01a6bf42e04072b45be64749901d Mon Sep 17 00:00:00 2001 From: Neale Ferguson Date: Thu, 25 Apr 2019 12:29:16 -0400 Subject: [PATCH 1/2] Add s390 --- checks/architecture/Jamroot.jam | 1 + checks/architecture/s390.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 checks/architecture/s390.cpp diff --git a/checks/architecture/Jamroot.jam b/checks/architecture/Jamroot.jam index 03f59534..b43ae600 100644 --- a/checks/architecture/Jamroot.jam +++ b/checks/architecture/Jamroot.jam @@ -22,3 +22,4 @@ obj power : power.cpp ; obj riscv : riscv.cpp ; obj sparc : sparc.cpp ; obj x86 : x86.cpp ; +obj s390 : s390.cpp ; diff --git a/checks/architecture/s390.cpp b/checks/architecture/s390.cpp new file mode 100644 index 00000000..3d948653 --- /dev/null +++ b/checks/architecture/s390.cpp @@ -0,0 +1,11 @@ +// s390.cpp +// +// Copyright (c) 2012 Steven Watanabe +// +// Distributed under the Boost Software License Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +#if !defined(__s390__) +#error "Not S390" +#endif From b62dd43cc046e2bd6eb5fe3a58404f96493fee16 Mon Sep 17 00:00:00 2001 From: Neale Ferguson Date: Fri, 26 Apr 2019 09:04:06 -0400 Subject: [PATCH 2/2] Change s390 -> s390x --- checks/architecture/Jamroot.jam | 2 +- checks/architecture/s390.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/architecture/Jamroot.jam b/checks/architecture/Jamroot.jam index b43ae600..0d3b5e7b 100644 --- a/checks/architecture/Jamroot.jam +++ b/checks/architecture/Jamroot.jam @@ -22,4 +22,4 @@ obj power : power.cpp ; obj riscv : riscv.cpp ; obj sparc : sparc.cpp ; obj x86 : x86.cpp ; -obj s390 : s390.cpp ; +obj s390x : s390x.cpp ; diff --git a/checks/architecture/s390.cpp b/checks/architecture/s390.cpp index 3d948653..a3630706 100644 --- a/checks/architecture/s390.cpp +++ b/checks/architecture/s390.cpp @@ -1,4 +1,4 @@ -// s390.cpp +// s390x.cpp // // Copyright (c) 2012 Steven Watanabe // @@ -6,6 +6,6 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#if !defined(__s390__) -#error "Not S390" +#if !defined(__s390x__) +#error "Not S390x" #endif