diff options
Diffstat (limited to 'lang/J/files/patch-make_build__libj.sh')
| -rw-r--r-- | lang/J/files/patch-make_build__libj.sh | 71 |
1 files changed, 18 insertions, 53 deletions
diff --git a/lang/J/files/patch-make_build__libj.sh b/lang/J/files/patch-make_build__libj.sh index c35af47fb73a..ed409dc08a90 100644 --- a/lang/J/files/patch-make_build__libj.sh +++ b/lang/J/files/patch-make_build__libj.sh @@ -1,4 +1,4 @@ ---- make/build_libj.sh.orig 2018-02-24 19:49:42 UTC +--- make/build_libj.sh.orig 2018-04-09 18:12:26 UTC +++ make/build_libj.sh @@ -1,7 +1,6 @@ #!/usr/local/bin/bash @@ -9,69 +9,34 @@ # gcc 5 vs 4 - killing off linux asm routines (overflow detection) # new fast code uses builtins not available in gcc 4 -@@ -38,10 +37,10 @@ fi - - if [ "x$COMPILER" = x'gcc' ] ; then - # gcc --common="$OPENMP -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value" -+common="$OPENMP -fPIC -fwrapv -fno-strict-aliasing -Wextra -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-clobbered -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-shift-negative-value" - else - # clang 3.5 .. 5.0 --common="$OPENMP -Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int" -+common="$OPENMP -Werror -fPIC -fwrapv -fno-strict-aliasing -Wextra -Wno-consumed -Wno-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int" - fi - darwin="$OPENMP -fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced" - -@@ -55,19 +54,19 @@ TARGET=libj.so - COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC " - # slower, use 387 fpu and truncate extra precision - # COMPILE="$common -m32 -ffloat-store " --LINK=" -shared -Wl,-soname,libj.so -m32 -lm -ldl $LDOPENMP32 -o libj.so " -+LINK=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 -o libj.so " - ;; - - linux_j64) # linux intel 64bit - TARGET=libj.so - COMPILE="$common " --LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so " -+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so " - ;; +@@ -15,6 +14,8 @@ common="-fPIC -O1 -fno-if-conversion2 -f + # clang + # common="-Werror -fPIC -O1 -fwrapv -fno-strict-aliasing -Wextra -Wno-clobbered -Wno-maybe-uninitialized -Wno-unused-parameter -Wno-sign-compare -Wno-empty-body -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-unsequenced -Wno-string-plus-int" + darwin="-fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced" ++freebsd="-fPIC -O1 -fwrapv -fno-strict-aliasing -Wno-string-plus-int -Wno-empty-body -Wno-unsequenced -Wno-unused-value -Wno-pointer-sign -Wno-parentheses -Wno-return-type -Wno-constant-logical-operand -Wno-comment -Wno-unsequenced" ++ - linux_j64avx) # linux intel 64bit avx - TARGET=libj.so - COMPILE="$common -mavx -DC_AVX=1 " --LINK=" -shared -Wl,-soname,libj.so -lm -ldl $LDOPENMP -o libj.so " -+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so " - OBJS_FMA=" blis/gemm_int-fma.o " - ;; + case $jplatform\_$1 in -@@ -102,6 +101,29 @@ LINK=" -dynamiclib -lm -ldl $LDOPENMP -m - OBJS_FMA=" blis/gemm_int-fma.o " +@@ -50,6 +51,21 @@ TARGET=libj.dylib + COMPILE="$darwin -mmacosx-version-min=10.5" + LINK=" -dynamiclib -lm -ldl -mmacosx-version-min=10.5 -o libj.dylib" ;; - ++ +freebsd_j32) # freebsd x86 +TARGET=libj.so +# faster, but sse2 not available for 32-bit amd cpu +# sse does not support mfpmath=sse in 32-bit gcc -+COMPILE="$common -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC " ++COMPILE="$freebsd -m32 -msse2 -mfpmath=sse -DC_NOMULTINTRINSIC " +# slower, use 387 fpu and truncate extra precision -+# COMPILE="$common -m32 -ffloat-store " -+LINK=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 -o libj.so " ++# COMPILE="$freebsd -m32 -ffloat-store " ++LINK=" -shared -Wl,-soname,libj.so -m32 -lm -o libj.so " +;; -+ -+freebsd_j64) # freebsd intel 64bit ++freebsd_j64) # freebsd x86 +TARGET=libj.so -+COMPILE="$common " -+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so " ++COMPILE="$freebsd -DC_NOMULTINTRINSIC " ++LINK=" -shared -Wl,-soname,libj.so -lm -o libj.so " +;; -+ -+freebsd_j64avx) # freebsd intel 64bit avx -+TARGET=libj.so -+COMPILE="$common -mavx -DC_AVX=1 " -+LINK=" -shared -Wl,-soname,libj.so -lm $LDOPENMP -o libj.so " -+OBJS_FMA=" blis/gemm_int-fma.o " -+;; -+ *) echo no case for those parameters exit |