Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into Cog

OpenSmalltalk · Feb 24, 2022 · be88573 · be88573
2 parents cb24b66 + 59ed599
commit be88573
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 89 deletions.
diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml
@@ -17,8 +17,8 @@ jobs:
       fail-fast: false # let them finish bc. different platforms
       matrix:
         arch: 
-          - { name: win64x64, os: windows-latest }
-          - { name: win32x86, os: windows-latest }
+          - { name: win64x64, os: windows-2019 }
+          - { name: win32x86, os: windows-2019 }
           - { name: linux64x64, os: ubuntu-18.04 }
           - { name: linux32x86, os: ubuntu-18.04 }
           - { name: macos64x64, os: macos-10.15 }
@@ -30,13 +30,13 @@ jobs:
           - newspeak.stack.spur
 
         include:
-          - arch: { name: win32x86, os: windows-latest }
+          - arch: { name: win32x86, os: windows-2019 }
             flavor: squeak.cog.v3
-          - arch: { name: win32x86, os: windows-latest }
+          - arch: { name: win32x86, os: windows-2019 }
             flavor: squeak.stack.v3
-          - arch: { name: win32x86, os: windows-latest }
+          - arch: { name: win32x86, os: windows-2019 }
             flavor: squeak.cog.spur.lowcode
-          # - arch: { name: win32x86, os: windows-latest }
+          # - arch: { name: win32x86, os: windows-2019 }
           #   flavor: pharo.cog.spur.lowcode
 
           - arch: { name: linux32x86, os: ubuntu-18.04 }

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -67,7 +67,7 @@ jobs:
           #   flavor: pharo.sista.spur
           #   mode: fast
 
-    runs-on: windows-latest
+    runs-on: windows-2019
     name: ${{ matrix.flavor }} for ${{ matrix.arch }}${{ matrix.mode == 'debug' && ' (DEBUG)' || matrix.mode == 'assert' && ' (ASSERT)' || '' }}
     env:
       ARCH: ${{ matrix.arch }}

diff --git a/platforms/unix/config/aclocal.m4 b/platforms/unix/config/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -4069,7 +4069,8 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6440,7 +6441,7 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
     else
       GXX=no
@@ -6815,7 +6816,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -6880,7 +6881,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test yes = "$GXX"; then
@@ -7219,7 +7220,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -7303,7 +7304,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@@ -7314,7 +7315,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
@@ -9970,7 +9971,7 @@ m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
 dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
+dnl serial 11 (pkg-config-0.29)
 dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -10012,7 +10013,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ

diff --git a/platforms/unix/config/configure b/platforms/unix/config/configure
@@ -818,6 +818,7 @@ with_gnu_awk
 with_gnu_as
 with_rfb
 enable_largefile
+enable_epoll
 with_npsqueak
 with_quartz
 with_x
@@ -1486,8 +1487,10 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-   --disable-cogit        compile a cogit VM (default=enabled)
+  --disable-cogit         compile a cogit VM (default=enabled)
   --disable-largefile     omit support for large files
+  --disable-epoll         Do not use epoll even if supported (default: try to
+                          use)
   --enable-fast-bitblt    enable fast BitBlt optimizations (default=no)
   --disable-iconv disable iconv support (default=enabled)
 
@@ -6060,11 +6063,8 @@ _LT_EOF
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -15897,7 +15897,16 @@ _ACEOF
 
 fi
 
-  ax_have_epoll_cppflags="${CPPFLAGS}"
+
+# Check whether --enable-epoll was given.
+if test "${enable_epoll+set}" = set; then :
+  enableval=$enable_epoll; try_epoll="$enableval"
+else
+  try_epoll="yes"
+fi
+
+if test "$try_epoll" = yes; then
+    ax_have_epoll_cppflags="${CPPFLAGS}"
   ac_fn_c_check_header_mongrel "$LINENO" "linux/version.h" "ac_cv_header_linux_version_h" "$ac_includes_default"
 if test "x$ac_cv_header_linux_version_h" = xyes; then :
   CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"
@@ -15952,7 +15961,7 @@ $as_echo "no" >&6; }
 
 fi
 
-  ax_have_epoll_cppflags="${CPPFLAGS}"
+    ax_have_epoll_cppflags="${CPPFLAGS}"
   ac_fn_c_check_header_mongrel "$LINENO" "linux/version.h" "ac_cv_header_linux_version_h" "$ac_includes_default"
 if test "x$ac_cv_header_linux_version_h" = xyes; then :
   CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"
@@ -16009,6 +16018,7 @@ $as_echo "no" >&6; }
 
 fi
 
+fi
 
 # Checks for platform characteristics.
 

diff --git a/platforms/unix/config/configure.ac b/platforms/unix/config/configure.ac
@@ -111,7 +111,7 @@ AC_ARG_WITH(scriptname,
 # Compiling a Cogit VM or not?  If so, need a cogit$o, cointerp, etc.
 
 AC_ARG_ENABLE(cogit,
-	AS_HELP_STRING([ --disable-cogit], [compile a cogit VM (default=enabled)]),
+	AS_HELP_STRING([--disable-cogit], [compile a cogit VM (default=enabled)]),
 	[cogit="$enableval"],
 	[cogit="yes"])
 AC_SUBST(cogit)
@@ -417,8 +417,15 @@ LT_LIB_DLLOAD
 AC_CHECK_FUNCS([snprintf __snprintf],[break])
 AC_CHECK_FUNCS_ONCE([mmap nanosleep])
 AC_FUNC_ALLOCA
-AX_HAVE_EPOLL([AC_DEFINE(HAVE_EPOLL, [1], [epoll(7) is supported])])
-AX_HAVE_EPOLL_PWAIT([AC_DEFINE(HAVE_EPOLL_PWAIT, [1], [epoll_pwait(7) is supported])])
+
+AC_ARG_ENABLE(epoll,
+	AS_HELP_STRING([--disable-epoll], [Do not use epoll even if supported (default: try to use)]),
+	[try_epoll="$enableval"],
+	[try_epoll="yes"])
+if test "$try_epoll" = yes; then
+  AX_HAVE_EPOLL([AC_DEFINE(HAVE_EPOLL, [1], [epoll(7) is supported])])
+  AX_HAVE_EPOLL_PWAIT([AC_DEFINE(HAVE_EPOLL_PWAIT, [1], [epoll_pwait(7) is supported])])
+fi
 
 # Checks for platform characteristics.