diff --git a/Include/internal/pycore_fileutils.h b/Include/internal/pycore_fileutils.h index a5fe5206477d05..60204a69dd093c 100644 --- a/Include/internal/pycore_fileutils.h +++ b/Include/internal/pycore_fileutils.h @@ -281,7 +281,7 @@ extern void _Py_skiproot(const wchar_t *path, Py_ssize_t size, Py_ssize_t *drvsi // _Py_BEGIN_SUPPRESS_IPH // ... // _Py_END_SUPPRESS_IPH -#if defined _MSC_VER && _MSC_VER >= 1900 +#if defined _MSC_VER # include // _set_thread_local_invalid_parameter_handler() @@ -294,7 +294,7 @@ extern void _Py_skiproot(const wchar_t *path, Py_ssize_t size, Py_ssize_t *drvsi #else # define _Py_BEGIN_SUPPRESS_IPH # define _Py_END_SUPPRESS_IPH -#endif /* _MSC_VER >= 1900 */ +#endif /* _MSC_VER */ // Export for 'select' shared extension (Argument Clinic code) PyAPI_FUNC(int) _PyLong_FileDescriptor_Converter(PyObject *, void *); diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index 9d63ddf8a716f4..f87def69814dfd 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -21,7 +21,6 @@ #undef DOUBLE_IS_BIG_ENDIAN_IEEE754 #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 #undef HAVE_GCC_ASM_FOR_X87 -#undef HAVE_GCC_ASM_FOR_X64 #undef VA_LIST_IS_ARRAY #if defined(__LP64__) && defined(__x86_64__) @@ -79,7 +78,6 @@ #if defined(__i386__) || defined(__x86_64__) # define HAVE_GCC_ASM_FOR_X87 # define ALIGNOF_MAX_ALIGN_T 16 -# define HAVE_GCC_ASM_FOR_X64 1 # define SIZEOF_LONG_DOUBLE 16 #else # define ALIGNOF_MAX_ALIGN_T 8 diff --git a/Include/pyport.h b/Include/pyport.h index 1af2b61eeacd28..8d95b1ac0f3b9d 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -637,10 +637,6 @@ extern "C" { # endif #endif -#if defined(__sgi) && !defined(_SGI_MP_SOURCE) -# define _SGI_MP_SOURCE -#endif - // Explicit fallthrough in switch case to avoid warnings // with compiler flag -Wimplicit-fallthrough. // diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 401b777be23caa..00307924f7df96 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -107,7 +107,7 @@ static const char PyCursesVersion[] = "2.2"; #define CURSES_MODULE #include "py_curses.h" -#if defined(HAVE_TERM_H) || defined(__sgi) +#ifdef HAVE_TERM_H /* For termname, longname, putp, tigetflag, tigetnum, tigetstr, tparm which are not declared in SysV curses and for setupterm. */ #include @@ -120,7 +120,7 @@ static const char PyCursesVersion[] = "2.2"; #include #endif -#if !defined(NCURSES_VERSION) && (defined(sgi) || defined(__sun) || defined(SCO5)) +#if !defined(NCURSES_VERSION) && (defined(__sun) || defined(SCO5)) #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ typedef chtype attr_t; /* No attr_t type is available */ #endif diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index dfc5409cf18f2d..b45b80f9dc3deb 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -310,13 +310,6 @@ #endif -#if !defined(_MSC_VER) && defined(__sgi) && _COMPILER_VERSION>=700 -/* declare ctermid_r if compiling with MIPSPro 7.x in ANSI C mode - (default) */ -extern char *ctermid_r(char *); -#endif - - #if defined(__VXWORKS__) # include # include diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index b9fb7762e3dacd..63ccd1d0f6cbd0 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -54,11 +54,6 @@ #include #endif -#ifdef __sgi -/* This is missing from unistd.h */ -extern void bzero(void *, int); -#endif - #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 5fec77a2b82bf7..899d23efc87c11 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -190,7 +190,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\ #ifdef HAVE_GETHOSTBYNAME_R # if defined(_AIX) && !defined(_LINUX_SOURCE_COMPAT) # define HAVE_GETHOSTBYNAME_R_3_ARG -# elif defined(__sun) || defined(__sgi) +# elif defined(__sun) # define HAVE_GETHOSTBYNAME_R_5_ARG # elif defined(__linux__) /* Rely on the configure script */ @@ -216,29 +216,6 @@ shutdown(how) -- shut down traffic in one or both directions\n\ # include #endif -#if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI -/* make sure that the reentrant (gethostbyaddr_r etc) - functions are declared correctly if compiling with - MIPSPro 7.x in ANSI C mode (default) */ - -/* XXX Using _SGIAPI is the wrong thing, - but I don't know what the right thing is. */ -#undef _SGIAPI /* to avoid warning */ -#define _SGIAPI 1 - -#undef _XOPEN_SOURCE -#include -#include -#include -#ifdef _SS_ALIGNSIZE -#define HAVE_GETADDRINFO 1 -#define HAVE_GETNAMEINFO 1 -#endif - -#define HAVE_INET_PTON -#include -#endif // __sgi - /* Solaris fails to define this variable at all. */ #if (defined(__sun) && defined(__SVR4)) && !defined(INET_ADDRSTRLEN) #define INET_ADDRSTRLEN 16 @@ -418,13 +395,8 @@ remove_unusable_flags(PyObject *m) #endif /* include Python's addrinfo.h unless it causes trouble */ -#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE) - /* Do not include addinfo.h on some newer IRIX versions. - * _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21, - * for example, but not by 6.5.10. - */ -#elif defined(_MSC_VER) && _MSC_VER>1201 - /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and +#if defined(_MSC_VER) + /* Do not include addrinfo.h for MSVC. 'addrinfo' and * EAI_* constants are defined in (the already included) ws2tcpip.h. */ #else diff --git a/Modules/termios.c b/Modules/termios.c index 38743e176f0bf6..cad8b67ddc7fee 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -21,12 +21,6 @@ # include #endif -// Apparently, on SGI, termios.h won't define CTRL if _XOPEN_SOURCE -// is defined, so we define it here. -#if defined(__sgi) -# define CTRL(c) ((c)&037) -#endif - // We could do better. Check bpo-32660 #if defined(__sun) # include diff --git a/Modules/timemodule.c b/Modules/timemodule.c index e5162fd3b67855..b9c1ee340a1400 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -854,14 +854,14 @@ time_strftime1(time_char **outbuf, size_t *bufsize, return NULL; } *outbuf = tmp; -#if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) +#if defined _MSC_VER && defined(__STDC_SECURE_LIB__) errno = 0; #endif _Py_BEGIN_SUPPRESS_IPH buflen = format_time(*outbuf, *bufsize, format, tm); _Py_END_SUPPRESS_IPH -#if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__) - /* VisualStudio .NET 2005 does this properly */ +#if defined _MSC_VER && defined(__STDC_SECURE_LIB__) + /* The secure CRT reports invalid format strings with EINVAL. */ if (buflen == 0 && errno == EINVAL) { PyErr_SetString(PyExc_ValueError, "Invalid format string"); return NULL; diff --git a/PC/invalid_parameter_handler.c b/PC/invalid_parameter_handler.c index d634710cbec714..09d26b94de0bc1 100644 --- a/PC/invalid_parameter_handler.c +++ b/PC/invalid_parameter_handler.c @@ -2,10 +2,8 @@ #include -#if _MSC_VER >= 1900 -/* pyconfig.h uses this function in the _Py_BEGIN/END_SUPPRESS_IPH - * macros. It does not need to be defined when building using MSVC - * earlier than 14.0 (_MSC_VER == 1900). +/* pycore_fileutils.h uses this function in the _Py_BEGIN/END_SUPPRESS_IPH + * macros. */ static void __cdecl _silent_invalid_parameter_handler( @@ -18,5 +16,3 @@ static void __cdecl _silent_invalid_parameter_handler( _invalid_parameter_handler _Py_silent_invalid_parameter_handler = _silent_invalid_parameter_handler; #endif - -#endif diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 5b1df0fc146c39..4216847e2eaec4 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -50,9 +50,7 @@ WIN32 is still required for the locale module. #define HAVE_IO_H #define HAVE_SYS_UTIME_H -#define HAVE_TEMPNAM #define HAVE_TMPFILE -#define HAVE_TMPNAM #define HAVE_CLOCK #define HAVE_STRERROR @@ -254,11 +252,7 @@ typedef _W64 int Py_ssize_t; typedef int pid_t; -/* define some ANSI types that are not defined in earlier Win headers */ -#if _MSC_VER >= 1200 -/* This file only exists in VC 6.0 or higher */ #include -#endif #endif /* _MSC_VER */ @@ -385,8 +379,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # define SIZEOF_HKEY 4 # define SIZEOF_SIZE_T 4 # define ALIGNOF_SIZE_T 4 - /* MS VS2005 changes time_t to a 64-bit type on all platforms */ -# if defined(_MSC_VER) && _MSC_VER >= 1400 +# if defined(_MSC_VER) # define SIZEOF_TIME_T 8 # else # define SIZEOF_TIME_T 4 @@ -404,18 +397,9 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ #define SIZEOF_DOUBLE 8 #define SIZEOF_FLOAT 4 -/* VC 7.1 has them and VC 6.0 does not. VC 6.0 has a version number of 1200. - Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't - define these. - If some compiler does not provide them, modify the #if appropriately. */ #if defined(_MSC_VER) -#if _MSC_VER > 1300 #define HAVE_UINTPTR_T 1 #define HAVE_INTPTR_T 1 -#else -/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */ -#define Py_LL(x) x##I64 -#endif /* _MSC_VER > 1300 */ #endif /* _MSC_VER */ #endif @@ -522,9 +506,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define if you have the putenv function. */ #define HAVE_PUTENV -/* Define if your compiler supports function prototypes */ -#define HAVE_PROTOTYPES - /* Define if you can safely include both and (which you can't on SCO ODT 3.0). */ /* #undef SYS_SELECT_WITH_SYS_TIME */ @@ -554,9 +535,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define when any dynamic module loading is enabled */ #define HAVE_DYNAMIC_LOADING -/* Define if you have ftime. */ -#define HAVE_FTIME - /* Define if you have getpeername. */ #define HAVE_GETPEERNAME @@ -569,9 +547,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define if you have gettimeofday. */ /* #undef HAVE_GETTIMEOFDAY */ -/* Define if you have getwd. */ -/* #undef HAVE_GETWD */ - /* Define if you have lstat. */ /* #undef HAVE_LSTAT */ @@ -624,7 +599,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* #undef HAVE_WAITPID */ /* Define to 1 if you have the `wcsftime' function. */ -#if defined(_MSC_VER) && _MSC_VER >= 1310 +#if defined(_MSC_VER) #define HAVE_WCSFTIME 1 #endif @@ -655,9 +630,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ /* Define if you have the header file. */ #define HAVE_STDDEF_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_SYS_AUDIOIO_H */ - /* Define if you have the header file. */ /* #define HAVE_SYS_PARAM_H 1 */ diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index f7f7c922920085..4a1f9898675a2c 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -11,15 +11,6 @@ #include #include -#if defined(__NetBSD__) -#include -#if (NetBSD < 199712) -#include -#include -#define dlerror() "error in dynamic linking" -#endif -#endif /* NetBSD */ - #ifdef HAVE_DLFCN_H #include #endif diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c index fcd3e27f17f4e9..06802dffdc5410 100644 --- a/Python/mystrtoul.c +++ b/Python/mystrtoul.c @@ -8,10 +8,6 @@ #include "Python.h" #include "pycore_long.h" // _PyLong_DigitValue -#if defined(__sgi) && !defined(_SGI_MP_SOURCE) -# define _SGI_MP_SOURCE -#endif - /* strtol and strtoul, renamed to avoid conflicts */ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index ba1b94c47984ab..33432e0b6f9ead 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -3991,8 +3991,8 @@ PyOS_getsig(int sig) return context.sa_handler; #else PyOS_sighandler_t handler; -/* Special signal handling for the secure CRT in Visual Studio 2005 */ -#if defined(_MSC_VER) && _MSC_VER >= 1400 +/* Special signal handling for the secure CRT */ +#if defined(_MSC_VER) switch (sig) { /* Only these signals are valid */ case SIGINT: @@ -4007,7 +4007,7 @@ PyOS_getsig(int sig) default: return SIG_ERR; } -#endif /* _MSC_VER && _MSC_VER >= 1400 */ +#endif /* _MSC_VER */ handler = signal(sig, SIG_IGN); if (handler != SIG_ERR) signal(sig, handler); diff --git a/Tools/build/check_capi_macros_ignored.txt b/Tools/build/check_capi_macros_ignored.txt index 877c8d72e72827..03da2dff74bfe3 100644 --- a/Tools/build/check_capi_macros_ignored.txt +++ b/Tools/build/check_capi_macros_ignored.txt @@ -217,21 +217,17 @@ HAVE_FORK HAVE_FORK1 HAVE_FORKPTY HAVE_FPATHCONF -HAVE_FSEEK64 HAVE_FSEEKO HAVE_FSTATAT HAVE_FSTATVFS HAVE_FSYNC -HAVE_FTELL64 HAVE_FTELLO -HAVE_FTIME HAVE_FTRUNCATE HAVE_FUTIMENS HAVE_FUTIMES HAVE_FUTIMESAT HAVE_GAI_STRERROR HAVE_GCC_ASM_FOR_MC68881 -HAVE_GCC_ASM_FOR_X64 HAVE_GCC_ASM_FOR_X87 HAVE_GCC_UINT128_T HAVE_GDBM_DASH_NDBM_H @@ -283,12 +279,8 @@ HAVE_GETSERVBYNAME HAVE_GETSERVBYPORT HAVE_GETSID HAVE_GETSOCKNAME -HAVE_GETSPENT -HAVE_GETSPNAM HAVE_GETTID HAVE_GETUID -HAVE_GETWD -HAVE_GLIBC_MEMMOVE_BUG HAVE_GRANTPT HAVE_GRP_H HAVE_HSTRERROR @@ -303,7 +295,6 @@ HAVE_INET_PTON HAVE_INITGROUPS HAVE_INTTYPES_H HAVE_IO_H -HAVE_IPA_PURE_CONST_BUG HAVE_KILL HAVE_KILLPG HAVE_KQUEUE @@ -339,7 +330,6 @@ HAVE_LINUX_NETLINK_H HAVE_LINUX_QRTR_H HAVE_LINUX_RANDOM_H HAVE_LINUX_SCHED_H -HAVE_LINUX_SOUNDCARD_H HAVE_LINUX_TIPC_H HAVE_LINUX_VM_SOCKETS_H HAVE_LINUX_WAIT_H @@ -418,7 +408,6 @@ HAVE_PREADV2 HAVE_PRLIMIT HAVE_PROCESS_H HAVE_PROCESS_VM_READV -HAVE_PROTOTYPES HAVE_PTHREAD_CONDATTR_SETCLOCK HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP HAVE_PTHREAD_DESTRUCTOR @@ -490,7 +479,6 @@ HAVE_SETSID HAVE_SETSOCKOPT HAVE_SETUID HAVE_SETVBUF -HAVE_SHADOW_H HAVE_SHM_OPEN HAVE_SHM_UNLINK HAVE_SHUTDOWN @@ -501,7 +489,6 @@ HAVE_SIGINFO_T_SI_BAND HAVE_SIGINTERRUPT HAVE_SIGNAL_H HAVE_SIGPENDING -HAVE_SIGRELSE HAVE_SIGTIMEDWAIT HAVE_SIGWAIT HAVE_SIGWAITINFO @@ -552,7 +539,6 @@ HAVE_SYSCTLBYNAME HAVE_SYSEXITS_H HAVE_SYSLOG_H HAVE_SYSTEM -HAVE_SYS_AUDIOIO_H HAVE_SYS_AUXV_H HAVE_SYS_BSDTTY_H HAVE_SYS_DEVPOLL_H @@ -579,7 +565,6 @@ HAVE_SYS_RESOURCE_H HAVE_SYS_SELECT_H HAVE_SYS_SENDFILE_H HAVE_SYS_SOCKET_H -HAVE_SYS_SOUNDCARD_H HAVE_SYS_STATVFS_H HAVE_SYS_STAT_H HAVE_SYS_SYSCALL_H @@ -598,7 +583,6 @@ HAVE_SYS_WAIT_H HAVE_SYS_XATTR_H HAVE_TCGETPGRP HAVE_TCSETPGRP -HAVE_TEMPNAM HAVE_TERMIOS_H HAVE_TERM_H HAVE_THREAD_LOCAL @@ -606,8 +590,6 @@ HAVE_TIMEGM HAVE_TIMERFD_CREATE HAVE_TIMES HAVE_TMPFILE -HAVE_TMPNAM -HAVE_TMPNAM_R HAVE_TM_ZONE HAVE_TRUNCATE HAVE_TTYNAME_R @@ -762,7 +744,6 @@ _POSIX_PTHREAD_SEMANTICS _POSIX_SOURCE _POSIX_THREADS _REENTRANT -_SGI_MP_SOURCE _TANDEM_SOURCE _WASI_EMULATED_GETPID _WASI_EMULATED_PROCESS_CLOCKS @@ -791,13 +772,11 @@ __bool__ __wchar_t __wint_t clock_t -const gid_t import_curses mode_t off_t pid_t -signed size_t socklen_t static_assert diff --git a/configure b/configure index 217d8e135600e1..dbbb112cf0bdae 100755 --- a/configure +++ b/configure @@ -4720,20 +4720,6 @@ fi # wildcard, and that the wildcard does not include future systems # (which may remove their limitations). case $ac_sys_system/$ac_sys_release in - # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, - # even though select is a POSIX function. Reported by J. Ribbens. - # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. - # In addition, Stefan Krah confirms that issue #1244610 exists through - # OpenBSD 4.6, but is fixed in 4.7. - OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.[0123456]) - define_xopen_source=no - # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is - # also defined. This can be overridden by defining _BSD_SOURCE - # As this has a different meaning on Linux, only define it on OpenBSD - -printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h - - ;; OpenBSD/*) # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE @@ -4742,11 +4728,6 @@ printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h ;; - # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of - # _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by - # Marc Recht - NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6[A-S]) - define_xopen_source=no;; # On Solaris, _XOPEN_SOURCE=800 hides platform specific features. # A lower level is defined below. SunOS/*) @@ -12007,12 +11988,6 @@ if test "x$ac_cv_header_linux_random_h" = xyes then : printf "%s\n" "#define HAVE_LINUX_RANDOM_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_soundcard_h" = xyes -then : - printf "%s\n" "#define HAVE_LINUX_SOUNDCARD_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "linux/sched.h" "ac_cv_header_linux_sched_h" "$ac_includes_default" if test "x$ac_cv_header_linux_sched_h" = xyes @@ -12091,12 +12066,6 @@ if test "x$ac_cv_header_setjmp_h" = xyes then : printf "%s\n" "#define HAVE_SETJMP_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default" -if test "x$ac_cv_header_shadow_h" = xyes -then : - printf "%s\n" "#define HAVE_SHADOW_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" if test "x$ac_cv_header_signal_h" = xyes @@ -12109,12 +12078,6 @@ if test "x$ac_cv_header_spawn_h" = xyes then : printf "%s\n" "#define HAVE_SPAWN_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_audioio_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_AUDIOIO_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/bsdtty.h" "ac_cv_header_sys_bsdtty_h" "$ac_includes_default" if test "x$ac_cv_header_sys_bsdtty_h" = xyes @@ -12253,12 +12216,6 @@ if test "x$ac_cv_header_sys_socket_h" = xyes then : printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_soundcard_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SOUNDCARD_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default" if test "x$ac_cv_header_sys_stat_h" = xyes @@ -20665,12 +20622,6 @@ if test "x$ac_cv_func_fstatat" = xyes then : printf "%s\n" "#define HAVE_FSTATAT 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime" -if test "x$ac_cv_func_ftime" = xyes -then : - printf "%s\n" "#define HAVE_FTIME 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" if test "x$ac_cv_func_ftruncate" = xyes @@ -20869,18 +20820,6 @@ if test "x$ac_cv_func_getsid" = xyes then : printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "getspent" "ac_cv_func_getspent" -if test "x$ac_cv_func_getspent" = xyes -then : - printf "%s\n" "#define HAVE_GETSPENT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam" -if test "x$ac_cv_func_getspnam" = xyes -then : - printf "%s\n" "#define HAVE_GETSPNAM 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "gettid" "ac_cv_func_gettid" if test "x$ac_cv_func_gettid" = xyes @@ -20893,12 +20832,6 @@ if test "x$ac_cv_func_getuid" = xyes then : printf "%s\n" "#define HAVE_GETUID 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd" -if test "x$ac_cv_func_getwd" = xyes -then : - printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt" if test "x$ac_cv_func_grantpt" = xyes @@ -21487,12 +21420,6 @@ if test "x$ac_cv_func_sigpending" = xyes then : printf "%s\n" "#define HAVE_SIGPENDING 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "sigrelse" "ac_cv_func_sigrelse" -if test "x$ac_cv_func_sigrelse" = xyes -then : - printf "%s\n" "#define HAVE_SIGRELSE 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait" if test "x$ac_cv_func_sigtimedwait" = xyes @@ -21577,12 +21504,6 @@ if test "x$ac_cv_func_tcsetpgrp" = xyes then : printf "%s\n" "#define HAVE_TCSETPGRP 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "tempnam" "ac_cv_func_tempnam" -if test "x$ac_cv_func_tempnam" = xyes -then : - printf "%s\n" "#define HAVE_TEMPNAM 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm" if test "x$ac_cv_func_timegm" = xyes @@ -21601,18 +21522,6 @@ if test "x$ac_cv_func_tmpfile" = xyes then : printf "%s\n" "#define HAVE_TMPFILE 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "tmpnam" "ac_cv_func_tmpnam" -if test "x$ac_cv_func_tmpnam" = xyes -then : - printf "%s\n" "#define HAVE_TMPNAM 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "tmpnam_r" "ac_cv_func_tmpnam_r" -if test "x$ac_cv_func_tmpnam_r" = xyes -then : - printf "%s\n" "#define HAVE_TMPNAM_R 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "truncate" "ac_cv_func_truncate" if test "x$ac_cv_func_truncate" = xyes @@ -25828,12 +25737,6 @@ fi done # check for long file support functions -ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64" -if test "x$ac_cv_func_fseek64" = xyes -then : - printf "%s\n" "#define HAVE_FSEEK64 1" >>confdefs.h - -fi ac_fn_c_check_func "$LINENO" "fseeko" "ac_cv_func_fseeko" if test "x$ac_cv_func_fseeko" = xyes then : @@ -25845,12 +25748,6 @@ if test "x$ac_cv_func_fstatvfs" = xyes then : printf "%s\n" "#define HAVE_FSTATVFS 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "ftell64" "ac_cv_func_ftell64" -if test "x$ac_cv_func_ftell64" = xyes -then : - printf "%s\n" "#define HAVE_FTELL64 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "ftello" "ac_cv_func_ftello" if test "x$ac_cv_func_ftello" = xyes @@ -26967,175 +26864,6 @@ printf "%s\n" "#define HAVE_SOCKADDR_ALG 1" >>confdefs.h fi -# checks for compiler characteristics - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -printf %s "checking for an ANSI C-conforming const... " >&6; } -if test ${ac_cv_c_const+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - -#ifndef __cplusplus - /* Ultrix mips cc rejects this sort of thing. */ - typedef int charset[2]; - const charset cs = { 0, 0 }; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* IBM XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this sort of thing. */ - char tx; - char *t = &tx; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; } bx; - struct s *b = &bx; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_c_const=yes -else case e in #( - e) ac_cv_c_const=no ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -printf "%s\n" "$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -printf "%s\n" "#define const /**/" >>confdefs.h - -fi - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working signed char" >&5 -printf %s "checking for working signed char... " >&6; } -if test ${ac_cv_working_signed_char_c+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -signed char c; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_working_signed_char_c=yes -else case e in #( - e) ac_cv_working_signed_char_c=no ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_signed_char_c" >&5 -printf "%s\n" "$ac_cv_working_signed_char_c" >&6; } -if test "x$ac_cv_working_signed_char_c" = xno -then : - - -printf "%s\n" "#define signed /**/" >>confdefs.h - - -fi - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prototypes" >&5 -printf %s "checking for prototypes... " >&6; } -if test ${ac_cv_function_prototypes+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo(int x) { return 0; } -int -main (void) -{ -return foo(10); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_function_prototypes=yes -else case e in #( - e) ac_cv_function_prototypes=no ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_function_prototypes" >&5 -printf "%s\n" "$ac_cv_function_prototypes" >&6; } -if test "x$ac_cv_function_prototypes" = xyes -then : - - -printf "%s\n" "#define HAVE_PROTOTYPES 1" >>confdefs.h - - -fi - - # check for socketpair @@ -27501,55 +27229,6 @@ esac fi -# ************************************** -# * Check for gcc x64 inline assembler * -# ************************************** - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x64 gcc inline assembler" >&5 -printf %s "checking for x64 gcc inline assembler... " >&6; } -if test ${ac_cv_gcc_asm_for_x64+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - __asm__ __volatile__ ("movq %rcx, %rax"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_gcc_asm_for_x64=yes -else case e in #( - e) ac_cv_gcc_asm_for_x64=no ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_asm_for_x64" >&5 -printf "%s\n" "$ac_cv_gcc_asm_for_x64" >&6; } - -if test "x$ac_cv_gcc_asm_for_x64" = xyes -then : - - -printf "%s\n" "#define HAVE_GCC_ASM_FOR_X64 1" >>confdefs.h - - -fi - # ************************************************** # * Check for various properties of floating point * # ************************************************** @@ -34578,95 +34257,6 @@ done { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 printf "%s\n" "done" >&6; } -# Availability of -O2: -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -O2" >&5 -printf %s "checking for -O2... " >&6; } -if test ${ac_cv_compile_o2+y} -then : - printf %s "(cached) " >&6 -else case e in #( - e) -saved_cflags="$CFLAGS" -CFLAGS="-O2" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_compile_o2=yes -else case e in #( - e) ac_cv_compile_o2=no ;; -esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -CFLAGS="$saved_cflags" - ;; -esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_compile_o2" >&5 -printf "%s\n" "$ac_cv_compile_o2" >&6; } - -# _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: -# http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glibc _FORTIFY_SOURCE/memmove bug" >&5 -printf %s "checking for glibc _FORTIFY_SOURCE/memmove bug... " >&6; } -saved_cflags="$CFLAGS" -CFLAGS="-O2 -D_FORTIFY_SOURCE=2" -if test "$ac_cv_compile_o2" = no; then - CFLAGS="" -fi -if test "$cross_compiling" = yes -then : - have_glibc_memmove_bug=undefined -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -void foo(void *p, void *q) { memmove(p, q, 19); } -int main(void) { - char a[32] = "123456789000000000"; - foo(&a[9], a); - if (strcmp(a, "123456789123456789000000000") != 0) - return 1; - foo(a, &a[9]); - if (strcmp(a, "123456789000000000") != 0) - return 1; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - have_glibc_memmove_bug=no -else case e in #( - e) have_glibc_memmove_bug=yes ;; -esac -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi - -CFLAGS="$saved_cflags" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_glibc_memmove_bug" >&5 -printf "%s\n" "$have_glibc_memmove_bug" >&6; } -if test "$have_glibc_memmove_bug" = yes; then - -printf "%s\n" "#define HAVE_GLIBC_MEMMOVE_BUG 1" >>confdefs.h - -fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we need to manually block large inlining in ceval.c" >&5 printf %s "checking if we need to manually block large inlining in ceval.c... " >&6; } if test "$cross_compiling" = yes @@ -34713,64 +34303,6 @@ if test "$block_huge_inlining_in_ceval" = yes && test "$ac_cv_computed_gotos" = fi -if test "$ac_cv_gcc_asm_for_x87" = yes; then - # Some versions of gcc miscompile inline asm: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 - # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html - case $ac_cv_cc_name in - gcc) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcc ipa-pure-const bug" >&5 -printf %s "checking for gcc ipa-pure-const bug... " >&6; } - saved_cflags="$CFLAGS" - CFLAGS="-O2" - if test "$cross_compiling" = yes -then : - have_ipa_pure_const_bug=undefined -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - __attribute__((noinline)) int - foo(int *p) { - int r; - asm ( "movl \$6, (%1)\n\t" - "xorl %0, %0\n\t" - : "=r" (r) : "r" (p) : "memory" - ); - return r; - } - int main(void) { - int p = 8; - if ((foo(&p) ? : p) != 6) - return 1; - return 0; - } - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - have_ipa_pure_const_bug=no -else case e in #( - e) have_ipa_pure_const_bug=yes ;; -esac -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac -fi - - CFLAGS="$saved_cflags" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_ipa_pure_const_bug" >&5 -printf "%s\n" "$have_ipa_pure_const_bug" >&6; } - if test "$have_ipa_pure_const_bug" = yes; then - -printf "%s\n" "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h - - fi - ;; - esac -fi - # ensurepip option { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ensurepip" >&5 printf %s "checking for ensurepip... " >&6; } diff --git a/configure.ac b/configure.ac index ca804d6448810d..4b0e64b652a29d 100644 --- a/configure.ac +++ b/configure.ac @@ -844,19 +844,6 @@ fi # (which may remove their limitations). dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output case $ac_sys_system/$ac_sys_release in - # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, - # even though select is a POSIX function. Reported by J. Ribbens. - # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. - # In addition, Stefan Krah confirms that issue #1244610 exists through - # OpenBSD 4.6, but is fixed in 4.7. - OpenBSD/2.* | OpenBSD/3.* | OpenBSD/4.@<:@0123456@:>@) - define_xopen_source=no - # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is - # also defined. This can be overridden by defining _BSD_SOURCE - # As this has a different meaning on Linux, only define it on OpenBSD - AC_DEFINE([_BSD_SOURCE], [1], - [Define on OpenBSD to activate all library features]) - ;; OpenBSD/*) # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is # also defined. This can be overridden by defining _BSD_SOURCE @@ -864,11 +851,6 @@ case $ac_sys_system/$ac_sys_release in AC_DEFINE([_BSD_SOURCE], [1], [Define on OpenBSD to activate all library features]) ;; - # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of - # _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by - # Marc Recht - NetBSD/1.5 | NetBSD/1.5.* | NetBSD/1.6 | NetBSD/1.6.* | NetBSD/1.6@<:@A-S@:>@) - define_xopen_source=no;; # On Solaris, _XOPEN_SOURCE=800 hides platform specific features. # A lower level is defined below. SunOS/*) @@ -3194,12 +3176,12 @@ AC_DEFINE([STDC_HEADERS], [1], AC_CHECK_HEADERS([ \ alloca.h asm/types.h bluetooth.h conio.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \ io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/fs.h linux/limits.h linux/memfd.h \ - linux/netfilter_ipv4.h linux/random.h linux/soundcard.h linux/sched.h \ + linux/netfilter_ipv4.h linux/random.h linux/sched.h \ linux/tipc.h linux/wait.h netdb.h net/ethernet.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \ - sched.h setjmp.h shadow.h signal.h spawn.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \ + sched.h setjmp.h signal.h spawn.h sys/bsdtty.h sys/devpoll.h \ sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \ sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/pidfd.h sys/poll.h \ - sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/soundcard.h sys/stat.h \ + sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/stat.h \ sys/statvfs.h sys/sys_domain.h sys/syscall.h sys/sysctl.h \ sys/sysmacros.h sys/termio.h sys/time.h sys/times.h sys/timerfd.h \ sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h sys/xattr.h sysexits.h syslog.h \ @@ -5555,12 +5537,12 @@ AC_CHECK_FUNCS([ \ clock closefrom close_range confstr \ copy_file_range ctermid dladdr dup execv explicit_bzero explicit_memset \ faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \ - fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \ + fork fork1 fpathconf fstatat ftruncate futimens futimes futimesat \ gai_strerror getdents64 getegid geteuid getgid getgrent getgrgid getgrgid_r \ getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \ getpeername getpgid getpid getppid getpriority _getpty \ - getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid getspent \ - getspnam gettid getuid getwd grantpt if_indextoname if_nameindex \ + getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid \ + gettid getuid grantpt if_indextoname if_nameindex \ if_nametoindex initgroups kill killpg lchown linkat \ lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \ mknod mknodat mktime mmap mremap nice openat opendir pathconf pause \ @@ -5577,10 +5559,10 @@ AC_CHECK_FUNCS([ \ sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \ setitimer setlocale setpgid setpgrp setpriority setregid setresgid \ setresuid setreuid setsid setuid setvbuf shutdown sigaction sigaltstack \ - sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \ + sigfillset siginterrupt sigpending sigtimedwait sigwait \ sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \ - sysconf sysctlbyname tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \ - tmpnam tmpnam_r truncate ttyname_r umask uname unlinkat unlockpt utimensat utimes vfork \ + sysconf sysctlbyname tcgetpgrp tcsetpgrp timegm times tmpfile \ + truncate ttyname_r umask uname unlinkat unlockpt utimensat utimes vfork \ wait wait3 wait4 waitid waitpid wcscoll wcsftime wcsxfrm wmemcmp writev \ ]) @@ -6031,7 +6013,7 @@ AC_CHECK_FUNCS([forkpty], [], [AC_DEFINE([HAVE_FORKPTY]) LIBS="$LIBS -lbsd"])])]) # check for long file support functions -AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs]) +AC_CHECK_FUNCS([fseeko fstatvfs ftello statvfs]) AC_REPLACE_FUNCS([dup2]) AC_CHECK_FUNCS([getpgrp], @@ -6329,28 +6311,6 @@ if test $ac_cv_struct_sockaddr_alg = yes; then [struct sockaddr_alg (linux/if_alg.h)]) fi -# checks for compiler characteristics - -AC_C_CONST - -AC_CACHE_CHECK([for working signed char], [ac_cv_working_signed_char_c], [ -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char c;]])], - [ac_cv_working_signed_char_c=yes], [ac_cv_working_signed_char_c=no]) -]) -AS_VAR_IF([ac_cv_working_signed_char_c], [no], [ - AC_DEFINE([signed], [], [Define to empty if the keyword does not work.]) -]) - -AC_CACHE_CHECK([for prototypes], [ac_cv_function_prototypes], [ -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])], - [ac_cv_function_prototypes=yes], [ac_cv_function_prototypes=no]) -]) -AS_VAR_IF([ac_cv_function_prototypes], [yes], [ - AC_DEFINE([HAVE_PROTOTYPES], [1], - [Define if your compiler supports function prototype]) -]) - - # check for socketpair PY_CHECK_FUNC([socketpair], [ #include @@ -6489,22 +6449,6 @@ else AC_MSG_ERROR([proper usage is --with-libc=STRING]) fi], [AC_MSG_RESULT([default LIBC="$LIBC"])]) -# ************************************** -# * Check for gcc x64 inline assembler * -# ************************************** - - -AC_CACHE_CHECK([for x64 gcc inline assembler], [ac_cv_gcc_asm_for_x64], [ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - __asm__ __volatile__ ("movq %rcx, %rax"); -]])],[ac_cv_gcc_asm_for_x64=yes],[ac_cv_gcc_asm_for_x64=no]) -]) - -AS_VAR_IF([ac_cv_gcc_asm_for_x64], [yes], [ - AC_DEFINE([HAVE_GCC_ASM_FOR_X64], [1], - [Define if we can use x64 gcc inline assembler]) -]) - # ************************************************** # * Check for various properties of floating point * # ************************************************** @@ -7800,49 +7744,6 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT([done]) -# Availability of -O2: -AC_CACHE_CHECK([for -O2], [ac_cv_compile_o2], [ -saved_cflags="$CFLAGS" -CFLAGS="-O2" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [ac_cv_compile_o2=yes], [ac_cv_compile_o2=no]) -CFLAGS="$saved_cflags" -]) - -# _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: -# http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html -AC_MSG_CHECKING([for glibc _FORTIFY_SOURCE/memmove bug]) -saved_cflags="$CFLAGS" -CFLAGS="-O2 -D_FORTIFY_SOURCE=2" -if test "$ac_cv_compile_o2" = no; then - CFLAGS="" -fi -AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#include -#include -void foo(void *p, void *q) { memmove(p, q, 19); } -int main(void) { - char a[32] = "123456789000000000"; - foo(&a[9], a); - if (strcmp(a, "123456789123456789000000000") != 0) - return 1; - foo(a, &a[9]); - if (strcmp(a, "123456789000000000") != 0) - return 1; - return 0; -} -]])], -[have_glibc_memmove_bug=no], -[have_glibc_memmove_bug=yes], -[have_glibc_memmove_bug=undefined]) -CFLAGS="$saved_cflags" -AC_MSG_RESULT([$have_glibc_memmove_bug]) -if test "$have_glibc_memmove_bug" = yes; then - AC_DEFINE([HAVE_GLIBC_MEMMOVE_BUG], [1], - [Define if glibc has incorrect _FORTIFY_SOURCE wrappers - for memmove and bcopy.]) -fi - AC_MSG_CHECKING([if we need to manually block large inlining in ceval.c]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(void) { @@ -7871,45 +7772,6 @@ if test "$block_huge_inlining_in_ceval" = yes && test "$ac_cv_computed_gotos" = fi AC_SUBST([CFLAGS_CEVAL]) -if test "$ac_cv_gcc_asm_for_x87" = yes; then - # Some versions of gcc miscompile inline asm: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 - # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html - case $ac_cv_cc_name in - gcc) - AC_MSG_CHECKING([for gcc ipa-pure-const bug]) - saved_cflags="$CFLAGS" - CFLAGS="-O2" - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - __attribute__((noinline)) int - foo(int *p) { - int r; - asm ( "movl \$6, (%1)\n\t" - "xorl %0, %0\n\t" - : "=r" (r) : "r" (p) : "memory" - ); - return r; - } - int main(void) { - int p = 8; - if ((foo(&p) ? : p) != 6) - return 1; - return 0; - } - ]])], - [have_ipa_pure_const_bug=no], - [have_ipa_pure_const_bug=yes], - [have_ipa_pure_const_bug=undefined]) - CFLAGS="$saved_cflags" - AC_MSG_RESULT([$have_ipa_pure_const_bug]) - if test "$have_ipa_pure_const_bug" = yes; then - AC_DEFINE([HAVE_IPA_PURE_CONST_BUG], [1], - [Define if gcc has the ipa-pure-const bug.]) - fi - ;; - esac -fi - # ensurepip option AC_MSG_CHECKING([for ensurepip]) AC_ARG_WITH([ensurepip], diff --git a/pyconfig.h.in b/pyconfig.h.in index 65e235c8fd6c93..86866bddb378df 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -497,9 +497,6 @@ /* Define to 1 if you have the 'fpathconf' function. */ #undef HAVE_FPATHCONF -/* Define to 1 if you have the 'fseek64' function. */ -#undef HAVE_FSEEK64 - /* Define to 1 if you have the 'fseeko' function. */ #undef HAVE_FSEEKO @@ -512,15 +509,9 @@ /* Define if you have the 'fsync' function. */ #undef HAVE_FSYNC -/* Define to 1 if you have the 'ftell64' function. */ -#undef HAVE_FTELL64 - /* Define to 1 if you have the 'ftello' function. */ #undef HAVE_FTELLO -/* Define to 1 if you have the 'ftime' function. */ -#undef HAVE_FTIME - /* Define to 1 if you have the 'ftruncate' function. */ #undef HAVE_FTRUNCATE @@ -539,9 +530,6 @@ /* Define if we can use gcc inline assembler to get and set mc68881 fpcr */ #undef HAVE_GCC_ASM_FOR_MC68881 -/* Define if we can use x64 gcc inline assembler */ -#undef HAVE_GCC_ASM_FOR_X64 - /* Define if we can use gcc inline assembler to get and set x87 control word */ #undef HAVE_GCC_ASM_FOR_X87 @@ -696,25 +684,12 @@ /* Define if you have the 'getsockname' function. */ #undef HAVE_GETSOCKNAME -/* Define to 1 if you have the 'getspent' function. */ -#undef HAVE_GETSPENT - -/* Define to 1 if you have the 'getspnam' function. */ -#undef HAVE_GETSPNAM - /* Define to 1 if you have the 'gettid' function. */ #undef HAVE_GETTID /* Define to 1 if you have the 'getuid' function. */ #undef HAVE_GETUID -/* Define to 1 if you have the 'getwd' function. */ -#undef HAVE_GETWD - -/* Define if glibc has incorrect _FORTIFY_SOURCE wrappers for memmove and - bcopy. */ -#undef HAVE_GLIBC_MEMMOVE_BUG - /* Define to 1 if you have the 'grantpt' function. */ #undef HAVE_GRANTPT @@ -757,9 +732,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IO_H -/* Define if gcc has the ipa-pure-const bug. */ -#undef HAVE_IPA_PURE_CONST_BUG - /* Define to 1 if you have the 'kill' function. */ #undef HAVE_KILL @@ -868,9 +840,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_SCHED_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_SOUNDCARD_H - /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_TIPC_H @@ -1104,9 +1073,6 @@ /* Define to 1 if you have the 'process_vm_readv' function. */ #undef HAVE_PROCESS_VM_READV -/* Define if your compiler supports function prototype */ -#undef HAVE_PROTOTYPES - /* Define to 1 if you have the 'pthread_condattr_setclock' function. */ #undef HAVE_PTHREAD_CONDATTR_SETCLOCK @@ -1321,9 +1287,6 @@ /* Define to 1 if you have the 'setvbuf' function. */ #undef HAVE_SETVBUF -/* Define to 1 if you have the header file. */ -#undef HAVE_SHADOW_H - /* Define to 1 if you have the 'shm_open' function. */ #undef HAVE_SHM_OPEN @@ -1354,9 +1317,6 @@ /* Define to 1 if you have the 'sigpending' function. */ #undef HAVE_SIGPENDING -/* Define to 1 if you have the 'sigrelse' function. */ -#undef HAVE_SIGRELSE - /* Define to 1 if you have the 'sigtimedwait' function. */ #undef HAVE_SIGTIMEDWAIT @@ -1510,9 +1470,6 @@ /* Define to 1 if you have the 'system' function. */ #undef HAVE_SYSTEM -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_AUDIOIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_AUXV_H @@ -1593,9 +1550,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOUNDCARD_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STATVFS_H @@ -1650,9 +1604,6 @@ /* Define to 1 if you have the 'tcsetpgrp' function. */ #undef HAVE_TCSETPGRP -/* Define to 1 if you have the 'tempnam' function. */ -#undef HAVE_TEMPNAM - /* Define to 1 if you have the header file. */ #undef HAVE_TERMIOS_H @@ -1671,12 +1622,6 @@ /* Define to 1 if you have the 'tmpfile' function. */ #undef HAVE_TMPFILE -/* Define to 1 if you have the 'tmpnam' function. */ -#undef HAVE_TMPNAM - -/* Define to 1 if you have the 'tmpnam_r' function. */ -#undef HAVE_TMPNAM_R - /* Define to 1 if your 'struct tm' has 'tm_zone'. Deprecated, use 'HAVE_STRUCT_TM_TM_ZONE' instead. */ #undef HAVE_TM_ZONE @@ -2260,9 +2205,6 @@ /* Define to 'long' if does not define clock_t. */ #undef clock_t -/* Define to empty if 'const' does not conform to ANSI C. */ -#undef const - /* Define as 'int' if doesn't define. */ #undef gid_t @@ -2275,9 +2217,6 @@ /* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t -/* Define to empty if the keyword does not work. */ -#undef signed - /* Define as 'unsigned int' if doesn't define. */ #undef size_t