ffi 1.16.2 → 1.17.0.rc1

data/ext/ffi_c/LastError.c

@@ -141,7 +141,7 @@ thread_data_get(void)
 
 /*
  * call-seq: error
- * @return [Numeric]
+ * @return [Integer]
  * Get +errno+ value.
  */
 static VALUE
@@ -153,7 +153,7 @@ get_last_error(VALUE self)
 #if defined(_WIN32) || defined(__CYGWIN__)
 /*
  * call-seq: winapi_error
- * @return [Numeric]
+ * @return [Integer]
  * Get +GetLastError()+ value. Only Windows or Cygwin.
  */
 static VALUE
@@ -166,7 +166,7 @@ get_last_winapi_error(VALUE self)
 
 /*
  * call-seq: error(error)
- * @param [Numeric] error
+ * @param [Integer] error
  * @return [nil]
  * Set +errno+ value.
  */
@@ -185,7 +185,7 @@ set_last_error(VALUE self, VALUE error)
 #if defined(_WIN32) || defined(__CYGWIN__)
 /*
  * call-seq: error(error)
- * @param [Numeric] error
+ * @param [Integer] error
  * @return [nil]
  * Set +GetLastError()+ value. Only on Windows and Cygwin.
  */

data/ext/ffi_c/MemoryPointer.c

@@ -80,8 +80,8 @@ memptr_allocate(VALUE klass)
 
 /*
  * call-seq: initialize(size, count=1, clear=true)
- * @param [Fixnum, Bignum, Symbol, FFI::Type] size size of a memory cell (in bytes, or type whom size will be used)
- * @param [Numeric] count number of cells in memory
+ * @param [Integer, Symbol, FFI::Type] size size of a memory cell (in bytes, or type whom size will be used)
+ * @param [Integer] count number of cells in memory
  * @param [Boolean] clear set memory to all-zero if +true+
  * @return [self]
  * A new instance of FFI::MemoryPointer.

data/ext/ffi_c/Pointer.c

@@ -95,12 +95,10 @@ ptr_allocate(VALUE klass)
 }
 
 /*
- * @overload initialize(pointer)
- *  @param [Pointer] pointer another pointer to initialize from
- *  Create a new pointer from another {Pointer}.
+ * @overload initialize(address)
  * @overload initialize(type, address)
- *  @param [Type] type type for pointer
- *  @param [Integer] address base address for pointer
+ *  @param [Type] type Optional type for pointer (defaults to byte)
+ *  @param [Pointer, Integer] address base address for pointer
  *  Create a new pointer from a {Type} and a base address
  * @return [self]
  * A new instance of Pointer.
@@ -229,7 +227,7 @@ slice(VALUE self, long offset, long size)
 /*
  * Document-method: +
  * call-seq: ptr + offset
- * @param [Numeric] offset
+ * @param [Integer] offset
  * @return [Pointer]
  * Return a new {Pointer} from an existing pointer and an +offset+.
  */
@@ -246,8 +244,8 @@ ptr_plus(VALUE self, VALUE offset)
 
 /*
  * call-seq: ptr.slice(offset, length)
- * @param [Numeric] offset
- * @param [Numeric] length
+ * @param [Integer] offset
+ * @param [Integer] length
  * @return [Pointer]
  * Return a new {Pointer} from an existing one. This pointer points on same contents
  * from +offset+ for a length +length+.
@@ -314,12 +312,17 @@ ptr_equals(VALUE self, VALUE other)
         return ptr->memory.address == NULL ? Qtrue : Qfalse;
     }
 
-    return ptr->memory.address == POINTER(other)->address ? Qtrue : Qfalse;
+    if (!rb_obj_is_kind_of(other, rbffi_PointerClass)) {
+        return Qfalse;
+    }
+    else {
+        return ptr->memory.address == POINTER(other)->address ? Qtrue : Qfalse;
+    }
 }
 
 /*
  * call-seq: ptr.address
- * @return [Numeric] pointer's base address
+ * @return [Integer] pointer's base address
  * Return +self+'s base address (alias: #to_i).
  */
 static VALUE
@@ -440,7 +443,7 @@ ptr_autorelease(VALUE self, VALUE autorelease)
 
     rb_check_frozen(self);
     TypedData_Get_Struct(self, Pointer, &rbffi_pointer_data_type, ptr);
-    ptr->autorelease = autorelease == Qtrue;
+    ptr->autorelease = RB_TEST(autorelease);
 
     return autorelease;
 }

data/ext/ffi_c/Struct.c

@@ -91,6 +91,7 @@ VALUE rbffi_StructLayoutCharArrayClass = Qnil;
 
 static ID id_pointer_ivar = 0, id_layout_ivar = 0;
 static ID id_get = 0, id_put = 0, id_to_ptr = 0, id_to_s = 0, id_layout = 0;
+static ID id_initialize = 0;
 
 static inline char*
 memory_address(VALUE self)
@@ -114,6 +115,7 @@ struct_allocate(VALUE klass)
 
 /*
  * call-seq: initialize
+ * @overload initialize
  * @overload initialize(pointer, *args)
  *  @param [AbstractMemory] pointer
  *  @param [Array] args
@@ -189,9 +191,11 @@ struct_initialize_copy(VALUE self, VALUE other)
     }
 
     if (src->layout->referenceFieldCount > 0) {
+        size_t index;
+
         dst->rbReferences = ALLOC_N(VALUE, dst->layout->referenceFieldCount);
         memcpy(dst->rbReferences, src->rbReferences, dst->layout->referenceFieldCount * sizeof(VALUE));
-        for (size_t index = 0; index < dst->layout->referenceFieldCount; index++) {
+        for ( index = 0; index < dst->layout->referenceFieldCount; index++) {
             RB_OBJ_WRITTEN(self, Qundef, &dst->rbReferences[index]);
         }
     }
@@ -268,7 +272,8 @@ struct_mark(void *data)
     rb_gc_mark_movable(s->rbPointer);
     rb_gc_mark_movable(s->rbLayout);
     if (s->rbReferences != NULL) {
-        for (size_t index = 0; index < s->layout->referenceFieldCount; index++) {
+        size_t index;
+        for (index = 0; index < s->layout->referenceFieldCount; index++) {
             rb_gc_mark_movable(s->rbReferences[index]);
         }
     }
@@ -281,7 +286,8 @@ struct_compact(void *data)
     ffi_gc_location(s->rbPointer);
     ffi_gc_location(s->rbLayout);
     if (s->rbReferences != NULL) {
-        for (size_t index = 0; index < s->layout->referenceFieldCount; index++) {
+        size_t index;
+        for (index = 0; index < s->layout->referenceFieldCount; index++) {
             ffi_gc_location(s->rbReferences[index]);
         }
     }
@@ -612,7 +618,7 @@ inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
 
 /*
  * call-seq: size
- * @return [Numeric]
+ * @return [Integer]
  * Get size
  */
 static VALUE
@@ -637,7 +643,7 @@ inline_array_offset(InlineArray* array, int index)
 
 /*
  * call-seq: [](index)
- * @param [Numeric] index
+ * @param [Integer] index
  * @return [Type, Struct]
  */
 static VALUE
@@ -661,8 +667,12 @@ inline_array_aref(VALUE self, VALUE rbIndex)
         VALUE rbOffset = INT2NUM(inline_array_offset(array, NUM2INT(rbIndex)));
         VALUE rbLength = INT2NUM(array->componentType->ffiType->size);
         VALUE rbPointer = rb_funcall(array->rbMemory, rb_intern("slice"), 2, rbOffset, rbLength);
+        VALUE obj;
 
-        return rb_class_new_instance(1, &rbPointer, ((StructByValue *) array->componentType)->rbStructClass);
+         /* We avoid rb_class_new_instance here, to avoid passing the method block */
+         obj = rb_obj_alloc(((StructByValue *) array->componentType)->rbStructClass);
+         rb_funcallv(obj, id_initialize, 1, &rbPointer);
+         return obj;
     } else {
 
         rb_raise(rb_eArgError, "get not supported for %s", rb_obj_classname(array->arrayType->rbComponentType));
@@ -672,7 +682,7 @@ inline_array_aref(VALUE self, VALUE rbIndex)
 
 /*
  * call-seq: []=(index, value)
- * @param [Numeric] index
+ * @param [Integer] index
  * @param [Type, Struct]
  * @return [value]
  */
@@ -889,5 +899,6 @@ rbffi_Struct_Init(VALUE moduleFFI)
     id_put = rb_intern("put");
     id_to_ptr = rb_intern("to_ptr");
     id_to_s = rb_intern("to_s");
+    id_initialize = rb_intern("initialize");
 }
 

data/ext/ffi_c/StructLayout.c

@@ -132,7 +132,7 @@ struct_field_memsize(const void *data)
 /*
  * call-seq: initialize(name, offset, type)
  * @param [String,Symbol] name
- * @param [Fixnum] offset
+ * @param [Integer] offset
  * @param [FFI::Type] type
  * @return [self]
  * A new FFI::StructLayout::Field instance.
@@ -188,7 +188,7 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
 
 /*
  * call-seq: offset
- * @return [Numeric]
+ * @return [Integer]
  * Get the field offset.
  */
 static VALUE
@@ -201,7 +201,7 @@ struct_field_offset(VALUE self)
 
 /*
  * call-seq: size
- * @return [Numeric]
+ * @return [Integer]
  * Get the field size.
  */
 static VALUE
@@ -214,7 +214,7 @@ struct_field_size(VALUE self)
 
 /*
  * call-seq: alignment
- * @return [Numeric]
+ * @return [Integer]
  * Get the field alignment.
  */
 static VALUE
@@ -474,8 +474,8 @@ struct_layout_allocate(VALUE klass)
 /*
  * call-seq: initialize(fields, size, align)
  * @param [Array<StructLayout::Field>] fields
- * @param [Numeric] size
- * @param [Numeric] align
+ * @param [Integer] size
+ * @param [Integer] align
  * @return [self]
  * A new StructLayout instance.
  */

data/ext/ffi_c/Type.c

@@ -107,7 +107,7 @@ type_allocate(VALUE klass)
 /*
  * Document-method: initialize
  * call-seq: initialize(value)
- * @param [Fixnum,Type] value
+ * @param [Integer,Type] value
  * @return [self]
  */
 static VALUE
@@ -135,7 +135,7 @@ type_initialize(VALUE self, VALUE value)
 
 /*
  * call-seq: type.size
- * @return [Fixnum]
+ * @return [Integer]
  * Return type's size, in bytes.
  */
 static VALUE
@@ -150,7 +150,7 @@ type_size(VALUE self)
 
 /*
  * call-seq: type.alignment
- * @return [Fixnum]
+ * @return [Integer]
  * Get Type alignment.
  */
 static VALUE
@@ -333,10 +333,10 @@ rbffi_Type_Init(VALUE moduleFFI)
     classBuiltinType = rb_define_class_under(rbffi_TypeClass, "Builtin", rbffi_TypeClass);
     /*
      * Document-module: FFI::NativeType
-     * This module defines constants for native (C) types.
+     * This module defines constants for C native types.
      *
      * ==Native type constants
-     * Native types are defined by constants :
+     * Native types are defined by constants and aliases:
      * * INT8, SCHAR, CHAR
      * * UINT8, UCHAR
      * * INT16, SHORT, SSHORT
@@ -349,24 +349,25 @@ rbffi_Type_Init(VALUE moduleFFI)
      * * ULONG
      * * FLOAT32, FLOAT
      * * FLOAT64, DOUBLE
+     * * LONGDOUBLE (if the native platform has `long double`)
      * * POINTER
-     * * CALLBACK
-     * * FUNCTION
-     * * CHAR_ARRAY
      * * BOOL
-     * * STRING (immutable string, nul terminated)
-     * * STRUCT (struct-b-value param or result)
-     * * ARRAY (array type definition)
-     * * MAPPED (custom native type)
-     * For function return type only :
+     * * STRING (immutable string, null terminated)
+     * For function return type only:
      * * VOID
-     * For function argument type only :
+     * For function argument type only:
      * * BUFFER_IN
      * * BUFFER_OUT
+     * * BUFFER_INOUT
      * * VARARGS (function takes a variable number of arguments)
      *
-     * All these constants are exported to {FFI} module prefixed with "TYPE_".
-     * They are objets from {FFI::Type::Builtin} class.
+     * They are objects of the class {FFI::Type::Builtin}.
+     *
+     * Non-alias (the first name in each bullet point) constants are also exported to modules +FFI::NativeType+ and (prefixed with +TYPE_+) {FFI}.
+     * All constants and aliases above are exported to the {FFI::Type} class, as well as the following aliases:
+     * * Array ({FFI::ArrayType})
+     * * Function ({FFI::FunctionType})
+     * * Struct ({FFI::StructByValue})
      */
     moduleNativeType = rb_define_module_under(moduleFFI, "NativeType");
 

data/ext/ffi_c/Types.c

@@ -41,6 +41,7 @@
 #include "LongDouble.h"
 
 static ID id_from_native = 0;
+static ID id_initialize = 0;
 
 
 VALUE
@@ -95,6 +96,7 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
         case NATIVE_STRUCT: {
             StructByValue* sbv = (StructByValue *)type;
             AbstractMemory* mem;
+            VALUE obj;
             VALUE rbMemory = rbffi_MemoryPointer_NewInstance(1, sbv->base.ffiType->size, false);
 
             TypedData_Get_Struct(rbMemory, AbstractMemory, &rbffi_abstract_memory_data_type, mem);
@@ -102,7 +104,10 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
             RB_GC_GUARD(rbMemory);
             RB_GC_GUARD(rbType);
 
-            return rb_class_new_instance(1, &rbMemory, sbv->rbStructClass);
+            /* We avoid rb_class_new_instance here, to avoid passing the method block */
+            obj = rb_obj_alloc(sbv->rbStructClass);
+            rb_funcallv(obj, id_initialize, 1, &rbMemory);
+            return obj;
         }
 
         case NATIVE_MAPPED: {
@@ -134,5 +139,6 @@ void
 rbffi_Types_Init(VALUE moduleFFI)
 {
     id_from_native = rb_intern("from_native");
+    id_initialize = rb_intern("initialize");
 }
 

data/ext/ffi_c/Types.h

@@ -55,7 +55,6 @@ typedef enum {
     NATIVE_BUFFER_IN,
     NATIVE_BUFFER_OUT,
     NATIVE_BUFFER_INOUT,
-    NATIVE_CHAR_ARRAY,
     NATIVE_BOOL,
 
     /** An immutable string.  Nul terminated, but only copies in to the native function */

data/ext/ffi_c/Variadic.c

@@ -202,6 +202,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     Type** paramTypes;
     VALUE* argv;
     VALUE* callbackParameters;
+    VALUE callbackProc;
     int paramCount = 0, fixedCount = 0, callbackCount = 0, i;
     ffi_status ffiStatus;
     rbffi_frame_t frame = { 0 };
@@ -290,8 +291,9 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
             rb_raise(rb_eArgError, "Unknown FFI error");
     }
 
-    rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
-        ffiValues, callbackParameters, callbackCount, invoker->rbEnums);
+    callbackProc = rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
+        ffiValues, callbackParameters, callbackCount,
+        invoker->rbEnums);
 
     rbffi_frame_push(&frame);
 
@@ -309,6 +311,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     } else {
         ffi_call(&cif, FFI_FN(invoker->function), retval, ffiValues);
     }
+    RB_GC_GUARD(callbackProc);
 
     rbffi_frame_pop(&frame);
 

data/ext/ffi_c/libffi/.github/workflows/build.yml

@@ -14,6 +14,30 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
+  build-warp:
+    name: ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
+    runs-on: warp-ubuntu-latest-arm64-2x
+
+    strategy:
+      fail-fast: false
+      matrix:
+       include:
+         - HOST: "aarch64-linux-gnu"
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - env:
+          MEVAL: ${{ matrix.MEVAL }}
+          HOST: ${{ matrix.HOST }}
+          LDFLAGS: ${{ matrix.LDFLAGS }}
+          RUNTESTFLAGS: ${{ matrix.RUNTESTFLAGS }}
+          CONFIGURE_OPTIONS: ${{ matrix.CONFIGURE_OPTIONS }}
+        run: |
+          if test x"$MEVAL" != x; then eval ${MEVAL}; fi
+          ./.ci/install.sh
+          ./.ci/build.sh
+
   build-sim:
     name: ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
     runs-on: ubuntu-latest
@@ -89,57 +113,52 @@ jobs:
       fail-fast: false
       matrix:
        include:
-         - CFARM_HOST: gcc117.fsffrance.org
+         - CFARM_HOST: cfarm185.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: aarch64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc117.fsffrance.org
-           CFARM_PORT: 22
-           CFARM_TRIPLE: aarch64-linux-gnu
-           CFARM_CC: "/home/green/gcc12/bin/gcc"
-           CFARM_CXX: "/home/green/gcc12/bin/g++"
-         - CFARM_HOST: gcc117.fsffrance.org
+         - CFARM_HOST: cfarm185.fsffrance.org
            CFARM_PORT: 22
            CFARM_TRIPLE: aarch64-lto-linux-gnu
            CFARM_CC: "gcc -flto"
            CFARM_CXX: "g++ -flto"
-         - CFARM_HOST: gcc400.fsffrance.org
+         - CFARM_HOST: cfarm400.cfarm.net
            CFARM_PORT: 25465
            CFARM_TRIPLE: loongarch64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc230.fsffrance.org
+         - CFARM_HOST: cfarm230.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: mips-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc102.fsffrance.org
+         - CFARM_HOST: cfarm211.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: sparc64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc102.fsffrance.org
+         - CFARM_HOST: cfarm211.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: sparc64-linux-gnu
            CFARM_CC: "gcc -m32"
            CFARM_CXX: "g++ -m32"
-         - CFARM_HOST: gcc91.fsffrance.org
+         - CFARM_HOST: cfarm91.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: riscv64-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc103.fsffrance.org
+         - CFARM_HOST: cfarm103.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: aarch64-m1-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc112.fsffrance.org
+         - CFARM_HOST: cfarm112.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: powerpc64le-linux-gnu
            CFARM_CC: "gcc"
            CFARM_CXX: "g++"
-         - CFARM_HOST: gcc111.fsffrance.org
+         - CFARM_HOST: cfarm111.cfarm.net
            CFARM_PORT: 22
            CFARM_TRIPLE: powerpc-ibm-aix7.1.5.0
            CFARM_CC: "gcc"

data/ext/ffi_c/libffi/.github/workflows/emscripten.yml

@@ -129,7 +129,8 @@ jobs:
     strategy:
       matrix:
         bigint: ["--wasm-bigint", ""]
-        browser: ["firefox", "chrome"]
+        browser: ["chrome"]
+        # FIXME: selenium can't find gecko driver for "firefox"
     runs-on: ubuntu-22.04
     needs: [build]
     steps:

data/ext/ffi_c/libffi/LICENSE

@@ -1,4 +1,4 @@
-libffi - Copyright (c) 1996-2022  Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2024  Anthony Green, Red Hat, Inc and others.
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/ext/ffi_c/libffi/README.md

@@ -1,7 +1,7 @@
 Status
 ======
 
-libffi-3.4.4 was released on October 23, 2022.  Check the libffi web
+libffi-3.4.6 was released on February 18, 2024.  Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -158,7 +158,7 @@ It's also possible to build libffi on Windows platforms with
 Microsoft's Visual C++ compiler.  In this case, use the msvcc.sh
 wrapper script during configuration like so:
 
-    path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP="cl -nologo -EP" CPPFLAGS="-DFFI_BUILDING_DLL"
+    path/to/configure CC=path/to/msvcc.sh CXX=path/to/msvcc.sh LD=link CPP="cl -nologo -EP" CXXCPP="cl -nologo -EP" CPPFLAGS="-DFFI_BUILDING_DLL"
 
 For 64-bit Windows builds, use ``CC="path/to/msvcc.sh -m64"`` and
 ``CXX="path/to/msvcc.sh -m64"``.  You may also need to specify
@@ -201,11 +201,16 @@ History
 
 See the git log for details at http://github.com/libffi/libffi.
 
-    TBD - TBD
+    3.4.6 Feb-18-2024
+        Fix long double regression on mips64 and alpha.
+
+    3.4.5 Feb-15-2024
         Add support for wasm32.
-        Add support for HPPA64, and many HPPA fixes.
+        Add support for aarch64 branch target identification (bti).
         Add support for ARCv3: ARC32 & ARC64.
-        Many x86 Darwin fixes.
+        Add support for HPPA64, and many HPPA fixes.
+        Add support for Haikuos on PowerPC.
+        Fixes for AIX, loongson, MIPS, power, sparc64, and x86 Darwin.
 
     3.4.4 Oct-23-2022
         Important aarch64 fixes, including support for linux builds

data/ext/ffi_c/libffi/compile

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End: