Skip to content

Commit 3aebc12

Browse files
bilambilam
committed
raspberry
1 parent bb1d3b6 commit 3aebc12

File tree

3 files changed

+17
-29
lines changed

3 files changed

+17
-29
lines changed

‎.github/workflows/jsource.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@ jobs:
538538
# rpi64 debug ----------------------------------------------------------
539539
jerpi64d:
540540
name: JE (Raspberry deubg)
541-
if: ${{ false }}
542541
runs-on: ubuntu-latest
543542
steps:
544543
- name: Checkout Git repository
@@ -594,7 +593,6 @@ jobs:
594593
# rpi32 debug ----------------------------------------------------------
595594
jerpi32d:
596595
name: JE (Raspberry32 debug)
597-
if: ${{ false }}
598596
runs-on: ubuntu-latest
599597
steps:
600598
- name: Checkout Git repository
@@ -1305,7 +1303,7 @@ jobs:
13051303
name: Test Results
13061304
runs-on: ubuntu-22.04
13071305
# needs: [jelinux, jelinux-gcc, jemacos, jerpi64, jerpi32, jewin, jewin32, jeandroid, jefreebsd2, jefreebsdarm64, jeopenbsd2, jeopenbsdarm64 ]
1308-
needs: [jelinux, jelinux-gcc, jelinuxd, jemacos, jemacosarm, jemacosd, jemacosarmd, jerpi64, jerpi32, jewin, jewin32, jewinarm64, jeandroid, jefreebsd2, jefreebsdarm64, jeopenbsd2, jeopenbsdarm64 ]
1306+
needs: [jelinux, jelinux-gcc, jelinuxd, jemacos, jemacosarm, jemacosd, jemacosarmd, jerpi64, jerpi32, jerpi64d, jerpi32d, jewin, jewin32, jewinarm64, jeandroid, jefreebsd2, jefreebsdarm64, jeopenbsd2, jeopenbsdarm64 ]
13091307
steps:
13101308
- name: Checkout Git repository
13111309
uses: actions/checkout@v4

‎make2/build_libj.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ case $jplatform64 in
388388
raspberry/j32*) # linux raspbian arm
389389
TARGET=libj.so
390390
CFLAGS="$common -std=gnu99 -Wno-overflow -marm -march=armv6 -mfloat-abi=hard -mfpu=vfp -DRASPI "
391-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -ldl $LDTHREAD $LDOPENMP "
391+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -ldl $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
392392
SRC_ASM="${SRC_ASM_RASPI32}"
393393
GASM_FLAGS=""
394394
FLAGS_SLEEF=" -DENABLE_VECEXT " # broken in upstream
@@ -398,7 +398,7 @@ case $jplatform64 in
398398
raspberry/j64*) # linux arm64
399399
TARGET=libj.so
400400
CFLAGS="$common -march=armv8-a+crc -DRASPI -DC_CRC32C=1 " # mno-outline-atomics unavailable on clang-7
401-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -ldl $LDTHREAD $LDOPENMP "
401+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -ldl $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
402402
OBJS_AESARM=" aes-arm.o "
403403
SRC_ASM="${SRC_ASM_RASPI}"
404404
GASM_FLAGS=""
@@ -413,7 +413,7 @@ case $jplatform64 in
413413
CFLAGS="$common -m32 -msse2 -mfpmath=sse "
414414
# slower, use 387 fpu and truncate extra precision
415415
# CFLAGS="$common -m32 -ffloat-store "
416-
LDFLAGS=" -shared -Wl,-soname,libj.so -m32 -lm -lkvm $LDOPENMP32 $LDTHREAD "
416+
LDFLAGS=" -shared -Wl,-soname,libj.so -m32 -lm -lkvm $LDTHREAD $LDOPENMP32 -Wl,-z,noexecstack "
417417
OBJS_AESNI=" aes-ni.o "
418418
SRC_ASM="${SRC_ASM_LINUX32}"
419419
GASM_FLAGS="-m32"
@@ -424,7 +424,7 @@ case $jplatform64 in
424424
openbsd/j64arm) # openbsd arm64
425425
TARGET=libj.so
426426
CFLAGS="$common -march=armv8-a+crc -DC_CRC32C=1 " # mno-outline-atomics unavailable on clang-7
427-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP "
427+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
428428
OBJS_AESARM=" aes-arm.o "
429429
SRC_ASM="${SRC_ASM_RASPI}"
430430
GASM_FLAGS=""
@@ -435,7 +435,7 @@ case $jplatform64 in
435435
openbsd/j64avx512*) # openbsd intel 64bit avx512
436436
TARGET=libj.so
437437
CFLAGS="$common -DC_AVX2=1 -DC_AVX512=1 "
438-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP "
438+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
439439
CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
440440
OBJS_FMA=" gemm_int-fma.o "
441441
OBJS_AESNI=" aes-ni.o "
@@ -449,7 +449,7 @@ case $jplatform64 in
449449
openbsd/j64avx2*) # openbsd intel 64bit avx2
450450
TARGET=libj.so
451451
CFLAGS="$common -DC_AVX2=1 "
452-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP "
452+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
453453
CFLAGS_SIMD=" -march=skylake -mtune=skylake -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
454454
OBJS_FMA=" gemm_int-fma.o "
455455
OBJS_AESNI=" aes-ni.o "
@@ -462,7 +462,7 @@ case $jplatform64 in
462462
openbsd/j64*) # openbsd intel 64bit nonavx
463463
TARGET=libj.so
464464
CFLAGS="$common -msse3 "
465-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP "
465+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm -lkvm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
466466
OBJS_AESNI=" aes-ni.o "
467467
SRC_ASM="${SRC_ASM_LINUX}"
468468
GASM_FLAGS=""
@@ -477,7 +477,7 @@ case $jplatform64 in
477477
CFLAGS="$common -m32 -msse2 -mfpmath=sse "
478478
# slower, use 387 fpu and truncate extra precision
479479
# CFLAGS="$common -m32 -ffloat-store "
480-
LDFLAGS=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 $LDTHREAD "
480+
LDFLAGS=" -shared -Wl,-soname,libj.so -m32 -lm $LDOPENMP32 $LDTHREAD -Wl,-z,noexecstack "
481481
OBJS_AESNI=" aes-ni.o "
482482
SRC_ASM="${SRC_ASM_LINUX32}"
483483
GASM_FLAGS="-m32"
@@ -488,7 +488,7 @@ case $jplatform64 in
488488
freebsd/j64arm) # freebsd arm64
489489
TARGET=libj.so
490490
CFLAGS="$common -march=armv8-a+crc -DC_CRC32C=1 " # mno-outline-atomics unavailable on clang-7
491-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP "
491+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
492492
OBJS_AESARM=" aes-arm.o "
493493
SRC_ASM="${SRC_ASM_RASPI}"
494494
GASM_FLAGS=""
@@ -499,7 +499,7 @@ case $jplatform64 in
499499
freebsd/j64avx512*) # freebsd intel 64bit avx512
500500
TARGET=libj.so
501501
CFLAGS="$common -DC_AVX2=1 -DC_AVX512=1 "
502-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP "
502+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
503503
CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
504504
OBJS_FMA=" gemm_int-fma.o "
505505
OBJS_AESNI=" aes-ni.o "
@@ -513,7 +513,7 @@ case $jplatform64 in
513513
freebsd/j64avx2*) # freebsd intel 64bit avx2
514514
TARGET=libj.so
515515
CFLAGS="$common -DC_AVX2=1 "
516-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP "
516+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
517517
CFLAGS_SIMD=" -march=skylake -mtune=skylake -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
518518
OBJS_FMA=" gemm_int-fma.o "
519519
OBJS_AESNI=" aes-ni.o "
@@ -526,7 +526,7 @@ case $jplatform64 in
526526
freebsd/j64*) # freebsd intel 64bit nonavx
527527
TARGET=libj.so
528528
CFLAGS="$common -msse3 "
529-
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP "
529+
LDFLAGS=" -shared -Wl,-soname,libj.so -lm $LDTHREAD $LDOPENMP -Wl,-z,noexecstack "
530530
OBJS_AESNI=" aes-ni.o "
531531
SRC_ASM="${SRC_ASM_LINUX}"
532532
GASM_FLAGS=""

‎script/testga.sh

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,16 @@ if [ $m64 -eq 1 ]; then
7474
LC_ALL=fr_FR.UTF-8 j64/jconsole -lib libj.$ext testga.ijs
7575
fi
7676
elif [ "$_DEBUG" = "3" ] ; then
77-
if [ $1 = "linux" ] ; then
78-
echo "running debug"
79-
LC_ALL=fr_FR.UTF-8 gdb -batch -return-child-result -ex "run" -ex "thread apply all bt" --args j64/jconsole -lib libj.$ext testga.ijs
80-
else
81-
echo "running debug"
82-
LC_ALL=fr_FR.UTF-8 gdb -batch -ex "run" -ex "bt" --args j64/jconsole -lib libj.$ext testga.ijs
83-
fi
77+
echo "running debug"
78+
LC_ALL=fr_FR.UTF-8 gdb -batch -return-child-result -ex "run" -ex "thread apply all bt" --args j64/jconsole -lib libj.$ext testga.ijs
8479
else
8580
LC_ALL=fr_FR.UTF-8 j64/jconsole -lib libj.$ext testga.ijs
8681
fi
8782
else
8883
ls -l j32
8984
if [ "$_DEBUG" = "3" ] ; then
90-
if [ $1 = "linux" ] ; then
91-
echo "running debug"
92-
LC_ALL=fr_FR.UTF-8 gdb -batch -return-child-result -ex "run" -ex "thread apply all bt" --args j32/jconsole -lib libj.$ext testga.ijs
93-
else
94-
echo "running debug"
95-
LC_ALL=fr_FR.UTF-8 gdb -batch -ex "run" -ex "bt" --args j32/jconsole -lib libj.$ext testga.ijs
96-
fi
85+
echo "running debug"
86+
LC_ALL=fr_FR.UTF-8 gdb -batch -return-child-result -ex "run" -ex "thread apply all bt" --args j32/jconsole -lib libj.$ext testga.ijs
9787
else
9888
LC_ALL=fr_FR.UTF-8 j32/jconsole -lib libj.$ext testga.ijs
9989
fi

0 commit comments

Comments
 (0)