clang-cl (#153)

Author: adamyg

mcwin32/doc/INSTALL.md

@@ -7,6 +7,7 @@ The project can be built from source, using one of several supported tool-chains
 The following environments and toolchains are supported.
 
   * Microsoft Visual C++ (MSVC) 2015 - 2022; or
+  * clang-cl using MSVC the linker; or
   * Open-Watcom (OWC) 1.9 or 2.0; or
   * Mingw64, both 32 and 64 bit targets.
 
@@ -76,6 +77,10 @@ Several alternative profiles are available:
     * vc2017config - Visual Studio C/C++ 2017.
     * vc2019config - Visual Studio C/C++ 2019.
     * vc2022config - Visual Studio C/C++ 2022.
+    
+  * clang-cl; or
+  
+    * cclconfig - Clang cl driver, using MSVC tool-chain. See MSVC setup for primary configuration details.
 
   * Open-Watcom (OWC) 1.9 or 2.0; or
 
@@ -169,7 +174,7 @@ The follow offers a more detailed discussion of the requirements and instruction
   - [Native builds using Open-Watcom](#native-builds-using-openwatcom-c-c)
   - [Native builds using Visual C++](#native-builds-using-visual-c-c)
   - [Native builds using MinGW64](#native-builds-using-mingw)
-
+  
 Finally, please review the packaged example alternative configurations as win32 development environments can be problematic, dependent on the host setup:
 
   - .github/workflows, github build actions for owc, msvc and mingw64 toolchains.

mcwin32/libw32/w32_check.c

@@ -1,5 +1,5 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_w32_check_c,"$Id: w32_check.c,v 1.17 2025/06/11 17:33:57 cvsuser Exp $")
+__CIDENT_RCSID(gr_w32_check_c,"$Id: w32_check.c,v 1.18 2025/06/12 12:28:08 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 4; -*- */
 /*
@@ -120,7 +120,9 @@ struct __packed_pre__ mypackedstruct {
 } __packed_post__;
 #include <sys/pack0.h>
 
-extern int __w32_check_attr(mode_t mode);
+int __w32_check_attr(mode_t mode);
+int __w32_check_errno(int rc);
+
 
 /*
  *  check for unique mode bits ...
@@ -175,6 +177,14 @@ __w32_check_attr(mode_t mode)
 }
 
 
+/////////////////////////////////////////////////////////////////////////////////////////
+//  errno mapping
+
+#include <errno.h>
+#include "win32_errno.h"
+#include <errno.h>
+#include "win32_errno.h"
+
 int
 __w32_check_errno(int rc)
 {

mcwin32/libw32/w32_statfs.c

@@ -1,5 +1,5 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_w32_statfs_c,"$Id: w32_statfs.c,v 1.28 2025/06/11 17:30:58 cvsuser Exp $")
+__CIDENT_RCSID(gr_w32_statfs_c,"$Id: w32_statfs.c,v 1.29 2025/06/12 12:27:56 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 4; -*- */
 /*
@@ -718,9 +718,12 @@ NetworkEnum(unsigned ndrives)
     // enumeration worker
     if (trigger) {
         if (InterlockedCompareExchange(&x_nestat.status, NCRunning, NCIdle) == NCIdle) {
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
+#endif
             DWORD dwThreadId = 0;
             HANDLE thread =
-                CreateThread(NULL, 0, NetworkEnumThread, (void*)(ndrives), 0, &dwThreadId);
+                CreateThread(NULL, 0, NetworkEnumThread, (void *)(ndrives), 0, &dwThreadId);
             if (thread != NULL) {
                 CloseHandle(thread); // detach
             } else { // thread failure
@@ -775,6 +778,9 @@ NetworkCached(struct StatBlock *sb)
 static DWORD WINAPI
 NetworkEnumThread(LPVOID lpParam)
 {
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
+#endif
     const unsigned ndrives = (unsigned)(lpParam);
     struct StatBlock *previous = NULL, *sb;
     const time_t then = time(NULL);
@@ -879,3 +885,4 @@ drive_mask(int drive)
 }
 
 /*end*/
+

mcwin32/libw32/win32_errno.h

@@ -1,7 +1,7 @@
 #ifndef LIBW32_WIN32_ERRNO_H_INCLUDED
 #define LIBW32_WIN32_ERRNO_H_INCLUDED
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.17 2025/06/11 17:33:57 cvsuser Exp $")
+__CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.18 2025/06/12 12:28:08 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 4; -*- */
 /*
@@ -44,12 +44,15 @@ __CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.17 2025/06/11 17:
 #pragma message("<system_error.h> is incompatible with _CRT_NO_POSIX_ERROR_CODES.")
 #endif
     /*
-     *  RETHINK, as the following are assumed by the MinGW pthread package:
+     *  Rethink, the following values are assumed by the MinGW pthread package and possibility more;
      *
-     *      #define ETIMEDOUT   138
      *      #define ENOTSUP     129
+     *      #define ETIMEDOUT   138
      *      #define EWOULDBLOCK 140
      */
+#if (ENOTSUP != 129 || ETIMEDOUT != 138 || EWOULDBLOCK != 140)
+#error Unexpected errno definitions
+#endif
 #include "msvc_errno.h"                         /* undef error codes */
 #else
 #error unexpected EADDRINUSE value
@@ -70,13 +73,22 @@ __CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.17 2025/06/11 17:
 #include <errno.h>
 #endif
 
+#if defined(__MINGW32__)
+#if (EADDRINUSE == 100)                         /* _CRT_NO_POSIX_ERROR_CODES was ineffective */
+#if (ENOTSUP != 129 || ETIMEDOUT != 138 || EWOULDBLOCK != 140)
+#error Unexpected errno definitions
+#endif
+#include "msvc_errno.h"
+#endif
+#endif //__MINGW32__
+
 /*
  *  Addition UNIX style errno's, plus Windows Sockets errors redefined as regular Berkeley error constants.
  */
 
     /*
      *  General use error codes,
-     *      which utilise their defined value under MSVC POSIX definition, see <errno.h>
+     *      which utilise their defined value under MSVC (and emulation) POSIX definition, see <errno.h>
      *
      *  MSVC: Their definitions can be disabled using _CRT_NO_POSIX_ERROR_CODES, as many conflict with the
      *      WinSock aliases below, but this generates complication errors within C++ code elements.
@@ -100,6 +112,10 @@ __CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.17 2025/06/11 17:
 #define ETXTBSY         139                     /* Text file busy; OWC=33. */
 #endif
 
+    /* conflicts */
+#define ETIMEDOUT2      138
+#define EWOULDBLOCK2    140
+
     /* additional 141+ */
 #define EBADFD          141                     /* Bad file descriptor. */
 #define EBADRQC         142
@@ -123,26 +139,81 @@ __CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.17 2025/06/11 17:
 
 #endif  /*LIBW32_WIN32_ERRNO_H_INCLUDED*/
 
+
+//  -----------------------------------------------------------------------------------------------
+
     /*
      *  Outside include guard, set/verify WinSock error mapping.
      *  Note: Force errors on inconsistent redefinitions
      */
+
+#if !defined(__MAKEDEPEND__)
+#if (EBADMSG != 104)                            /* Bad message. */
+#error Inconsistent EBSDMSG definition ....
+#endif
+#if (ECANCELED != 105)                          /* Operation canceled. */
+#error Inconsistent ECANCELED definition ....
+#endif
+#if (EIDRM != 111)                              /* Identifier removed. */
+#error Inconsistent EIDRM definition ....
+#endif
+#if (ENODATA != 120)                            /* No data. */
+#error Inconsistent ENODATA definition ....
+#endif
+#if (ENOLINK != 121)                            /* Virtual circuit is gone. */
+#error Inconsistent ENOLINK definition ....
+#endif
+#if (ENOMSG != 122)                             /* No message. */
+#error Inconsistent ENOMSG definition ....
+#endif
+#if (ENOSR != 124)                              /* No stream resources. */
+#error Inconsistent ENOSR definition ....
+#endif
+#if (ENOSTR != 125)                             /* Not a stream. */
+#error Inconsistent ENOSTR definition ....
+#endif
+#if (ENOTRECOVERABLE != 127)                    /* Not recoverable. */
+#error Inconsistent ENOTRECOVERABLE definition ....
+#endif
+#if (ENOTSUP != 129)                            /* Not supported. */
+#error Inconsistent ENOTSUP definition ....
+#endif
+#if (EOTHER != 131)                             /* Other error. */
+#error Inconsistent EOTHER definition ....
+#endif
+#if (EOVERFLOW != 132)                          /* Overflow. */
+#error Inconsistent EOVERFLOW definition ....
+#endif
+#if (EOWNERDEAD != 133)                         /* Owner dead. */
+#error Inconsistent EOWNERDEAD definition ....
+#endif
+#if (ETIME != 137)                              /* Stream ioctl timeout. */
+#error Inconsistent ETIME definition ....
+#endif
+#if (EPROTO != 134)
+#error Inconsistent EPROTO definition ....
+#endif
+#endif //__MAKEDEPEND__)
+
+
 #if defined(WSAEINTR) && !defined(__MAKEDEPEND__)
     //  && !defined(LIBW32_ERRNO_WINSOCK)
     //  #define LIBW32_ERRNO_WINSOCK
 
+#define ESTRINGIZE(__x) __ESTRINGIZE(__x)
+#define __ESTRINGIZE(__x) #__x
+
 #if !defined(EWOULDBLOCK)
 #define EWOULDBLOCK     WSAEWOULDBLOCK          /* 10035 "Operation would block" */
 #elif (EWOULDBLOCK != WSAEWOULDBLOCK)
-#define STRINGIZE(__x)  __STRINGIZE(__x)
-#define __STRINGIZE(__x) #__x
-#pragma message("errno: EWOULDBLOCK(" STRINGIZE(EWOULDBLOCK) ") != WSAEWOULDBLOCK(" STRINGIZE(WSAEWOULDBLOCK) ")" )
+#pragma message "errno: EWOULDBLOCK(" ESTRINGIZE(EWOULDBLOCK) ") != WSAEWOULDBLOCK(" ESTRINGIZE(WSAEWOULDBLOCK) ")"
 #error Inconsistent EWOULDBLOCK definition ....
 #endif
 
 #if !defined(EINPROGRESS)
 #define EINPROGRESS     WSAEINPROGRESS          /* 10036 "Operation now in progress" */
 #elif (EINPROGRESS != WSAEINPROGRESS)
+#pragma message "errno: EINPROGRESS(" ESTRINGIZE(EINPROGRESS) ") != WSAEINPROGRESS(" ESTRINGIZE(WSAEINPROGRESS) ")"
 #error Inconsistent EINPROGRESS definition ....
 #endif
 
@@ -460,6 +531,6 @@ __CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.17 2025/06/11 17:
 #define ELOOP           10062                   /* 10062 "Too many levels of symbolic links" */
 #endif
 
-#endif /*LIBW32_WIN32_ERRNO_H_INCLUDED*/
+#endif //LIBW32_ERRNO_WINSOCK
 
 /*end*/