pthreads4w src

Author: bilam

.github/workflows/jsource.yml

@@ -1296,7 +1296,7 @@ jobs:
       WINDRES: windres
       USE_SLEEF: 1
       USE_OPENMP: 0
-      USE_PYXES: 0
+      USE_PYXES: 1
       USE_EMU_AVX: 1
       _DEBUG: 0
      run: |
@@ -1305,7 +1305,7 @@ jobs:
    - name: Test JE (Windows MSYS2 x64)
      shell: msys2 {0}
      env:
-      USE_PYXES: 0
+      USE_PYXES: 1
       USE_EMU_AVX: 1
       _DEBUG: 0
      run: |

.gitignore

@@ -72,3 +72,6 @@ jlibrary/
 
 # misc
 jsrc/toc.txt
+pthreads4w/src/
+makemsvc/jdll/*.asm
+makemsvc/jamalgam/*.asm

make2/build_jamalgam.sh

@@ -271,15 +271,27 @@ if [ $USE_PYXES -eq 1 ]; then
  case "$jplatform/$j64x" in
   windows/j32*)
    common="$common -DPYXES=1 -I../pthreads4w/include"
-   LDTHREAD=" ../pthreads4w/lib/pthreadVC3-w32.lib "
+   if [ -n "$PTHREADS4WSRC" ]; then
+    OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
+   else
+    LDTHREAD=" ../pthreads4w/lib/pthreadVC3-w32.lib "
+   fi
    ;;
   windows/j64arm)
    common="$common -DPYXES=1 -I../pthreads4w/include"
-   LDTHREAD=" ../pthreads4w/lib/pthreadVC3-arm64.lib "
+   if [ -n "$PTHREADS4WSRC" ]; then
+    OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
+   else
+    LDTHREAD=" ../pthreads4w/lib/pthreadVC3-arm64.lib "
+   fi
    ;;
   windows/*)
    common="$common -DPYXES=1 -I../pthreads4w/include"
-   LDTHREAD=" ../pthreads4w/lib/pthreadVC3.lib "
+   if [ -n "$PTHREADS4WSRC" ]; then
+    OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
+   else
+    LDTHREAD=" ../pthreads4w/lib/pthreadVC3.lib "
+   fi
    ;;
   *)
    common="$common -DPYXES=1"
@@ -560,6 +572,7 @@ case "$jplatform/$j64x" in
   CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
   OBJS_FMA=" blis/gemm_int-fma.o "
   OBJS_AESNI=" aes-ni.o "
+  OBJS_SIMDUTF8="${OBJS_SIMDUTF8_ASM}"
   SRC_ASM="${SRC_ASM_LINUXAVX512}"
   NASM_FLAGS="$NASM_FLAGS -felf64"
   GASM_FLAGS=""
@@ -638,6 +651,7 @@ case "$jplatform/$j64x" in
   CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
   OBJS_FMA=" blis/gemm_int-fma.o "
   OBJS_AESNI=" aes-ni.o "
+  OBJS_SIMDUTF8="${OBJS_SIMDUTF8_ASM}"
   SRC_ASM="${SRC_ASM_LINUXAVX512}"
   NASM_FLAGS="$NASM_FLAGS -felf64"
   GASM_FLAGS=""
@@ -697,6 +711,7 @@ case "$jplatform/$j64x" in
   CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
   OBJS_FMA=" blis/gemm_int-fma.o "
   OBJS_AESNI=" aes-ni.o "
+  OBJS_SIMDUTF8="${OBJS_SIMDUTF8_ASM}"
   SRC_ASM="${SRC_ASM_LINUXAVX512}"
   NASM_FLAGS="$NASM_FLAGS -felf64"
   GASM_FLAGS=""
@@ -742,6 +757,7 @@ case "$jplatform/$j64x" in
   CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
   OBJS_FMA=" blis/gemm_int-fma.o "
   OBJS_AESNI=" aes-ni.o "
+  OBJS_SIMDUTF8="${OBJS_SIMDUTF8_ASM}"
   SRC_ASM="${SRC_ASM_MAC}"
   NASM_FLAGS="$NASM_FLAGS -felf64"
   GASM_FLAGS="$macmin"
@@ -970,7 +986,7 @@ if [ ! -f ../jsrc/jversion.h ]; then
 fi
 
 mkdir -p ../bin/$jplatform/$j64x
-export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform j64x
+export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_PTHREADS4 WOBJS_ASM SRC_ASM OBJSLN jplatform j64x
 if [ "x$MAKEFLAGS" = x'' ]; then
  if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then
   par=$(nproc)

make2/build_libj.sh

@@ -276,15 +276,27 @@ if [ $USE_PYXES -eq 1 ]; then
  case "$jplatform/$j64x" in
   windows/j32*)
    common="$common -DPYXES=1 -I../pthreads4w/include"
-   LDTHREAD=" ../pthreads4w/lib/pthreadVC3-w32.lib "
+   if [ -n "$PTHREADS4WSRC" ]; then
+    OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
+   else
+    LDTHREAD=" ../pthreads4w/lib/pthreadVC3-w32.lib "
+   fi
    ;;
   windows/j64arm)
    common="$common -DPYXES=1 -I../pthreads4w/include"
-   LDTHREAD=" ../pthreads4w/lib/pthreadVC3-arm64.lib "
+   if [ -n "$PTHREADS4WSRC" ]; then
+    OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
+   else
+    LDTHREAD=" ../pthreads4w/lib/pthreadVC3-arm64.lib "
+   fi
    ;;
   windows/*)
    common="$common -DPYXES=1 -I../pthreads4w/include"
-   LDTHREAD=" ../pthreads4w/lib/pthreadVC3.lib "
+   if [ -n "$PTHREADS4WSRC" ]; then
+    OBJS_PTHREADS4W=" ../pthreads4w/src/pthread.o "
+   else
+    LDTHREAD=" ../pthreads4w/lib/pthreadVC3.lib "
+   fi
    ;;
   *)
    common="$common -DPYXES=1"
@@ -769,8 +781,7 @@ case "$jplatform/$j64x" in
   # slower, use 387 fpu and truncate extra precision
   # CFLAGS="$common -m32 -ffloat-store "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -Wno-psabi $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
-  # windows j32 still needs libwinpthread-1.dll even with the static switch
-  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -lpsapi -luuid $LDTHREAD $LDOPENMP "
+  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -lpsapi -luuid $LDTHREAD $LDOPENMP "
   if [ $jolecom -eq 1 ]; then
    DLLOBJS=" ../dllsrc/jdll.o ../dllsrc/jdllcomx.o "
    LIBJDEF=" ../dllsrc/jdll.def "
@@ -796,7 +807,7 @@ case "$jplatform/$j64x" in
   TARGET=j.dll
   CFLAGS="$common -march=armv8-a+crc -Wno-incompatible-pointer-types -DNO_SHA_ASM $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
-  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
+  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   if [ $jolecom -eq 1 ]; then
    DLLOBJS=" ../dllsrc/jdll.o ../dllsrc/jdllcomx.o "
    LIBJDEF=" ../dllsrc/jdll.def "
@@ -821,7 +832,7 @@ case "$jplatform/$j64x" in
   TARGET=j.dll
   CFLAGS="$common -Wno-incompatible-pointer-types $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
-  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
+  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
   if [ $jolecom -eq 1 ]; then
    DLLOBJS=" ../dllsrc/jdll.o ../dllsrc/jdllcomx.o "
@@ -850,7 +861,7 @@ case "$jplatform/$j64x" in
   TARGET=j.dll
   CFLAGS="$common -Wno-incompatible-pointer-types $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
-  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
+  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   CFLAGS_SIMD=" -march=skylake -mtune=skylake -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
   if [ $jolecom -eq 1 ]; then
    DLLOBJS=" ../dllsrc/jdll.o ../dllsrc/jdllcomx.o "
@@ -878,7 +889,7 @@ case "$jplatform/$j64x" in
   TARGET=j.dll
   CFLAGS="$common -Wno-incompatible-pointer-types -msse3 $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
-  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
+  LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -Wl,-Bstatic -Wl,-Bdynamic -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   if [ $jolecom -eq 1 ]; then
    DLLOBJS=" ../dllsrc/jdll.o ../dllsrc/jdllcomx.o "
    LIBJDEF=" ../dllsrc/jdll.def "
@@ -921,7 +932,7 @@ if [ ! -f ../jsrc/jversion.h ]; then
 fi
 
 mkdir -p ../bin/$jplatform/$j64x
-export CC AR CFLAGS CPPFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a CFLAGS_SIMD GASM_FLAGS NASM NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_ASM SRC_ASM jplatform j64x WINDRES LDFLAGS_b
+export CC AR CFLAGS CPPFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a CFLAGS_SIMD GASM_FLAGS NASM NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_PTHREADS4W OBJS_ASM SRC_ASM jplatform j64x WINDRES LDFLAGS_b
 if [ "x$MAKEFLAGS" = x'' ]; then
  if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then
   par=$(nproc)

make2/makefile-jamalgam

@@ -192,8 +192,8 @@ ifneq (windows,$(findstring windows,$(jplatform)))
 $(ODIR)/$(TARGET) : $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(SRC_ASM) $(OBJSLN) $(BACKTRACE_OBJS)
 	$(CC) -o $@ $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_ASM) $(SRC_ASM) $(LDFLAGS) $(OBJSLN) $(BACKTRACE_OBJS)
 else
-$(ODIR)/$(TARGET) : $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES) $(OBJSLN) $(BACKTRACE_OBJS)
-	$(CXX) -o $@ $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_ASM) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES) $(LDFLAGS) $(OBJSLN) $(BACKTRACE_OBJS)
+$(ODIR)/$(TARGET) : $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES) $(OBJSLN) $(BACKTRACE_OBJS)
+	$(CXX) -o $@ $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(OBJS_ASM) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES) $(LDFLAGS) $(OBJSLN) $(BACKTRACE_OBJS)
 endif
 
 %.res: %.rc

make2/makefile-libj

@@ -190,8 +190,8 @@ ifneq (windows,$(findstring windows,$(jplatform)))
 $(ODIR)/$(TARGET) : $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(SRC_ASM)
 	$(CC) -o $@ $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_ASM) $(SRC_ASM) $(LDFLAGS)
 else
-$(ODIR)/$(TARGET) : $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES)
-	$(CXX) -o $@ $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_ASM) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES) $(LDFLAGS)
+$(ODIR)/$(TARGET) : $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES)
+	$(CXX) -o $@ $(OBJS) $(OBJS_BASE64) $(OBJS_FMA) $(OBJS_AESNI) $(OBJS_AESARM) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(OBJS_ASM) $(SRC_ASM) $(DLLOBJS) $(LIBJDEF) $(LIBJRES) $(LDFLAGS)
 endif
 endif
 

makemsvc/jamalgam/makefile

@@ -58,11 +58,23 @@ ifeq (1,$(USE_OPENMP))
 endif
 ifeq (1,$(USE_PYXES))
  ifeq (arm64,$(TARGET_CPU))
-  PTHREADLIB = ../pthreads4w/lib/pthreadVC3-arm64.lib
+  ifneq ($(PTHREADS4WSRC),)
+   OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
+  else
+    PTHREADLIB = ../pthreads4w/lib/pthreadVC3-arm64.lib
+  endif
  else ifeq (x64,$(TARGET_CPU))
-  PTHREADLIB = ../pthreads4w/lib/pthreadVC3.lib
+  ifneq ($(PTHREADS4WSRC),)
+   OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
+  else
+    PTHREADLIB = ../pthreads4w/lib/pthreadVC3.lib
+  endif
  else
-  PTHREADLIB = ../pthreads4w/lib/pthreadVC3-w32.lib
+  ifneq ($(PTHREADS4WSRC),)
+   OBJS_PTHREADS4W = ../pthreads4w/src/pthread.o
+  else
+   PTHREADLIB = ../pthreads4w/lib/pthreadVC3-w32.lib
+  endif
  endif
 endif
 
@@ -102,18 +114,18 @@ ifeq (x64,$(TARGET_CPU))
 endif
 
 ifeq (arm64,$(TARGET_CPU))
- CF1 = -target arm64-pc-windows-msvc -march=armv8-a+crc+crypto -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-null-pointer-arithmetic -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor -Wno-deprecated-non-prototype -Wno-unused-variable
+ CF1 = -target arm64-pc-windows-msvc -march=armv8-a+crc+crypto -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-null-pointer-arithmetic -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor -Wno-deprecated-non-prototype -Wno-unused-variable -Wno-single-bit-bitfield-constant-conversion
  CFLAGS = $(COPTION) $(CINCLUDE) /DHAVE_NEON64=1 /D JAMALGAM /DC_NA=0 /WX /W3 /O2 /GS- /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
  FLAGS = $(LDEBUG) /NOLOGO /STACK:0xc00000 /MACHINE:ARM64 /SUBSYSTEM:CONSOLE,5.02
  ASMFLAGS = /Cx
 else ifeq (x64,$(TARGET_CPU))
- CF1 = -maes -msse3 -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-null-pointer-arithmetic -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor -Wno-deprecated-non-prototype -Wno-unused-variable
+ CF1 = -maes -msse3 -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-null-pointer-arithmetic -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor -Wno-deprecated-non-prototype -Wno-unused-variable -Wno-single-bit-bitfield-constant-conversion
  CFLAGS = $(COPTION) $(CINCLUDE) /D JAMALGAM /DC_NA=0 /WX /W3 /O2 /GS- /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
  FLAGS = $(LDEBUG) /NOLOGO /STACK:0xc00000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
  ASMFLAGS = /Cx
  NASM_FLAGS = -fwin64
 else
- CF1 = -m32 -maes -msse2 -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-null-pointer-arithmetic -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor -Wno-deprecated-non-prototype -Wno-unused-variable
+ CF1 = -m32 -maes -msse2 -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-null-pointer-arithmetic -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor -Wno-deprecated-non-prototype -Wno-unused-variable -Wno-single-bit-bitfield-constant-conversion
 # /Og fail g310r
 # /Oy crash ]^:_"1[0
  CFLAGS = $(COPTION) $(CINCLUDE) /D JAMALGAM /WX /W3 /O2 /GS- /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
@@ -388,15 +400,15 @@ else
  SYNCLIB = synchronization.lib
 endif
 
-$(ODIR)/$(TARGET) : $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(ASM) $(PTHREADLIB) $(RCS)
-	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(ASM) $(PTHREADLIB) $(RCS) $(MPIRLIB) ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB) $(LOPENMP)
+$(ODIR)/$(TARGET) : $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(ASM) $(PTHREADLIB) $(RCS)
+	$(LD) /NOLOGO /DEF:$(DEF) $(FLAGS) /out:$@ $(OBJS) $(OBJSLN) $(SRC_ASM) $(OBJS_ASM) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(ASM) $(PTHREADLIB) $(RCS) $(MPIRLIB) ole32.lib advapi32.lib oleaut32.lib onecore.lib $(SYNCLIB) $(LOPENMP)
 
 all : $(ODIR)/$(TARGET)
 
 noclean :
 	#
 
 clean :
-	rm -f $(ODIR)/*.lib $(ODIR)/*.exp $(ODIR)/*.ilk $(ODIR)/*.pdb $(OBJS) $(OBJSLN) $(OBJS_SIMDUTF8) $(SRC_ASM) $(RCS)
+	rm -f $(ODIR)/*.lib $(ODIR)/*.exp $(ODIR)/*.ilk $(ODIR)/*.pdb $(OBJS) $(OBJSLN) $(OBJS_SIMDUTF8) $(OBJS_PTHREADS4W) $(SRC_ASM) $(RCS)
 
 .PHONY: all clean nonclean