Skip to content

Commit e89650e

Browse files
HenryHRichHenryHRich
committed
Merge branch 'master' of jsoftware.com:jsource
Fix +/\ +/\. mean/\ when applied to NaN
2 parents caeaa52 + 0e68308 commit e89650e

23 files changed

Lines changed: 149 additions & 115 deletions

‎jlibrary/system/main/regex.ijs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ NB. pcre2 library is in bin or tools/regex
180180
select. UNAME
181181
case. 'Win' do. t=. 'jpcre2.dll'
182182
case. 'Darwin' do. t=. 'libjpcre2.dylib'
183+
case. 'Android' do. pcre2dll=: 'libjpcre2.so' return.
183184
case. do. t=. 'libjpcre2.so'
184185
end.
185186

‎jlibrary/system/main/stdlib.ijs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ if. notdef 'UNAME' do.
4444
end.
4545
if. notdef 'LIBFILE' do.
4646
LIBFILE=: BINPATH,'/',IFUNIX{::'j.dll';(UNAME-:'Darwin'){::'libj.so';'libj.dylib'
47+
else.
48+
LIBFILE=: jpathsep LIBFILE
4749
end.
4850
if. notdef 'FHS' do.
4951
FHS=: IFUNIX>'/'e.LIBFILE

‎jsrc/cd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifdef _WIN32
66
// Tip o'hat to Michaelangel007 on StackOverflow
77
#define WIN32_LEAN_AND_MEAN
8-
#include <Windows.h>
8+
#include <windows.h>
99
#include <stdint.h> // portable: uint64_t MSVC: __int64
1010
#include "jerr.h"
1111

‎jsrc/va1.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,10 @@ AHDR1(absI2I,D,D){ // linkage requires D
219219
R 0xaaaaaaaa&_mm256_movemask_epi8(_mm256_castpd_si256(anyneg))?EVOFLO:EVOK; //any oflo
220220
)
221221
}
222-
#define XABSI2(u) ({ I2 us=(u)>>(BB*sizeof(I2)-1); u^=us; if(unlikely((u=(I2)((US)u-(US)us))<0))R EVOFLO; u; })
223-
#define XABSI4(u) ({ I4 us=(u)>>(BB*sizeof(I4)-1); u^=us; if(unlikely((u=(I4)((UI4)u-(UI4)us))<0))R EVOFLO; u; })
222+
#define XABSI2(u) ({ I2 us=(u)>>(BB*sizeof(I2)-1); u^=us; if(unlikely((u-=us)<0))R EVOFLO; u; })
223+
#define XABSI4(u) ({ I4 us=(u)>>(BB*sizeof(I4)-1); u^=us; if(unlikely((u-=us)<0))R EVOFLO; u; })
224+
// #define XABSI2(u) ({ I2 us=(u)>>(BB*sizeof(I2)-1); u^=us; if(unlikely((u=(I2)((US)u-(US)us))<0))R EVOFLO; u; })
225+
// #define XABSI4(u) ({ I4 us=(u)>>(BB*sizeof(I4)-1); u^=us; if(unlikely((u=(I4)((UI4)u-(UI4)us))<0))R EVOFLO; u; })
224226
static APF256C(3,abs,I2,I2,XABSI2)
225227
static APF256C(3,abs,I4,I4,XABSI4)
226228

‎make2/build_all.sh‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ set -e
55
cd "$(dirname "$0")"
66
echo "entering $(pwd)"
77

8-
./clean.sh "$1" || true
9-
./build_jconsole.sh
10-
./build_libj.sh
11-
./build_tsdll.sh
8+
unameop=$(uname -o || uname -s)
9+
eval "$(./jplatform64.sh)"
10+
jplatform64="$jplatform"/"$j64x"
11+
12+
jplatform=${jplatform} j64x=${j64x} ./clean.sh "$1" || true
13+
jplatform=${jplatform} j64x=${j64x} ./build_jconsole.sh
14+
jplatform=${jplatform} j64x=${j64x} ./build_libj.sh
15+
jplatform=${jplatform} j64x=${j64x} ./build_tsdll.sh
16+
jplatform=${jplatform} j64x=${j64x} ./cpbin.sh

‎make2/build_jamalgam.sh‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ else
119119
compiler=$(readlink -f $(which $CC) || which $CC)
120120
fi
121121
echo "compiler=$compiler"
122+
echo "$($CC --version)"
122123

123124
USE_OPENMP="${USE_OPENMP:=0}"
124125
if [ $USE_OPENMP -eq 1 ]; then
@@ -776,10 +777,10 @@ case $jplatform64 in
776777
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -Wno-psabi $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
777778
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -lpsapi -luuid $LDTHREAD $LDOPENMP "
778779
if [ $jolecom -eq 1 ]; then
779-
DLLOBJS=" jdll.o jdllcomx.o "
780+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
780781
LIBJDEF=" ../../../../dllsrc/jdll.def "
781782
else
782-
DLLOBJS=" jdll.o "
783+
DLLOBJS=" ../../../../dllsrc/jdll.o "
783784
LIBJDEF=" ../../../../dllsrc/jdll2.def "
784785
fi
785786
LIBJRES=" jdllres.o "
@@ -801,10 +802,10 @@ case $jplatform64 in
801802
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
802803
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
803804
if [ $jolecom -eq 1 ]; then
804-
DLLOBJS=" jdll.o jdllcomx.o "
805+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
805806
LIBJDEF=" ../../../../dllsrc/jdll.def "
806807
else
807-
DLLOBJS=" jdll.o "
808+
DLLOBJS=" ../../../../dllsrc/jdll.o "
808809
LIBJDEF=" ../../../../dllsrc/jdll2.def "
809810
fi
810811
LIBJRES=" jdllres.o "
@@ -827,10 +828,10 @@ case $jplatform64 in
827828
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
828829
CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
829830
if [ $jolecom -eq 1 ]; then
830-
DLLOBJS=" jdll.o jdllcomx.o "
831+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
831832
LIBJDEF=" ../../../../dllsrc/jdll.def "
832833
else
833-
DLLOBJS=" jdll.o "
834+
DLLOBJS=" ../../../../dllsrc/jdll.o "
834835
LIBJDEF=" ../../../../dllsrc/jdll2.def "
835836
fi
836837
LIBJRES=" jdllres.o "
@@ -854,10 +855,10 @@ case $jplatform64 in
854855
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
855856
CFLAGS_SIMD=" -march=skylake -mtune=skylake -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
856857
if [ $jolecom -eq 1 ]; then
857-
DLLOBJS=" jdll.o jdllcomx.o "
858+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
858859
LIBJDEF=" ../../../../dllsrc/jdll.def "
859860
else
860-
DLLOBJS=" jdll.o "
861+
DLLOBJS=" ../../../../dllsrc/jdll.o "
861862
LIBJDEF=" ../../../../dllsrc/jdll2.def "
862863
fi
863864
LIBJRES=" jdllres.o "
@@ -880,10 +881,10 @@ case $jplatform64 in
880881
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
881882
LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
882883
if [ $jolecom -eq 1 ]; then
883-
DLLOBJS=" jdll.o jdllcomx.o "
884+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
884885
LIBJDEF=" ../../../../dllsrc/jdll.def "
885886
else
886-
DLLOBJS=" jdll.o "
887+
DLLOBJS=" ../../../../dllsrc/jdll.o "
887888
LIBJDEF=" ../../../../dllsrc/jdll2.def "
888889
fi
889890
LIBJRES=" jdllres.o "
@@ -929,7 +930,7 @@ fi
929930
mkdir -p ../bin/$jplatform64
930931
mkdir -p obj/$jplatform64/
931932
cp makefile-jamalgam obj/$jplatform64/.
932-
export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform j64x jplatform64 WINDRES
933+
export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform j64x jplatform64
933934
cd obj/$jplatform64/
934935
if [ "x$MAKEFLAGS" = x'' ]; then
935936
if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then

‎make2/build_jconsole.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ else
110110
compiler=$(readlink -f $(which $CC) || which $CC)
111111
fi
112112
echo "compiler=$compiler"
113+
echo "$($CC --version)"
113114

114115
if [ -z "${compiler##*gcc*}" ] || [ -z "${CC##*gcc*}" ]; then
115116
# gcc

‎make2/build_jnative.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ else
9999
compiler=$(readlink -f $(which $CC) || which $CC)
100100
fi
101101
echo "compiler=$compiler"
102+
echo "$($CC --version)"
102103

103104
if [ -z "${compiler##*gcc*}" ] || [ -z "${CC##*gcc*}" ]; then
104105
# gcc

‎make2/build_libj.sh‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ else
120120
compiler=$(readlink -f $(which $CC) || which $CC)
121121
fi
122122
echo "compiler=$compiler"
123+
echo "$($CC --version)"
123124

124125
USE_OPENMP="${USE_OPENMP:=0}"
125126
if [ $USE_OPENMP -eq 1 ]; then
@@ -152,6 +153,7 @@ if [ -z "${compiler##*gcc*}" ] || [ -z "${CC##*gcc*}" ]; then
152153
# gcc
153154
common="$OPENMP -fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -fno-strict-aliasing -fwrapv -fno-stack-protector -flax-vector-conversions -ffp-contract=off \
154155
-Werror -Wextra -Wno-unknown-warning-option \
156+
-fsignaling-nans \
155157
-Wno-attributes \
156158
-Wno-cast-function-type \
157159
-Wno-clobbered \
@@ -730,16 +732,16 @@ case $jplatform64 in
730732
TARGET=j.dll
731733
# faster, but sse2 not available for 32-bit amd cpu
732734
# sse does not support mfpmath=sse in 32-bit gcc
733-
CFLAGS="$common -Wno-psabi -Wno-incompatible-pointer-types -m32 -msse2 -mfpmath=sse -fno-finite-math-only $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
735+
CFLAGS="$common -Wno-psabi -Wno-incompatible-pointer-types -m32 -msse2 -mfpmath=sse $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
734736
# slower, use 387 fpu and truncate extra precision
735737
# CFLAGS="$common -m32 -ffloat-store "
736738
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -Wno-psabi $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
737739
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -lpsapi -luuid $LDTHREAD $LDOPENMP "
738740
if [ $jolecom -eq 1 ]; then
739-
DLLOBJS=" jdll.o jdllcomx.o "
741+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
740742
LIBJDEF=" ../../../../dllsrc/jdll.def "
741743
else
742-
DLLOBJS=" jdll.o "
744+
DLLOBJS=" ../../../../dllsrc/jdll.o "
743745
LIBJDEF=" ../../../../dllsrc/jdll2.def "
744746
fi
745747
LIBJRES=" jdllres.o "
@@ -757,14 +759,14 @@ case $jplatform64 in
757759
fi
758760
WINDRES="${WINDRES:=windres}"
759761
TARGET=j.dll
760-
CFLAGS="$common -march=armv8-a+crc -Wno-incompatible-pointer-types -fno-finite-math-only -DNO_SHA_ASM $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
762+
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 "
761763
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
762764
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
763765
if [ $jolecom -eq 1 ]; then
764-
DLLOBJS=" jdll.o jdllcomx.o "
766+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
765767
LIBJDEF=" ../../../../dllsrc/jdll.def "
766768
else
767-
DLLOBJS=" jdll.o "
769+
DLLOBJS=" ../../../../dllsrc/jdll.o "
768770
LIBJDEF=" ../../../../dllsrc/jdll2.def "
769771
fi
770772
LIBJRES=" jdllres.o "
@@ -782,15 +784,15 @@ case $jplatform64 in
782784
fi
783785
WINDRES="${WINDRES:=windres}"
784786
TARGET=j.dll
785-
CFLAGS="$common -Wno-incompatible-pointer-types -fno-finite-math-only $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
787+
CFLAGS="$common -Wno-incompatible-pointer-types $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
786788
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 "
787789
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
788790
CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
789791
if [ $jolecom -eq 1 ]; then
790-
DLLOBJS=" jdll.o jdllcomx.o "
792+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
791793
LIBJDEF=" ../../../../dllsrc/jdll.def "
792794
else
793-
DLLOBJS=" jdll.o "
795+
DLLOBJS=" ../../../../dllsrc/jdll.o "
794796
LIBJDEF=" ../../../../dllsrc/jdll2.def "
795797
fi
796798
LIBJRES=" jdllres.o "
@@ -810,15 +812,15 @@ case $jplatform64 in
810812
fi
811813
WINDRES="${WINDRES:=windres}"
812814
TARGET=j.dll
813-
CFLAGS="$common -Wno-incompatible-pointer-types -fno-finite-math-only $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
815+
CFLAGS="$common -Wno-incompatible-pointer-types $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
814816
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
815817
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
816818
CFLAGS_SIMD=" -march=skylake -mtune=skylake -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
817819
if [ $jolecom -eq 1 ]; then
818-
DLLOBJS=" jdll.o jdllcomx.o "
820+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
819821
LIBJDEF=" ../../../../dllsrc/jdll.def "
820822
else
821-
DLLOBJS=" jdll.o "
823+
DLLOBJS=" ../../../../dllsrc/jdll.o "
822824
LIBJDEF=" ../../../../dllsrc/jdll2.def "
823825
fi
824826
LIBJRES=" jdllres.o "
@@ -837,14 +839,14 @@ case $jplatform64 in
837839
fi
838840
WINDRES="${WINDRES:=windres}"
839841
TARGET=j.dll
840-
CFLAGS="$common -Wno-incompatible-pointer-types -msse3 -fno-finite-math-only $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
842+
CFLAGS="$common -Wno-incompatible-pointer-types -msse3 $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
841843
CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
842844
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
843845
if [ $jolecom -eq 1 ]; then
844-
DLLOBJS=" jdll.o jdllcomx.o "
846+
DLLOBJS=" ../../../../dllsrc/jdll.o ../../../../dllsrc/jdllcomx.o "
845847
LIBJDEF=" ../../../../dllsrc/jdll.def "
846848
else
847-
DLLOBJS=" jdll.o "
849+
DLLOBJS=" ../../../../dllsrc/jdll.o "
848850
LIBJDEF=" ../../../../dllsrc/jdll2.def "
849851
fi
850852
LIBJRES=" jdllres.o "
@@ -883,7 +885,7 @@ fi
883885
mkdir -p ../bin/$jplatform64
884886
mkdir -p obj/$jplatform64/
885887
cp makefile-libj obj/$jplatform64/.
886-
export CC AR CFLAGS CPPFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_ASM SRC_ASM jplatform j64x jplatform64 WINDRES LDFLAGS_b
888+
export CC AR CFLAGS CPPFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES WINDRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_SIMDUTF8 OBJS_ASM SRC_ASM jplatform j64x jplatform64 WINDRES LDFLAGS_b
887889
cd obj/$jplatform64/
888890
if [ "x$MAKEFLAGS" = x'' ]; then
889891
if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then

‎make2/build_tsdll.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ else
9292
compiler=$(readlink -f $(which $CC) || which $CC)
9393
fi
9494
echo "compiler=$compiler"
95+
echo "$($CC --version)"
9596

9697
if [ -z "${compiler##*gcc*}" ] || [ -z "${CC##*gcc*}" ]; then
9798
# gcc
@@ -246,12 +247,14 @@ case $jplatform64 in
246247
TARGET=tsdll.dll
247248
CFLAGS="$common -Wno-psabi -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
248249
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -m32 -lm -static-libgcc -static-libstdc++ "
250+
LIBJDEF=" ../../../../makevs/tsdll/tsdll.def "
249251
;;
250252

251253
windows/j64*) # windows intel 64bit
252254
TARGET=tsdll.dll
253255
CFLAGS="$common -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
254256
LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ "
257+
LIBJDEF=" ../../../../makevs/tsdll/tsdll.def "
255258
;;
256259

257260
*)
@@ -265,7 +268,7 @@ echo "CFLAGS=$CFLAGS"
265268
mkdir -p ../bin/$jplatform64
266269
mkdir -p obj/$jplatform64/
267270
cp makefile-tsdll obj/$jplatform64/.
268-
export CC AR CFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a jplatform j64x jplatform64
271+
export CC AR CFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a LIBJDEF jplatform j64x jplatform64
269272
cd obj/$jplatform64/
270273
if [ "x$MAKEFLAGS" = x'' ]; then
271274
if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then

0 commit comments

Comments
 (0)