From 844067eca1da2aa50e35940e9301c53131f9beef Mon Sep 17 00:00:00 2001
From: Neale Ferguson <neale@sinenomine.net>
Date: Fri, 20 Sep 2019 13:48:27 -0400
Subject: [PATCH] Add z15 to the s390x platform (#484)

---
 src/tools/builtin.py                           | 2 +-
 src/tools/features/instruction-set-feature.jam | 2 +-
 src/tools/gcc.jam                              | 1 +
 src/tools/gcc.py                               | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tools/builtin.py b/src/tools/builtin.py
index 59edd0c4d..6bd2a8720 100644
--- a/src/tools/builtin.py
+++ b/src/tools/builtin.py
@@ -321,7 +321,7 @@ def register_globals ():
         'armv5t', 'armv5te', 'armv6', 'armv6j', 'iwmmxt', 'ep9312',
 
 	# z Systems (aka s390x)
-	'z196', 'zEC12', 'z13', 'z13', 'z14'],
+	'z196', 'zEC12', 'z13', 'z13', 'z14', 'z15'],
 
         ['propagated', 'optional'])
 
diff --git a/src/tools/features/instruction-set-feature.jam b/src/tools/features/instruction-set-feature.jam
index ccea5ce37..0cd482ae9 100644
--- a/src/tools/features/instruction-set-feature.jam
+++ b/src/tools/features/instruction-set-feature.jam
@@ -44,7 +44,7 @@ feature.feature instruction-set
         armv7 armv7s
 	
 	# z Systems (aka s390x)
-	z196 zEC12 z13 z14
+	z196 zEC12 z13 z14 z15
 
     :
         propagated optional
diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam
index b68c18aa2..d2bb06b29 100644
--- a/src/tools/gcc.jam
+++ b/src/tools/gcc.jam
@@ -1311,5 +1311,6 @@ cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
 cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
 cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
 cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
+cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
 # AIX variant of RS/6000 & PowerPC
 toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
diff --git a/src/tools/gcc.py b/src/tools/gcc.py
index 01fb793ff..1db7d5758 100644
--- a/src/tools/gcc.py
+++ b/src/tools/gcc.py
@@ -864,6 +864,7 @@ cpu_flags('gcc', 'OPTIONS', 's390x',  'z196', ['-march=z196'])
 cpu_flags('gcc', 'OPTIONS', 's390x',  'zEC12', ['-march=zEC12'])
 cpu_flags('gcc', 'OPTIONS', 's390x',  'z13', ['-march=z13'])
 cpu_flags('gcc', 'OPTIONS', 's390x',  'z14', ['-march=z14'])
+cpu_flags('gcc', 'OPTIONS', 's390x',  'z15', ['-march=z15'])
 # AIX variant of RS/6000 & PowerPC
 flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32'])
 flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64'])