typo

jsoftware · Oct 29, 2024 · 151cf19 · 151cf19
1 parent 5a227ef
commit 151cf19
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 40 deletions.
diff --git a/.github/workflows/jsource.yml b/.github/workflows/jsource.yml
@@ -945,6 +945,7 @@ jobs:
       script\buildga.cmd arm64
 
    - name: Test JE (Windows arm64)
+     if: ${{ false }}
      shell: cmd
      run: |
       script\testga.cmd arm64

diff --git a/makemsvc/jamalgam/makefile.win b/makemsvc/jamalgam/makefile.win
@@ -5,18 +5,18 @@ FAVX2= /DC_AVX2=1 -DHAVE_AVX2=1 -DBASE64_AVX2_USE_ASM=1 -march=haswell -mno-vzer
 !endif
 !if "1"=="$(USE_OPENMP)"
 FOPENMP= -Xclang -fopenmp
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 OBJS_OPENMP=../../openmp/obj/windows/libomparm64.lib
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 OBJS_OPENMP=../../openmp/obj/windows/libomp.lib
 !else
 OBJS_OPENMP=../../openmp/obj/windows/libomp32.lib
 !endif
 !endif
 USE_SLEEF=1
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 FSLEEF= /DSLEEF=1 /DENABLE_ADVSIMD /DSLEEF_STATIC_LIBS /DDORENAME=1 -I../../sleef/src/common -I../../sleef/src/arch
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 !if "1"=="$(JAVX512)"
 FSLEEF= /DSLEEF=1 /DENABLE_AVX2 /DSLEEF_STATIC_LIBS /DDORENAME=1 -I../../sleef/src/common -I../../sleef/src/arch
 !elseif "1"=="$(JAVX2)"
@@ -29,19 +29,19 @@ FSLEEF= /DSLEEF=1 /DENABLE_SSE2 /DSLEEF_STATIC_LIBS /DDORENAME=1 -I../../sleef/s
 !endif
 !if "1"=="$(USE_PYXES)"
 PTHREADINC = -I../../pthreads4w/include -DPYXES=1
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 PTHREADLIB = ../../pthreads4w/lib/pthreadVC3-arm64.lib
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 PTHREADLIB = ../../pthreads4w/lib/pthreadVC3.lib
 !else
 PTHREADLIB = ../../pthreads4w/lib/pthreadVC3-w32.lib
 !endif
 !endif
 MPIRINC = -I../../mpir/include
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 # MPIRLIB = ../../mpir/dll/arm64/mpir.lib
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 # MPIRLIB = ../../mpir/dll/x64/mpir.lib
 !else
 # MPIRLIB = ../../mpir/dll/win32/mpir.lib
@@ -58,12 +58,12 @@ LDEBUG = /DEBUG
 FBOXEDSPARSE = /DBOXEDSPARSE
 !endif
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 CF1= -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
 CFLAGS= $(FDEBUG) -target arm64-pc-windows-msvc /D JAMALGAM /DC_NA=0 /DEMU_AVX2=1 $(FAVX2) $(FAVX512) $(FOPENMP) $(FSLEEF) $(FNOSYNCHLIB) $(FBOXEDSPARSE) $(PTHREADINC) $(MPIRINC) /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
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "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
 CFLAGS= $(FDEBUG) /D JAMALGAM /DC_NA=0 /DEMU_AVX2=1 $(FAVX2) $(FAVX512) $(FOPENMP) $(FSLEEF) $(FNOSYNCHLIB) $(FBOXEDSPARSE) $(PTHREADINC) $(MPIRINC) /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
@@ -261,14 +261,14 @@ OBJS=  \
 
 !ifdef NO_SHA_ASM
 CFLAGS1= /D NO_SHA_ASM
-!elseif "ARM64"==$(TARGET_CPU)"
+!elseif "ARM64"=="$(TARGET_CPU)"
 OBJS_ASM= \
  ../../openssl-asm/md5-aarch64-nasm.o \
  ../../openssl-asm/keccak1600-armv8-nasm.o \
  ../../openssl-asm/sha1-armv8-nasm.o \
  ../../openssl-asm/sha256-armv8-nasm.o \
  ../../openssl-asm/sha512-armv8-nasm.o "
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 OBJS_ASM= \
  ../../openssl-asm/md5-x86_64-nasm.o \
  ../../openssl-asm/keccak1600-x86_64-nasm.o \
@@ -321,9 +321,9 @@ LD=link
 .asm.o:
 	$(ML) $(ASMFLAGS) /Fo$@ /c $<
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 TARGET= jamalgam-arm64.exe
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 !if "1"=="$(JAVX2)"
 TARGET= jamalgam-avx2.exe
 !else

diff --git a/makemsvc/jconsole/makefile.win b/makemsvc/jconsole/makefile.win
@@ -8,11 +8,11 @@ FDEBUG = /FS /Zi /DDEBUG=1
 LDEBUG = /DEBUG
 !endif
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 CF1= -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -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
 CFLAGS= $(PTHREADINC) $(MPIRINC) $(FDEBUG) -target arm64-pc-windows-msvc /DEMU_AVX2=1 /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /STACK:0xc00000 /MACHINE:ARM64 /SUBSYSTEM:CONSOLE,5.02
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 CF1= -maes -msse3 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -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
 CFLAGS= $(PTHREADINC) $(MPIRINC) $(FDEBUG) /DEMU_AVX2=1 /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /STACK:0xc00000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
@@ -42,9 +42,9 @@ LD=lld-link
 .c.o:
 	$(CC) $(CFLAGS) $(CFLAGSLN) /Fo$@ /c $<
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 TARGET= jconsolearm64.exe
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 TARGET= jconsole.exe
 !else
 TARGET= jconsole32.exe

diff --git a/makemsvc/jdll/makefile.win b/makemsvc/jdll/makefile.win
@@ -5,18 +5,18 @@ FAVX2= /DC_AVX2=1 -DHAVE_AVX2=1 -DBASE64_AVX2_USE_ASM=1 -march=haswell -mno-vzer
 !endif
 !if "1"=="$(USE_OPENMP)"
 FOPENMP= -Xclang -fopenmp
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 OBJS_OPENMP=../../openmp/obj/windows/libomparm64.lib
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 OBJS_OPENMP=../../openmp/obj/windows/libomp.lib
 !else
 OBJS_OPENMP=../../openmp/obj/windows/libomp32.lib
 !endif
 !endif
 USE_SLEEF=1
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 FSLEEF= /DSLEEF=1 /DENABLE_ADVSIMD /DSLEEF_STATIC_LIBS /DDORENAME=1 -I../../sleef/src/common -I../../sleef/src/arch
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 !if "1"=="$(JAVX512)"
 FSLEEF= /DSLEEF=1 /DENABLE_AVX2 /DSLEEF_STATIC_LIBS /DDORENAME=1 -I../../sleef/src/common -I../../sleef/src/arch
 !elseif "1"=="$(JAVX2)"
@@ -29,19 +29,19 @@ FSLEEF= /DSLEEF=1 /DENABLE_SSE2 /DSLEEF_STATIC_LIBS /DDORENAME=1 -I../../sleef/s
 !endif
 !if "1"=="$(USE_PYXES)"
 PTHREADINC = -I../../pthreads4w/include -DPYXES=1
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 PTHREADLIB = ../../pthreads4w/lib/pthreadVC3-arm64.lib
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 PTHREADLIB = ../../pthreads4w/lib/pthreadVC3.lib
 !else
 PTHREADLIB = ../../pthreads4w/lib/pthreadVC3-w32.lib
 !endif
 !endif
 MPIRINC = -I../../mpir/include
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 # MPIRLIB = ../../mpir/dll/arm64/mpir.lib
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 # MPIRLIB = ../../mpir/dll/x64/mpir.lib
 !else
 # MPIRLIB = ../../mpir/dll/win32/mpir.lib
@@ -58,12 +58,12 @@ LDEBUG = /DEBUG
 FBOXEDSPARSE = /DBOXEDSPARSE
 !endif
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 CF1= -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
 CFLAGS= $(FDEBUG) -target arm64-pc-windows-msvc /D_JDLL /DC_NA=0 /DEMU_AVX2=1 $(FAVX2) $(FAVX512) $(FOPENMP) $(FSLEEF) $(FNOSYNCHLIB) $(FBOXEDSPARSE) $(PTHREADINC) $(MPIRINC) /WX /W3 /O2 /GS- /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /DLL /MACHINE:ARM64 /SUBSYSTEM:WINDOWS,10.0
 ASMFLAGS= /Cx
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "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
 CFLAGS= $(FDEBUG) /D_JDLL /DC_NA=0 /DEMU_AVX2=1 $(FAVX2) $(FAVX512) $(FOPENMP) $(FSLEEF) $(FNOSYNCHLIB) $(FBOXEDSPARSE) $(PTHREADINC) $(MPIRINC) /WX /W3 /O2 /GS- /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /DLL /MACHINE:X64 /SUBSYSTEM:WINDOWS,10.0
@@ -258,14 +258,14 @@ OBJS=  \
 
 !ifdef NO_SHA_ASM
 CFLAGS1= /DNO_SHA_ASM
-!elseif "ARM64"==$(TARGET_CPU)"
+!elseif "ARM64"=="$(TARGET_CPU)"
 OBJS_ASM= \
  ../../openssl-asm/md5-aarch64-nasm.o \
  ../../openssl-asm/keccak1600-armv8-nasm.o \
  ../../openssl-asm/sha1-armv8-nasm.o \
  ../../openssl-asm/sha256-armv8-nasm.o \
  ../../openssl-asm/sha512-armv8-nasm.o "
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 OBJS_ASM= \
  ../../openssl-asm/md5-x86_64-nasm.o \
  ../../openssl-asm/keccak1600-x86_64-nasm.o \
@@ -316,9 +316,9 @@ LD=lld-link
 .asm.o:
 	$(ML) $(ASMFLAGS) /Fo$@ /c $<
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 TARGET= jarm64.exe
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 !if "1"=="$(JAVX512)"
 TARGET= javx512.dll
 !elseif "1"=="$(JAVX2)"

diff --git a/makemsvc/jnative/makefile.win b/makemsvc/jnative/makefile.win
@@ -2,11 +2,11 @@
 FDEBUG = /FS /Zi /DDEBUG=1
 LDEBUG = /DEBUG
 !endif
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 CF1= -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -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
 CFLAGS= $(FDEBUG) -target arm64-pc-windows-msvc /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /DLL /MACHINE:ARM64 /SUBSYSTEM:WINDOWS,5.02
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 CF1= -maes -msse3 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -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
 CFLAGS= $(FDEBUG) /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /DLL /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
@@ -29,9 +29,9 @@ LD=lld-link
 .c.o:
 	$(CC) $(CFLAGS) /I "%JAVA_HOME%/include" /I "%JAVA_HOME%/include/win32" /Fo$@ /c $<
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 TARGET= jnativearm64.dll
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 TARGET= jnative.dll
 !else
 TARGET= jnative32.dll

diff --git a/makemsvc/tsdll/makefile.win b/makemsvc/tsdll/makefile.win
@@ -2,11 +2,11 @@
 FDEBUG = /FS /Zi /DDEBUG=1
 LDEBUG = /DEBUG
 !endif
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 CF1= -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -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
 CFLAGS= $(FDEBUG) -target arm64-pc-windows-msvc /WX /W3 /Ot /Ob1 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /DLL /MACHINE:ARM64 /SUBSYSTEM:WINDOWS,5.02
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 CF1= -maes -msse3 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -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
 CFLAGS= $(FDEBUG) /WX /W3 /Ot /Ob1 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
 FLAGS= $(LDEBUG) /DLL /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
@@ -29,9 +29,9 @@ LD=lld-link
 .c.o:
 	$(CC) $(CFLAGS) /Fo$@ /c $<
 
-!if "ARM64"==$(TARGET_CPU)"
+!if "ARM64"=="$(TARGET_CPU)"
 TARGET= tsdllarm64.dll
-!elseif "x64"==$(TARGET_CPU)"
+!elseif "x64"=="$(TARGET_CPU)"
 TARGET= tsdll.dll
 !else
 TARGET= tsdll32.dll