Skip to content

Commit 7e6544f

Browse files
committed
replace -O2 -g by -Og -g
1 parent f9af013 commit 7e6544f

14 files changed

Lines changed: 48 additions & 48 deletions

File tree

.github/workflows/emuavx.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# linux no pyxes -------------------------------------------------------
1818
jelinuxpyx0:
1919
name: JE (Linux no pyxes)
20-
if: ${{ false }}
20+
# if: ${{ false }}
2121
runs-on: ubuntu-22.04
2222
steps:
2323
- name: Checkout Git repository
@@ -43,20 +43,20 @@ jobs:
4343
USE_EMU_AVX: 1
4444
_DEBUG: 3
4545
run: |
46-
script/buildga.sh linux || exit 1
46+
script/buildga.sh linux x86_64 || exit 1
4747
4848
- name: Test JE (Linux no pyxes)
4949
env:
5050
USE_PYXES: 0
5151
USE_EMU_AVX: 1
5252
_DEBUG: 3
5353
run: |
54-
script/testga.sh linux || exit 1
54+
script/testga.sh linux x86_64 || exit 1
5555
5656
# linux no emu ---------------------------------------------------------
5757
jelinuxemu0:
5858
name: JE (Linux no emu)
59-
if: ${{ false }}
59+
# if: ${{ false }}
6060
runs-on: ubuntu-22.04
6161
steps:
6262
- name: Checkout Git repository
@@ -82,20 +82,20 @@ jobs:
8282
USE_EMU_AVX: 0
8383
_DEBUG: 3
8484
run: |
85-
script/buildga.sh linux || exit 1
85+
script/buildga.sh linux x86_64 || exit 1
8686
8787
- name: Test JE (Linux no emu)
8888
env:
8989
USE_PYXES: 1
9090
USE_EMU_AVX: 0
9191
_DEBUG: 3
9292
run: |
93-
script/testga.sh linux || exit 1
93+
script/testga.sh linux x86_64 || exit 1
9494
9595
# linux no pyxes/emu ---------------------------------------------------
9696
jelinuxpyxemu0:
9797
name: JE (Linux no pyxes/emu)
98-
if: ${{ false }}
98+
# if: ${{ false }}
9999
runs-on: ubuntu-22.04
100100
steps:
101101
- name: Checkout Git repository
@@ -121,20 +121,20 @@ jobs:
121121
USE_EMU_AVX: 0
122122
_DEBUG: 3
123123
run: |
124-
script/buildga.sh linux || exit 1
124+
script/buildga.sh linux x86_64 || exit 1
125125
126126
- name: Test JE (Linux no pyxes/emu)
127127
env:
128128
USE_PYXES: 0
129129
USE_EMU_AVX: 0
130130
_DEBUG: 3
131131
run: |
132-
script/testga.sh linux || exit 1
132+
script/testga.sh linux x86_64 || exit 1
133133
134134
# macOS arm64 no pyxes -------------------------------------------------
135135
jemacosarmpyx0:
136136
name: JE (macOS arm64 no pyxes)
137-
if: ${{ false }}
137+
# if: ${{ false }}
138138
runs-on: macos-15
139139
steps:
140140
- name: Checkout Git repository
@@ -152,19 +152,19 @@ jobs:
152152
USE_PYXES: 0
153153
USE_EMU_AVX: 1
154154
run: |
155-
script/buildga.sh darwin || exit 1
155+
script/buildga.sh darwin arm64 || exit 1
156156
157157
- name: Test JE (macOS arm64 no pyxes)
158158
env:
159159
USE_PYXES: 0
160160
USE_EMU_AVX: 1
161161
run: |
162-
script/testga.sh darwin || exit 1
162+
script/testga.sh darwin arm64 || exit 1
163163
164164
# macOS arm64 no emu ---------------------------------------------------
165165
jemacosarmemu0:
166166
name: JE (macOS arm64 no emu)
167-
if: ${{ false }}
167+
# if: ${{ false }}
168168
runs-on: macos-15
169169
steps:
170170
- name: Checkout Git repository
@@ -182,19 +182,19 @@ jobs:
182182
USE_PYXES: 1
183183
USE_EMU_AVX: 0
184184
run: |
185-
script/buildga.sh darwin || exit 1
185+
script/buildga.sh darwin arm64 || exit 1
186186
187187
- name: Test JE (macOS arm64 no emu)
188188
env:
189189
USE_PYXES: 1
190190
USE_EMU_AVX: 0
191191
run: |
192-
script/testga.sh darwin || exit 1
192+
script/testga.sh darwin arm64 || exit 1
193193
194194
# macOS arm64 no pyxes/emu ---------------------------------------------
195195
jemacosarmpyxemu0:
196196
name: JE (macOS arm64 no pyxes/emu)
197-
if: ${{ false }}
197+
# if: ${{ false }}
198198
runs-on: macos-15
199199
steps:
200200
- name: Checkout Git repository
@@ -212,19 +212,19 @@ jobs:
212212
USE_PYXES: 0
213213
USE_EMU_AVX: 0
214214
run: |
215-
script/buildga.sh darwin || exit 1
215+
script/buildga.sh darwin arm64 || exit 1
216216
217217
- name: Test JE (macOS arm64 no pyxes/emu)
218218
env:
219219
USE_PYXES: 0
220220
USE_EMU_AVX: 0
221221
run: |
222-
script/testga.sh darwin || exit 1
222+
script/testga.sh darwin arm64 || exit 1
223223
224224
# rpi64arm no pyxes ----------------------------------------------------
225225
jerpi64armpyx0:
226226
name: JE (Linux arm64 no pyxes)
227-
if: ${{ false }}
227+
# if: ${{ false }}
228228
runs-on: ubuntu-24.04-arm
229229
steps:
230230
- name: Checkout Git repository
@@ -256,7 +256,7 @@ jobs:
256256
# rpi64arm no emu ------------------------------------------------------
257257
jerpi64armemu0:
258258
name: JE (Linux arm64 no emu)
259-
if: ${{ false }}
259+
# if: ${{ false }}
260260
runs-on: ubuntu-24.04-arm
261261
steps:
262262
- name: Checkout Git repository
@@ -288,7 +288,7 @@ jobs:
288288
# rpi64arm no pyxes/emu ------------------------------------------------
289289
jerpi64armpyxemu0:
290290
name: JE (Linux arm64 no pyxes/emu)
291-
if: ${{ false }}
291+
# if: ${{ false }}
292292
runs-on: ubuntu-24.04-arm
293293
steps:
294294
- name: Checkout Git repository
@@ -320,7 +320,7 @@ jobs:
320320
# windows no pyxes -----------------------------------------------------
321321
jewinpyx0:
322322
name: JE (Windows no pyxes)
323-
if: ${{ false }}
323+
# if: ${{ false }}
324324
runs-on: windows-2022
325325
steps:
326326
- name: Checkout Git repository
@@ -352,7 +352,7 @@ jobs:
352352
# windows no emu -------------------------------------------------------
353353
jewinemu0:
354354
name: JE (Windows no emu)
355-
if: ${{ false }}
355+
# if: ${{ false }}
356356
runs-on: windows-2022
357357
steps:
358358
- name: Checkout Git repository
@@ -384,7 +384,7 @@ jobs:
384384
# windows no pyxes/emu -------------------------------------------------
385385
jewinpyxemu0:
386386
name: JE (Windows no pyxes/emu)
387-
if: ${{ false }}
387+
# if: ${{ false }}
388388
runs-on: windows-2022
389389
steps:
390390
- name: Checkout Git repository
@@ -416,7 +416,7 @@ jobs:
416416
# windows arm64 no pyxes ------------------------------------------------
417417
jewinarm64pyx0:
418418
name: JE (Windows arm64 no pyxes)
419-
if: ${{ false }}
419+
# if: ${{ false }}
420420
runs-on: windows-11-arm
421421
steps:
422422
- name: Checkout Git repository
@@ -448,7 +448,7 @@ jobs:
448448
# windows arm64 no emu --------------------------------------------------
449449
jewinarm64emu0:
450450
name: JE (Windows arm64 no emu)
451-
if: ${{ false }}
451+
# if: ${{ false }}
452452
runs-on: windows-11-arm
453453
steps:
454454
- name: Checkout Git repository
@@ -480,7 +480,7 @@ jobs:
480480
# windows arm64 no pyxes/emu --------------------------------------------
481481
jewinarm64pyxemu0:
482482
name: JE (Windows arm64 no pyxes/emu)
483-
if: ${{ false }}
483+
# if: ${{ false }}
484484
runs-on: windows-11-arm
485485
steps:
486486
- name: Checkout Git repository
@@ -512,7 +512,7 @@ jobs:
512512
# linux32 --------------------------------------------------------------
513513
jelinux32pyx1:
514514
name: JE (Linux32 pyxes)
515-
if: ${{ false }}
515+
# if: ${{ false }}
516516
runs-on: ubuntu-22.04
517517
steps:
518518
- name: Checkout Git repository
@@ -535,12 +535,12 @@ jobs:
535535
USE_EMU_AVX: 0
536536
_DEBUG: 0
537537
run: |
538-
script/buildga.sh linux32 || exit 1
538+
script/buildga.sh linux i386 || exit 1
539539
540540
# rpi32arm -------------------------------------------------------------
541541
jerpi32armpyx1:
542542
name: JE (Linux arm32 pyxes)
543-
if: ${{ false }}
543+
# if: ${{ false }}
544544
runs-on: ubuntu-24.04-arm
545545
steps:
546546
- name: Checkout Git repository

make2/build_jamalgam.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [ "" = "$CFLAGS" ]; then
1212
# OPTLEVEL is probably overly elaborate, but it works
1313
case "$_DEBUG" in
1414
3)
15-
OPTLEVEL=" -O2 -g "
15+
OPTLEVEL=" -Og -g "
1616
DEBUG=1
1717
NASM_FLAGS="-g"
1818
;;
@@ -22,7 +22,7 @@ if [ "" = "$CFLAGS" ]; then
2222
NASM_FLAGS="-g"
2323
;;
2424
1)
25-
OPTLEVEL=" -O2 -g "
25+
OPTLEVEL=" -Og -g "
2626
DEBUG=1
2727
NASM_FLAGS="-g"
2828
j64x=$64x-debug

make2/build_jconsole.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [ "" = "$CFLAGS" ]; then
1212
# OPTLEVEL is probably overly elaborate, but it works
1313
case "$_DEBUG" in
1414
3)
15-
OPTLEVEL=" -O2 -g "
15+
OPTLEVEL=" -Og -g "
1616
DEBUG=1
1717
NASM_FLAGS="-g"
1818
;;
@@ -22,7 +22,7 @@ if [ "" = "$CFLAGS" ]; then
2222
NASM_FLAGS="-g"
2323
;;
2424
1)
25-
OPTLEVEL=" -O2 -g "
25+
OPTLEVEL=" -Og -g "
2626
DEBUG=1
2727
NASM_FLAGS="-g"
2828
j64x=$64x-debug

make2/build_jnative.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ if [ "" = "$CFLAGS" ]; then
1212
# OPTLEVEL is probably overly elaborate, but it works
1313
case "$_DEBUG" in
1414
3)
15-
OPTLEVEL=" -O2 -g "
15+
OPTLEVEL=" -Og -g "
1616
NASM_FLAGS="-g"
1717
;;
1818
2)
1919
OPTLEVEL=" -O0 -ggdb "
2020
NASM_FLAGS="-g"
2121
;;
2222
1)
23-
OPTLEVEL=" -O2 -g "
23+
OPTLEVEL=" -Og -g "
2424
NASM_FLAGS="-g"
2525
j64x=$64x-debug
2626
;;

make2/build_libj.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if [ "" = "$CFLAGS" ]; then
1515
# OPTLEVEL is probably overly elaborate, but it works
1616
case "$_DEBUG" in
1717
3)
18-
OPTLEVEL=" -O2 -g "
18+
OPTLEVEL=" -Og -g "
1919
DEBUG=1
2020
NASM_FLAGS="-g"
2121
;;
@@ -25,7 +25,7 @@ if [ "" = "$CFLAGS" ]; then
2525
NASM_FLAGS="-g"
2626
;;
2727
1)
28-
OPTLEVEL=" -O2 -g "
28+
OPTLEVEL=" -Og -g "
2929
DEBUG=1
3030
NASM_FLAGS="-g"
3131
j64x=$64x-debug

make2/build_tsdll.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ if [ "" = "$CFLAGS" ]; then
1212
# OPTLEVEL is probably overly elaborate, but it works
1313
case "$_DEBUG" in
1414
3)
15-
OPTLEVEL=" -O2 -g "
15+
OPTLEVEL=" -Og -g "
1616
NASM_FLAGS="-g"
1717
;;
1818
2)
1919
OPTLEVEL=" -O0 -ggdb "
2020
NASM_FLAGS="-g"
2121
;;
2222
1)
23-
OPTLEVEL=" -O2 -g "
23+
OPTLEVEL=" -Og -g "
2424
NASM_FLAGS="-g"
2525
j64x=$64x-debug
2626
;;

mpir/include/android/gmp-arm64-v8a.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ enum
23242324

23252325
/* Define CC and CFLAGS which were used to build this version of GMP */
23262326
#define __GMP_CC "aarch64-linux-android-gcc"
2327-
#define __GMP_CFLAGS "-O2 -g -pedantic -fomit-frame-pointer -Wl,-z,noexecstack -ffunction-sections -funwind-tables -no-canonical-prefixes -fno-strict-aliasing -fstack-protector-strong -finline-limit=300 -funswitch-loops"
2327+
#define __GMP_CFLAGS "-Og -g -pedantic -fomit-frame-pointer -Wl,-z,noexecstack -ffunction-sections -funwind-tables -no-canonical-prefixes -fno-strict-aliasing -fstack-protector-strong -finline-limit=300 -funswitch-loops"
23282328

23292329
/* Major version number is the value of __GNU_MP__ too, above. */
23302330
#define __GNU_MP_VERSION 6

mpir/include/android/gmp-armeabi-v7a.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ enum
23242324

23252325
/* Define CC and CFLAGS which were used to build this version of GMP */
23262326
#define __GMP_CC "arm-linux-androideabi-gcc"
2327-
#define __GMP_CFLAGS "-O2 -g -pedantic -fomit-frame-pointer -Wl,-z,noexecstack -ffunction-sections -funwind-tables -no-canonical-prefixes -fno-strict-aliasing -fstack-protector -finline-limit=64 -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
2327+
#define __GMP_CFLAGS "-Og -g -pedantic -fomit-frame-pointer -Wl,-z,noexecstack -ffunction-sections -funwind-tables -no-canonical-prefixes -fno-strict-aliasing -fstack-protector -finline-limit=64 -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
23282328

23292329
/* Major version number is the value of __GNU_MP__ too, above. */
23302330
#define __GNU_MP_VERSION 6

mpir/include/android/gmp-armeabi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ enum
23242324

23252325
/* Define CC and CFLAGS which were used to build this version of GMP */
23262326
#define __GMP_CC "arm-linux-androideabi-gcc"
2327-
#define __GMP_CFLAGS "-O2 -g -pedantic -fomit-frame-pointer -Wl,-z,noexecstack -ffunction-sections -funwind-tables -no-canonical-prefixes -fno-strict-aliasing -fstack-protector -finline-limit=64 -march=armv5te -mtune=xscale -msoft-float -mthumb"
2327+
#define __GMP_CFLAGS "-Og -g -pedantic -fomit-frame-pointer -Wl,-z,noexecstack -ffunction-sections -funwind-tables -no-canonical-prefixes -fno-strict-aliasing -fstack-protector -finline-limit=64 -march=armv5te -mtune=xscale -msoft-float -mthumb"
23282328

23292329
/* Major version number is the value of __GNU_MP__ too, above. */
23302330
#define __GNU_MP_VERSION 6

mpir/include/android/gmp-x86.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@ enum
23242324

23252325
/* Define CC and CFLAGS which were used to build this version of GMP */
23262326
#define __GMP_CC "i686-linux-android-gcc"
2327-
#define __GMP_CFLAGS "-O2 -g -pedantic -Wl,-z,noexecstack -fomit-frame-pointer -ffunction-sections -funwind-tables -fstrict-aliasing -funswitch-loops -finline-limit=300 -no-canonical-prefixes -fstack-protector -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32"
2327+
#define __GMP_CFLAGS "-Og -g -pedantic -Wl,-z,noexecstack -fomit-frame-pointer -ffunction-sections -funwind-tables -fstrict-aliasing -funswitch-loops -finline-limit=300 -no-canonical-prefixes -fstack-protector -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32"
23282328

23292329
/* Major version number is the value of __GNU_MP__ too, above. */
23302330
#define __GNU_MP_VERSION 6

0 commit comments

Comments
 (0)