remove IRIX support (closes bpo-31341) (#3310) · python/cpython@0693063 (original) (raw)

16 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -1086,19 +1086,16 @@ other utility module.
1086 1086
1087 1087 Return a string that identifies the current platform. This is used mainly to
1088 1088 distinguish platform-specific build directories and platform-specific built
1089 - distributions. Typically includes the OS name and version and the architecture
1090 - (as supplied by 'os.uname()'), although the exact information included depends
1091 - on the OS; eg. for IRIX the architecture isn't particularly important (IRIX only
1092 - runs on SGI hardware), but for Linux the kernel version isn't particularly
1093 - important.
1089 + distributions. Typically includes the OS name and version and the
1090 + architecture (as supplied by 'os.uname()'), although the exact information
1091 + included depends on the OS; e.g., on Linux, the kernel version isn't
1092 + particularly important.
1094 1093
1095 1094 Examples of returned values:
1096 1095
1097 1096 * ``linux-i586``
1098 1097 * ``linux-alpha``
1099 1098 * ``solaris-2.6-sun4u``
1100 - * ``irix-5.3``
1101 - * ``irix64-6.2``
1102 1099
1103 1100 For non-POSIX platforms, currently just returns ``sys.platform``.
1104 1101
Original file line number Diff line number Diff line change
@@ -173,18 +173,15 @@ Other functions
173 173
174 174 This is used mainly to distinguish platform-specific build directories and
175 175 platform-specific built distributions. Typically includes the OS name and
176 - version and the architecture (as supplied by :func:`os.uname`), although the
177 - exact information included depends on the OS; e.g. for IRIX the architecture
178 - isn't particularly important (IRIX only runs on SGI hardware), but for Linux
179 - the kernel version isn't particularly important.
176 + version and the architecture (as supplied by 'os.uname()'), although the
177 + exact information included depends on the OS; e.g., on Linux, the kernel
178 + version isn't particularly important.
180 179
181 180 Examples of returned values:
182 181
183 182 - linux-i586
184 183 - linux-alpha (?)
185 184 - solaris-2.6-sun4u
186 - - irix-5.3
187 - - irix64-6.2
188 185
189 186 Windows will return one of:
190 187
Original file line number Diff line number Diff line change
@@ -51,14 +51,6 @@ def gcv(v):
51 51
52 52 sysconfig.get_config_var = old_gcv
53 53
54 -# irix646
55 -sys.platform = 'irix646'
56 -self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
57 -
58 -# osf1V5
59 -sys.platform = 'osf1V5'
60 -self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
61 -
62 54 # GCC GNULD
63 55 sys.platform = 'bar'
64 56 def gcv(v):
Original file line number Diff line number Diff line change
@@ -233,8 +233,6 @@ def runtime_library_dir_option(self, dir):
233 233 if self._is_gcc(compiler):
234 234 return ["-Wl,+s", "-L" + dir]
235 235 return ["+s", "-L" + dir]
236 -elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
237 -return ["-rpath", dir]
238 236 else:
239 237 if self._is_gcc(compiler):
240 238 # gcc on non-GNU systems does not need -Wl, but can
Original file line number Diff line number Diff line change
@@ -16,28 +16,25 @@
16 16 from distutils.errors import DistutilsByteCompileError
17 17
18 18 def get_platform ():
19 -"""Return a string that identifies the current platform. This is used
20 - mainly to distinguish platform-specific build directories and
21 - platform-specific built distributions. Typically includes the OS name
22 - and version and the architecture (as supplied by 'os.uname()'),
23 - although the exact information included depends on the OS; eg. for IRIX
24 - the architecture isn't particularly important (IRIX only runs on SGI
25 - hardware), but for Linux the kernel version isn't particularly
26 - important.
19 +"""Return a string that identifies the current platform. This is used mainly to
20 + distinguish platform-specific build directories and platform-specific built
21 + distributions. Typically includes the OS name and version and the
22 + architecture (as supplied by 'os.uname()'), although the exact information
23 + included depends on the OS; eg. on Linux, the kernel version isn't
24 + particularly important.
27 25
28 26 Examples of returned values:
29 27 linux-i586
30 28 linux-alpha (?)
31 29 solaris-2.6-sun4u
32 - irix-5.3
33 - irix64-6.2
34 30
35 31 Windows will return one of:
36 32 win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
37 33 win-ia64 (64bit Windows on Itanium)
38 34 win32 (all others - specifically, sys.platform is returned)
39 35
40 36 For other non-POSIX platforms, currently just returns 'sys.platform'.
37 +
41 38 """
42 39 if os.name == 'nt':
43 40 # sniff sys.version for architecture.
@@ -87,8 +84,6 @@ def get_platform ():
87 84 bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
88 85 machine += ".%s" % bitness[sys.maxsize]
89 86 # fall through to standard osname-release-machine representation
90 -elif osname[:4] == "irix": # could be "irix64"!
91 -return "%s-%s" % (osname, release)
92 87 elif osname[:3] == "aix":
93 88 return "%s-%s.%s" % (osname, version, release)
94 89 elif osname[:6] == "cygwin":
Original file line number Diff line number Diff line change
@@ -599,26 +599,23 @@ def get_platform():
599 599 """Return a string that identifies the current platform.
600 600
601 601 This is used mainly to distinguish platform-specific build directories and
602 - platform-specific built distributions. Typically includes the OS name
603 - and version and the architecture (as supplied by 'os.uname()'),
604 - although the exact information included depends on the OS; eg. for IRIX
605 - the architecture isn't particularly important (IRIX only runs on SGI
606 - hardware), but for Linux the kernel version isn't particularly
607 - important.
602 + platform-specific built distributions. Typically includes the OS name and
603 + version and the architecture (as supplied by 'os.uname()'), although the
604 + exact information included depends on the OS; on Linux, the kernel version
605 + isn't particularly important.
608 606
609 607 Examples of returned values:
610 608 linux-i586
611 609 linux-alpha (?)
612 610 solaris-2.6-sun4u
613 - irix-5.3
614 - irix64-6.2
615 611
616 612 Windows will return one of:
617 613 win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
618 614 win-ia64 (64bit Windows on Itanium)
619 615 win32 (all others - specifically, sys.platform is returned)
620 616
621 617 For other non-POSIX platforms, currently just returns 'sys.platform'.
618 +
622 619 """
623 620 if os.name == 'nt':
624 621 # sniff sys.version for architecture.
@@ -666,8 +663,6 @@ def get_platform():
666 663 bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
667 664 machine += ".%s" % bitness[sys.maxsize]
668 665 # fall through to standard osname-release-machine representation
669 -elif osname[:4] == "irix": # could be "irix64"!
670 -return "%s-%s" % (osname, release)
671 666 elif osname[:3] == "aix":
672 667 return "%s-%s.%s" % (osname, version, release)
673 668 elif osname[:6] == "cygwin":
Original file line number Diff line number Diff line change
@@ -24,12 +24,12 @@ def debug(msg):
24 24
25 25
26 26 def normalize_output(data):
27 -# Some operating systems do conversions on newline. We could possibly
28 -# fix that by doing the appropriate termios.tcsetattr()s. I couldn't
29 -# figure out the right combo on Tru64 and I don't have an IRIX box.
30 -# So just normalize the output and doc the problem O/Ses by allowing
31 -# certain combinations for some platforms, but avoid allowing other
32 -# differences (like extra whitespace, trailing garbage, etc.)
27 +# Some operating systems do conversions on newline. We could possibly fix
28 +# that by doing the appropriate termios.tcsetattr()s. I couldn't figure out
29 +# the right combo on Tru64. So, just normalize the output and doc the
30 +# problem O/Ses by allowing certain combinations for some platforms, but
31 +# avoid allowing other differences (like extra whitespace, trailing garbage,
32 +# etc.)
33 33
34 34 # This is about the best we can do without getting some feedback
35 35 # from someone more knowledgable.
@@ -38,7 +38,6 @@ def normalize_output(data):
38 38 if data.endswith(b'\r\r\n'):
39 39 return data.replace(b'\r\r\n', b'\n')
40 40
41 -# IRIX apparently turns \n into \r\n.
42 41 if data.endswith(b'\r\n'):
43 42 return data.replace(b'\r\n', b'\n')
44 43
Original file line number Diff line number Diff line change
@@ -399,7 +399,7 @@ def _lanscan_getnode():
399 399
400 400 def _netstat_getnode():
401 401 """Get the hardware address on Unix by running netstat."""
402 -# This might work on AIX, Tru64 UNIX and presumably on IRIX.
402 +# This might work on AIX, Tru64 UNIX.
403 403 try:
404 404 proc = _popen('netstat', '-ia')
405 405 if not proc:
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 +Per PEP 11, support for the IRIX operating system was removed.
Original file line number Diff line number Diff line change
@@ -350,9 +350,6 @@ _symtable symtablemodule.c
350 350 # The library to link fpectl with is platform specific.
351 351 # Choose *one* of the options below for fpectl:
352 352
353 -# For SGI IRIX (tested on 5.3):
354 -#fpectl fpectlmodule.c -lfpe
355 -
356 353 # For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2):
357 354 # (Without the compiler you don't have -lsunmath.)
358 355 #fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm
Original file line number Diff line number Diff line change
@@ -111,29 +111,8 @@ static void fpe_reset(Sigfunc *handler)
111 111 * handler for SIGFPE to the given handler.
112 112 */
113 113
114 -/*-- IRIX -----------------------------------------------------------------*/
115 -#if defined(sgi)
116 -/* See man page on handle_sigfpes -- must link with -lfpe
117 - * My usage doesn't follow the man page exactly. Maybe somebody
118 - * else can explain handle_sigfpes to me....
119 - * cc -c -I/usr/local/python/include fpectlmodule.c
120 - * ld -shared -o fpectlmodule.so fpectlmodule.o -lfpe
121 - */
122 -#include <sigfpe.h>
123 -typedef void user_routine (unsigned[5], int[2]);
124 -typedef void abort_routine (unsigned long);
125 -handle_sigfpes(_OFF, 0,
126 - (user_routine *)0,
127 -_TURN_OFF_HANDLER_ON_ERROR,
128 -NULL);
129 -handle_sigfpes(_ON, _EN_OVERFL | _EN_DIVZERO _EN_INVALID,
130 - (user_routine *)0,
131 -_ABORT_ON_ERROR,
132 -NULL);
133 -PyOS_setsig(SIGFPE, handler);
134 -
135 114 /*-- SunOS and Solaris ----------------------------------------------------*/
136 -#elif defined(sun)
115 +#if defined(sun)
137 116 /* References: ieee_handler, ieee_sun, ieee_functions, and ieee_flags
138 117 man pages (SunOS or Solaris)
139 118 cc -c -I/usr/local/python/include fpectlmodule.c
Original file line number Diff line number Diff line change
@@ -268,10 +268,8 @@ if_indextoname(index) -- return the corresponding interface name\n\
268 268 #include <netdb.h>
269 269 #endif
270 270
271 -/* Irix 6.5 fails to define this variable at all. This is needed
272 - for both GCC and SGI's compiler. I'd say that the SGI headers
273 - are just busted. Same thing for Solaris. */
274 -#if (defined(__sgi) |
271 +/* Solaris fails to define this variable at all. */
272 +#if defined(sun) && !defined(INET_ADDRSTRLEN)
275 273 #define INET_ADDRSTRLEN 16
276 274 #endif
277 275
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
2 2
3 3 # objgraph
4 4 #
5 -# Read "nm -o" input (on IRIX: "nm -Bo") of a set of libraries or modules
6 -# and print various interesting listings, such as:
5 +# Read "nm -o" input of a set of libraries or modules and print various
6 +# interesting listings, such as:
7 7 #
8 8 # - which names are used but not defined in the set (and used where),
9 9 # - which names are defined in the set (and where),
@@ -15,7 +15,7 @@
15 15 # -d: print callees per objectfile
16 16 # -u: print usage of undefined symbols
17 17 # If none of -cdu is specified, all are assumed.
18 -# Use "nm -o" to generate the input (on IRIX: "nm -Bo"),
18 +# Use "nm -o" to generate the input
19 19 # e.g.: nm -o /lib/libc.a | objgraph
20 20
21 21
@@ -161,7 +161,7 @@ def main():
161 161 print('-d: print callees per objectfile')
162 162 print('-u: print usage of undefined symbols')
163 163 print('If none of -cdu is specified, all are assumed.')
164 -print('Use "nm -o" to generate the input (on IRIX: "nm -Bo"),')
164 +print('Use "nm -o" to generate the input')
165 165 print('e.g.: nm -o /lib/libc.a | objgraph')
166 166 return 1
167 167 optu = optc = optd = 0
Original file line number Diff line number Diff line change
@@ -2993,12 +2993,6 @@ $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
2993 2993 $as_echo "#define __BSD_VISIBLE 1" >>confdefs.h
2994 2994
2995 2995
2996 -# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
2997 -# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
2998 -
2999 -$as_echo "#define _BSD_TYPES 1" >>confdefs.h
3000 -
3001 -
3002 2996 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
3003 2997 # certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
3004 2998 # them.
@@ -3298,7 +3292,6 @@ then
3298 3292 linux*) MACHDEP="linux";;
3299 3293 cygwin*) MACHDEP="cygwin";;
3300 3294 darwin*) MACHDEP="darwin";;
3301 - irix646) MACHDEP="irix6";;
3302 3295 '') MACHDEP="unknown";;
3303 3296 esac
3304 3297 fi
@@ -9136,7 +9129,7 @@ fi
9136 9129 asecho"as_echo "asecho"SHLIB_SUFFIX" >&6; }
9137 9130
9138 9131 # LDSHARED is the ld *command* used to create shared library
9139 -# -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
9132 +# -- "cc -G" on SunOS 5.x.
9140 9133 # (Shared libraries in this instance are shared modules to be loaded into
9141 9134 # Python, as opposed to building Python itself as a shared library.)
9142 9135 { asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: checking LDSHARED" >&5
@@ -9148,8 +9141,6 @@ then
9148 9141 BLDSHARED="Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
9149 9142 LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
9150 9143 ;;
9151 - IRIX/5*) LDSHARED="ld -shared";;
9152 - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
9153 9144 SunOS/5*)
9154 9145 if test "$GCC" = "yes" ; then
9155 9146 LDSHARED='$(CC) -shared'
@@ -9309,10 +9300,6 @@ then
9309 9300 then CCSHARED="-fPIC"
9310 9301 else CCSHARED="-Kpic -belf"
9311 9302 fi;;
9312 - IRIX*/6*) case $CC in
9313 -*gcc*) CCSHARED="-shared";;
9314 -*) CCSHARED="";;
9315 -esac;;
9316 9303 esac
9317 9304 fi
9318 9305 { asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: result: $CCSHARED" >&5
Original file line number Diff line number Diff line change
@@ -133,10 +133,6 @@ AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features]
133 133 # them.
134 134 AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
135 135
136 -# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
137 -# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
138 -AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
139 -
140 136 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
141 137 # certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
142 138 # them.
@@ -406,7 +402,6 @@ then
406 402 linux*) MACHDEP="linux";;
407 403 cygwin*) MACHDEP="cygwin";;
408 404 darwin*) MACHDEP="darwin";;
409 - irix646) MACHDEP="irix6";;
410 405 '') MACHDEP="unknown";;
411 406 esac
412 407 fi
@@ -2402,7 +2397,7 @@ fi
2402 2397 AC_MSG_RESULT($SHLIB_SUFFIX)
2403 2398
2404 2399 # LDSHARED is the ld *command* used to create shared library
2405 -# -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
2400 +# -- "cc -G" on SunOS 5.x.
2406 2401 # (Shared libraries in this instance are shared modules to be loaded into
2407 2402 # Python, as opposed to building Python itself as a shared library.)
2408 2403 AC_MSG_CHECKING(LDSHARED)
@@ -2413,8 +2408,6 @@ then
2413 2408 BLDSHARED="Modules/ld_so_aix \$(CC) -bI:Modules/python.exp"
2414 2409 LDSHARED="\$(LIBPL)/ld_so_aix \$(CC) -bI:\$(LIBPL)/python.exp"
2415 2410 ;;
2416 - IRIX/5*) LDSHARED="ld -shared";;
2417 - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
2418 2411 SunOS/5*)
2419 2412 if test "$GCC" = "yes" ; then
2420 2413 LDSHARED='$(CC) -shared'
@@ -2572,10 +2565,6 @@ then
2572 2565 then CCSHARED="-fPIC"
2573 2566 else CCSHARED="-Kpic -belf"
2574 2567 fi;;
2575 - IRIX*/6*) case $CC in
2576 - *gcc*) CCSHARED="-shared";;
2577 - *) CCSHARED="";;
2578 - esac;;
2579 2568 esac
2580 2569 fi
2581 2570 AC_MSG_RESULT($CCSHARED)
Original file line number Diff line number Diff line change
@@ -1415,9 +1415,6 @@
1415 1415 /* Define on OpenBSD to activate all library features */
1416 1416 #undef _BSD_SOURCE
1417 1417
1418 -/* Define on Irix to enable u_int */
1419 -#undef _BSD_TYPES
1420 -
1421 1418 /* Define on Darwin to activate all library features */
1422 1419 #undef _DARWIN_C_SOURCE
1423 1420