import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / tools / build / src / tools / builtin.py

diff --git a/ceph/src/boost/tools/build/src/tools/builtin.py b/ceph/src/boost/tools/build/src/tools/builtin.py
index 6bd2a8720b7b3548d30abaaa7876033e9ad968f1..9eeaaf697636b880ea80b460e51da4dc8f0834e4 100644 (file)
--- a/ceph/src/boost/tools/build/src/tools/builtin.py
+++ b/ceph/src/boost/tools/build/src/tools/builtin.py
@@ -270,8 +270,8 @@ def register_globals ():
         # Advanced RISC Machines
         'arm',
 
-       # z Systems (aka s390x)
-       's390x',
+        # z Systems (aka s390x)
+        's390x',
 
         # Combined architectures for platforms/toolsets that support building for
         # multiple architectures at once. "combined" would be the default multi-arch
@@ -287,9 +287,14 @@ def register_globals ():
         'native', 'i486', 'i586', 'i686', 'pentium', 'pentium-mmx', 'pentiumpro', 'pentium2', 'pentium3',
         'pentium3m', 'pentium-m', 'pentium4', 'pentium4m', 'prescott', 'nocona', 'core2', 'corei7', 'corei7-avx', 'core-avx-i',
         'conroe', 'conroe-xe', 'conroe-l', 'allendale', 'merom', 'merom-xe', 'kentsfield', 'kentsfield-xe', 'penryn', 'wolfdale',
-        'yorksfield', 'nehalem', 'sandy-bridge', 'ivy-bridge', 'haswell', 'k6', 'k6-2', 'k6-3', 'athlon', 'athlon-tbird', 'athlon-4', 'athlon-xp',
-        'athlon-mp', 'k8', 'opteron', 'athlon64', 'athlon-fx', 'k8-sse3', 'opteron-sse3', 'athlon64-sse3', 'amdfam10', 'barcelona',
-        'bdver1', 'bdver2', 'bdver3', 'btver1', 'btver2', 'winchip-c6', 'winchip2', 'c3', 'c3-2', 'atom',
+        'yorksfield', 'nehalem', 'sandy-bridge', 'ivy-bridge', 'haswell', 'broadwell', 'skylake', 'skylake-avx512', 'cannonlake',
+        'icelake-client', 'icelake-server', 'cascadelake', 'cooperlake', 'tigerlake',
+        'atom',
+        'k6', 'k6-2', 'k6-3', 'athlon', 'athlon-tbird', 'athlon-4', 'athlon-xp', 'athlon-mp', 'k8', 'opteron', 'athlon64', 'athlon-fx',
+        'k8-sse3', 'opteron-sse3', 'athlon64-sse3', 'amdfam10', 'barcelona', 'bdver1', 'bdver2', 'bdver3', 'btver1',
+        'btver2', 'znver1', 'znver2',
+        'winchip-c6', 'winchip2',
+        'c3', 'c3-2', 'c7',
 
         # ia64
         'itanium', 'itanium1', 'merced', 'itanium2', 'mckinley',
@@ -320,8 +325,8 @@ def register_globals ():
         'armv2', 'armv2a', 'armv3', 'armv3m', 'armv4', 'armv4t', 'armv5',
         'armv5t', 'armv5te', 'armv6', 'armv6j', 'iwmmxt', 'ep9312',
 
-       # z Systems (aka s390x)
-       'z196', 'zEC12', 'z13', 'z13', 'z14', 'z15'],
+        # z Systems (aka s390x)
+        'z196', 'zEC12', 'z13', 'z13', 'z14', 'z15'],
 
         ['propagated', 'optional'])