Remove all mention of Windows IA-64 support (GH-3389)

It was mostly removed long ago.

diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 622c7d1708f3695707d4d8dbca8d48ffba7f63af..7cde1a0701eb8fd168fbb79498fb20a198b742ac 100644 (file)
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -814,13 +814,13 @@ This module provides the :class:`UnixCCompiler` class, a subclass of
 .. module:: distutils.msvccompiler
    :synopsis: Microsoft Compiler
 
+.. XXX: This is *waaaaay* out of date!
 
 This module provides :class:`MSVCCompiler`, an implementation of the abstract
 :class:`CCompiler` class for Microsoft Visual Studio. Typically, extension
 modules need to be compiled with the same compiler that was used to compile
 Python. For Python 2.3 and earlier, the compiler was Visual Studio 6. For Python
-2.4 and 2.5, the compiler is Visual Studio .NET 2003. The AMD64 and Itanium
-binaries are created using the Platform SDK.
+2.4 and 2.5, the compiler is Visual Studio .NET 2003.
 
 :class:`MSVCCompiler` will normally choose the right compiler, linker etc. on
 its own. To override this choice, the environment variables *DISTUTILS_USE_SDK*

diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index bbd2a8ce831cee1daeb7dfe286e3b13259a75a0a..dc3a50cb032d6c3cbfa660140da4a7f7d77886be 100644 (file)
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -351,8 +351,8 @@ installed, you can use a 32bit version of Windows to create 64bit extensions
 and vice-versa.
 
 To build for an alternate platform, specify the :option:`!--plat-name` option
-to the build command.  Valid values are currently 'win32', 'win-amd64' and
-'win-ia64'.  For example, on a 32bit version of Windows, you could execute::
+to the build command.  Valid values are currently 'win32', and  'win-amd64'.
+For example, on a 32bit version of Windows, you could execute::
 
    python setup.py build --plat-name=win-amd64
 

diff --git a/Doc/library/sysconfig.rst b/Doc/library/sysconfig.rst
index 84f56463a1151ad7b149233aeb849a1b93beea08..9f549fbc51304508c89309515d4e886e8457e943 100644 (file)
--- a/Doc/library/sysconfig.rst
+++ b/Doc/library/sysconfig.rst
@@ -186,7 +186,6 @@ Other functions
    Windows will return one of:
 
    - win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-   - win-ia64 (64bit Windows on Itanium)
    - win32 (all others - specifically, sys.platform is returned)
 
    Mac OS X can return:

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 9155626a471d77be27e3d5c69f9f99cc01d79386..7444565562192380635cfd237bd82203673bc671 100644 (file)
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -208,7 +208,7 @@ class build_ext(Command):
             if self.plat_name == 'win32':
                 suffix = 'win32'
             else:
-                # win-amd64 or win-ia64
+                # win-amd64
                 suffix = self.plat_name[4:]
             new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
             if suffix:

diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py
index c401ddc86eb9198f02c8935edc3254ec1f09dc1d..4c0036a0f13305a80cc353e1cc3438223232bb63 100644 (file)
--- a/Lib/distutils/msvc9compiler.py
+++ b/Lib/distutils/msvc9compiler.py
@@ -55,7 +55,6 @@ else:
 PLAT_TO_VCVARS = {
     'win32' : 'x86',
     'win-amd64' : 'amd64',
-    'win-ia64' : 'ia64',
 }
 
 class Reg:
@@ -344,7 +343,7 @@ class MSVCCompiler(CCompiler) :
         if plat_name is None:
             plat_name = get_platform()
         # sanity check for platforms to prevent obscure errors later.
-        ok_plats = 'win32', 'win-amd64', 'win-ia64'
+        ok_plats = 'win32', 'win-amd64'
         if plat_name not in ok_plats:
             raise DistutilsPlatformError("--plat-name must be one of %s" %
                                          (ok_plats,))
@@ -362,7 +361,6 @@ class MSVCCompiler(CCompiler) :
             # to cross compile, you use 'x86_amd64'.
             # On AMD64, 'vcvars32.bat amd64' is a native build env; to cross
             # compile use 'x86' (ie, it runs the x86 compiler directly)
-            # No idea how itanium handles this, if at all.
             if plat_name == get_platform() or plat_name == 'win32':
                 # native build or cross-compile to win32
                 plat_spec = PLAT_TO_VCVARS[plat_name]

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 1048cd41593939b1c51339204467e309adbba78b..d1de2fbfcb947be5e4f72df19c3a93f3da37cc1e 100644 (file)
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -172,7 +172,7 @@ def get_build_version():
 def get_build_architecture():
     """Return the processor architecture.
 
-    Possible results are "Intel", "Itanium", or "AMD64".
+    Possible results are "Intel" or "AMD64".
     """
 
     prefix = " bit ("

diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index 4e9d79b7c6cba8f09aebb6bc49828dfda5fd649a..e2fc3809587faa329f096846188a7df85edde48c 100644 (file)
--- a/Lib/distutils/tests/test_util.py
+++ b/Lib/distutils/tests/test_util.py
@@ -78,13 +78,6 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase):
         sys.platform = 'win32'
         self.assertEqual(get_platform(), 'win-amd64')
 
-        # windows XP, itanium
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Itanium)]')
-        sys.platform = 'win32'
-        self.assertEqual(get_platform(), 'win-ia64')
-
         # macbook
         os.name = 'posix'
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index b8a69114c8f6051c06514bec49dca82f8d3c2779..9394c1e056476abf5e6d7030bda7790563237ab7 100644 (file)
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -30,24 +30,14 @@ def get_platform ():
 
     Windows will return one of:
        win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-       win-ia64 (64bit Windows on Itanium)
        win32 (all others - specifically, sys.platform is returned)
 
     For other non-POSIX platforms, currently just returns 'sys.platform'.
 
     """
     if os.name == 'nt':
-        # sniff sys.version for architecture.
-        prefix = " bit ("
-        i = sys.version.find(prefix)
-        if i == -1:
-            return sys.platform
-        j = sys.version.find(")", i)
-        look = sys.version[i+len(prefix):j].lower()
-        if look == 'amd64':
+        if 'amd64' in sys.version.lower():
             return 'win-amd64'
-        if look == 'itanium':
-            return 'win-ia64'
         return sys.platform
 
     # Set for cross builds explicitly

diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py
index f0370c2a0fe764c91b377d7c76e1f91437be235e..7ab8bcc52c68df4abe1b7bf64a3049172eca3592 100644 (file)
--- a/Lib/msilib/__init__.py
+++ b/Lib/msilib/__init__.py
@@ -8,8 +8,6 @@ import string
 import sys
 
 AMD64 = "AMD64" in sys.version
-Itanium = "Itanium" in sys.version
-Win64 = AMD64 or Itanium
 
 # Partially taken from Wine
 datasizemask=      0x00ff
@@ -150,9 +148,7 @@ def init_database(name, schema,
     si.SetProperty(PID_TITLE, "Installation Database")
     si.SetProperty(PID_SUBJECT, ProductName)
     si.SetProperty(PID_AUTHOR, Manufacturer)
-    if Itanium:
-        si.SetProperty(PID_TEMPLATE, "Intel64;1033")
-    elif AMD64:
+    if AMD64:
         si.SetProperty(PID_TEMPLATE, "x64;1033")
     else:
         si.SetProperty(PID_TEMPLATE, "Intel;1033")
@@ -272,7 +268,7 @@ class Directory:
         if component is None:
             component = self.logical
         self.component = component
-        if Win64:
+        if AMD64:
             flags |= 256
         if keyfile:
             keyid = self.cab.gen_id(self.absolute, keyfile)

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index fc3e03b2a2dbb064a48ab2d79e6eaed5734a3b6c..8dfe1a714d5e6273bdefe258c49653d099da366c 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -611,24 +611,14 @@ def get_platform():
 
     Windows will return one of:
        win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
-       win-ia64 (64bit Windows on Itanium)
        win32 (all others - specifically, sys.platform is returned)
 
     For other non-POSIX platforms, currently just returns 'sys.platform'.
 
     """
     if os.name == 'nt':
-        # sniff sys.version for architecture.
-        prefix = " bit ("
-        i = sys.version.find(prefix)
-        if i == -1:
-            return sys.platform
-        j = sys.version.find(")", i)
-        look = sys.version[i+len(prefix):j].lower()
-        if look == 'amd64':
+        if 'amd64' in sys.version.lower():
             return 'win-amd64'
-        if look == 'itanium':
-            return 'win-ia64'
         return sys.platform
 
     if os.name != "posix" or not hasattr(os, 'uname'):

diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 694435f56c349f4d3fda1bce0a39a429ce990742..20252be0a41b00d924ca2e47aa3d3754fd03c32f 100644 (file)
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -119,13 +119,6 @@ class TestSysConfig(unittest.TestCase):
         sys.platform = 'win32'
         self.assertEqual(get_platform(), 'win-amd64')
 
-        # windows XP, itanium
-        os.name = 'nt'
-        sys.version = ('2.4.4 (#71, Oct 18 2006, 08:34:43) '
-                       '[MSC v.1310 32 bit (Itanium)]')
-        sys.platform = 'win32'
-        self.assertEqual(get_platform(), 'win-ia64')
-
         # macbook
         os.name = 'posix'
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '

diff --git a/PC/config.c b/PC/config.c
index 43d9e208cca6b832445f3656b464b14788c6b885..f5aa332a5c689c91c8f9853955ddb6639a5bc9a3 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -6,9 +6,7 @@
 #include "Python.h"
 
 extern PyObject* PyInit_array(void);
-#ifndef MS_WINI64
 extern PyObject* PyInit_audioop(void);
-#endif
 extern PyObject* PyInit_binascii(void);
 extern PyObject* PyInit_cmath(void);
 extern PyObject* PyInit_errno(void);
@@ -80,11 +78,7 @@ struct _inittab _PyImport_Inittab[] = {
 
     {"array", PyInit_array},
     {"_ast", PyInit__ast},
-#ifdef MS_WINDOWS
-#ifndef MS_WINI64
     {"audioop", PyInit_audioop},
-#endif
-#endif
     {"binascii", PyInit_binascii},
     {"cmath", PyInit_cmath},
     {"errno", PyInit_errno},

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 46ff6f0fe56bc82de5e719c547ef9f2a2ed732a3..0da68418cc0284dfeffebe6a2955be9f0ac6b00f 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -112,8 +112,6 @@ WIN32 is still required for the locale module.
    defined on Win32 *and* Win64. Win32 only code must therefore be
    guarded as follows:
         #if defined(MS_WIN32) && !defined(MS_WIN64)
-   Some modules are disabled on Itanium processors, therefore we
-   have MS_WINI64 set for those targets, otherwise MS_WINX64
 */
 #ifdef _WIN64
 #define MS_WIN64
@@ -121,17 +119,12 @@ WIN32 is still required for the locale module.
 
 /* set the COMPILER */
 #ifdef MS_WIN64
-#if defined(_M_IA64)
-#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
-#define MS_WINI64
-#define PYD_PLATFORM_TAG "win_ia64"
-#elif defined(_M_X64) || defined(_M_AMD64)
+#if defined(_M_X64) || defined(_M_AMD64)
 #if defined(__INTEL_COMPILER)
 #define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
 #else
 #define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
 #endif /* __INTEL_COMPILER */
-#define MS_WINX64
 #define PYD_PLATFORM_TAG "win_amd64"
 #else
 #define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")