From dff32444ea09df8f4163fd18d746183de5211ba5 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 16 Jun 2017 15:09:03 -0600 Subject: [PATCH] rktio: remove migrated `configure` elements --- racket/src/configure | 179 -------------------------------- racket/src/racket/configure.ac | 105 ------------------- racket/src/racket/mzconfig.h.in | 9 -- 3 files changed, 293 deletions(-) diff --git a/racket/src/configure b/racket/src/configure index 7ce300dca2..c570e6ce54 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -4593,7 +4593,6 @@ case "$host_os" in LIBS="$LIBS -lsocket -lnsl -lintl" need_gcc_static_libgcc="yes" check_gcc_dash_e="yes" - try_poll_syscall="no" # poll() has performance problems on Solaris? use_flag_pthread="no" use_flag_posix_pthread="yes" ;; @@ -4605,26 +4604,21 @@ case "$host_os" in LIBS="$LIBS -rdynamic" DYN_CFLAGS="-fPIC" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; openbsd*) LIBS="$LIBS -Wl,--export-dynamic" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; bitrig*) LIBS="$LIBS -Wl,--export-dynamic" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; dragonfly*) LIBS="$LIBS -Wl,--export-dynamic" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; netbsd*) LIBS="$LIBS -rdynamic" - try_kqueue_syscall=yes ;; irix*) enable_cgcdefault="yes" @@ -4637,9 +4631,6 @@ case "$host_os" in linux*) LIBS="$LIBS -ldl -lm -rdynamic" DYN_CFLAGS="-fPIC" - try_poll_syscall=yes - try_epoll_syscall=yes - try_inotify_syscall=yes case "$host_cpu" in #Required for CentOS 4.6 x86_64) @@ -4825,12 +4816,6 @@ fi esac PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT" - try_kqueue_syscall=yes - - # Although select() generally works as well as poll() on OS X, - # getdtablesize() appears not to be constant within a process, - # and that breaks static allocation of fd_sets - try_poll_syscall=yes # -pthread is not needed and triggers a warning use_flag_pthread=no @@ -5193,34 +5178,6 @@ rm -f core conftest.err conftest.$ac_objext \ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_codeset" >&5 $as_echo "$have_codeset" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 -$as_echo_n "checking for getaddrinfo... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -int -main () -{ -getaddrinfo(0, 0, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h - - have_getaddrinfo=yes -else - have_getaddrinfo=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getaddrinfo" >&5 -$as_echo "$have_getaddrinfo" >&6; } - iconv_lib_flag="" if test "${skip_iconv_check}" = "no" ; then if test "${enable_iconv}" = "yes" ; then @@ -5589,142 +5546,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mbsrtowcs" >&5 $as_echo "$mbsrtowcs" >&6; } -if test "${try_poll_syscall}" = "yes" ; then - msg="for poll" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 -$as_echo_n "checking $msg... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - int main() { - struct pollfd pfd; - int r; - pfd.fd = 0; - pfd.events = POLLIN; - r = poll(&pfd, 1, 0); - return 0; - } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - use_poll=yes -else - use_poll=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_poll" >&5 -$as_echo "$use_poll" >&6; } - if test "${use_poll}" = "yes" ; then - -$as_echo "#define HAVE_POLL_SYSCALL 1" >>confdefs.h - - fi -fi - -if test "${try_epoll_syscall}" = "yes" ; then - msg="for epoll" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 -$as_echo_n "checking $msg... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - int main() { - int fd; - struct epoll_event ev; - fd = epoll_create(5); - ev.events = EPOLLIN | EPOLLONESHOT; - epoll_ctl(fd, EPOLL_CTL_ADD, 0, &ev); - return 0; - } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - use_epoll=yes -else - use_epoll=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_epoll" >&5 -$as_echo "$use_epoll" >&6; } - if test "${use_epoll}" = "yes" ; then - -$as_echo "#define HAVE_EPOLL_SYSCALL 1" >>confdefs.h - - fi -fi - -if test "${try_inotify_syscall}" = "yes" ; then - msg="for inotify" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 -$as_echo_n "checking $msg... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - int main() { - int fd; - int wd; - fd = inotify_init(); - wd = inotify_add_watch(fd, "/tmp", - (IN_CREATE | IN_DELETE | IN_DELETE_SELF - | IN_MODIFY | IN_MOVE_SELF | IN_MOVED_TO)); - return 0; - } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - use_inotify=yes -else - use_inotify=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_inotify" >&5 -$as_echo "$use_inotify" >&6; } - if test "${use_inotify}" = "yes" ; then - -$as_echo "#define HAVE_INOTIFY_SYSCALL 1" >>confdefs.h - - fi -fi - -if test "${try_kqueue_syscall}" = "yes" ; then - msg="for kqueue" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 -$as_echo_n "checking $msg... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - #include - int main() { - int kq; - struct kevent kev; - struct timespec timeout = {0, 0}; - kq = kqueue(); - EV_SET(&kev, 0, EVFILT_READ, EV_ADD, 0, 0, NULL); - kevent(kq, &kev, 1, NULL, 0, &timeout); - return 0; - } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - use_kqueue=yes -else - use_kqueue=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_kqueue" >&5 -$as_echo "$use_kqueue" >&6; } - if test "${use_kqueue}" = "yes" ; then - -$as_echo "#define HAVE_KQUEUE_SYSCALL 1" >>confdefs.h - - fi -fi - if test "${check_for_mprotect}" = "yes" ; then msg="for mmap and mprotect" { $as_echo "$as_me:${as_lineno-$LINENO}: checking $msg" >&5 diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index 3f59407fea..4bc9c16502 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -699,7 +699,6 @@ case "$host_os" in LIBS="$LIBS -lsocket -lnsl -lintl" need_gcc_static_libgcc="yes" check_gcc_dash_e="yes" - try_poll_syscall="no" # poll() has performance problems on Solaris? use_flag_pthread="no" use_flag_posix_pthread="yes" ;; @@ -711,26 +710,21 @@ case "$host_os" in LIBS="$LIBS -rdynamic" DYN_CFLAGS="-fPIC" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; openbsd*) LIBS="$LIBS -Wl,--export-dynamic" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; bitrig*) LIBS="$LIBS -Wl,--export-dynamic" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; dragonfly*) LIBS="$LIBS -Wl,--export-dynamic" enable_pthread_by_default=yes - try_kqueue_syscall=yes ;; netbsd*) LIBS="$LIBS -rdynamic" - try_kqueue_syscall=yes ;; irix*) enable_cgcdefault="yes" @@ -743,9 +737,6 @@ case "$host_os" in linux*) LIBS="$LIBS -ldl -lm -rdynamic" DYN_CFLAGS="-fPIC" - try_poll_syscall=yes - try_epoll_syscall=yes - try_inotify_syscall=yes case "$host_cpu" in #Required for CentOS 4.6 x86_64) @@ -888,12 +879,6 @@ case "$host_os" in esac PREFLAGS="$PREFLAGS -DOS_X -D_DARWIN_UNLIMITED_SELECT" - try_kqueue_syscall=yes - - # Although select() generally works as well as poll() on OS X, - # getdtablesize() appears not to be constant within a process, - # and that breaks static allocation of fd_sets - try_poll_syscall=yes # -pthread is not needed and triggers a warning use_flag_pthread=no @@ -1097,16 +1082,6 @@ AC_TRY_LINK([#include ], have_codeset=no) AC_MSG_RESULT($have_codeset) -AC_MSG_CHECKING([for getaddrinfo]) -AC_TRY_LINK([#include -#include -#include ], - [getaddrinfo(0, 0, 0, 0);], - AC_DEFINE(HAVE_GETADDRINFO,1,[Have getaddrinfo]) - have_getaddrinfo=yes, - have_getaddrinfo=no) -AC_MSG_RESULT($have_getaddrinfo) - iconv_lib_flag="" if test "${skip_iconv_check}" = "no" ; then if test "${enable_iconv}" = "yes" ; then @@ -1166,86 +1141,6 @@ if test "$mbsrtowcs" = "no" ; then fi AC_MSG_RESULT($mbsrtowcs) -if test "${try_poll_syscall}" = "yes" ; then - [ msg="for poll" ] - AC_MSG_CHECKING($msg) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - struct pollfd pfd; - int r; - pfd.fd = 0; - pfd.events = POLLIN; - r = poll(&pfd, 1, 0); - return 0; - }])], use_poll=yes, use_poll=no) - AC_MSG_RESULT($use_poll) - if test "${use_poll}" = "yes" ; then - AC_DEFINE(HAVE_POLL_SYSCALL,1,[Have poll]) - fi -fi - -if test "${try_epoll_syscall}" = "yes" ; then - [ msg="for epoll" ] - AC_MSG_CHECKING($msg) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - int fd; - struct epoll_event ev; - fd = epoll_create(5); - ev.events = EPOLLIN | EPOLLONESHOT; - epoll_ctl(fd, EPOLL_CTL_ADD, 0, &ev); - return 0; - }])], use_epoll=yes, use_epoll=no) - AC_MSG_RESULT($use_epoll) - if test "${use_epoll}" = "yes" ; then - AC_DEFINE(HAVE_EPOLL_SYSCALL,1,[Have epoll]) - fi -fi - -if test "${try_inotify_syscall}" = "yes" ; then - [ msg="for inotify" ] - AC_MSG_CHECKING($msg) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - int fd; - int wd; - fd = inotify_init(); - wd = inotify_add_watch(fd, "/tmp", - (IN_CREATE | IN_DELETE | IN_DELETE_SELF - | IN_MODIFY | IN_MOVE_SELF | IN_MOVED_TO)); - return 0; - }])], use_inotify=yes, use_inotify=no) - AC_MSG_RESULT($use_inotify) - if test "${use_inotify}" = "yes" ; then - AC_DEFINE(HAVE_INOTIFY_SYSCALL,1,[Have inotify]) - fi -fi - -if test "${try_kqueue_syscall}" = "yes" ; then - [ msg="for kqueue" ] - AC_MSG_CHECKING($msg) - AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include - int main() { - int kq; - struct kevent kev; - struct timespec timeout = {0, 0}; - kq = kqueue(); - EV_SET(&kev, 0, EVFILT_READ, EV_ADD, 0, 0, NULL); - kevent(kq, &kev, 1, NULL, 0, &timeout); - return 0; - }])], use_kqueue=yes, use_kqueue=no) - AC_MSG_RESULT($use_kqueue) - if test "${use_kqueue}" = "yes" ; then - AC_DEFINE(HAVE_KQUEUE_SYSCALL,1,[Have kqueue]) - fi -fi - if test "${check_for_mprotect}" = "yes" ; then [ msg="for mmap and mprotect" ] AC_MSG_CHECKING($msg) diff --git a/racket/src/racket/mzconfig.h.in b/racket/src/racket/mzconfig.h.in index 689f0ba334..db3a0bff6c 100644 --- a/racket/src/racket/mzconfig.h.in +++ b/racket/src/racket/mzconfig.h.in @@ -47,21 +47,12 @@ typedef unsigned long uintptr_t; /* Whether nl_langinfo works. */ #undef HAVE_CODESET -/* Whether getaddrinfo works. */ -#undef HAVE_GETADDRINFO - /* Whether __attribute__ ((noinline)) works. */ #undef MZ_USE_NOINLINE /* Whether pthread_rwlock is available. */ #undef HAVE_PTHREAD_RWLOCK -/* When poll(), epoll(), kqueue(), etc. is available: */ -#undef HAVE_POLL_SYSCALL -#undef HAVE_EPOLL_SYSCALL -#undef HAVE_INOTIFY_SYSCALL -#undef HAVE_KQUEUE_SYSCALL - /* When mmap() and mprotect() are available: */ #undef HAVE_MMAP_MPROTECT