Skip to content

Commit 85dd003

Browse files
authored
Update compiler flags and remove deprecated options
1 parent 1a7b167 commit 85dd003

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

tools/copy-libs.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ LD_SCRIPT_DIRS=""
7575
PIO_CC_FLAGS="-flto=auto "
7676
PIO_C_FLAGS="-flto=auto "
7777
PIO_CXX_FLAGS="-flto=auto "
78+
# PIO_CXX_FLAGS="-flto=auto -std=gnu++2a "
7879
PIO_AS_FLAGS=""
7980
PIO_LD_FLAGS="-flto "
8081
PIO_LD_FUNCS=""
@@ -126,7 +127,7 @@ for item in "${@:2:${#@}-5}"; do
126127
DEFINES+="$item "
127128
fi
128129
elif [ "$prefix" = "-O" ]; then
129-
PIO_CC_FLAGS+="$item "
130+
PIO_CC_FLAGS+="$item "
130131
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
131132
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" && "${item:0:8}" != "-fno-lto" ]]; then
132133
C_FLAGS+="$item "
@@ -312,6 +313,9 @@ for item; do
312313
fi
313314
done
314315

316+
# Remove -std=gnu++2b from PIO_CXX_FLAGS
317+
# PIO_CXX_FLAGS="${PIO_CXX_FLAGS/-std=gnu++2b/}"
318+
315319
#
316320
# END OF DATA EXTRACTION FROM CMAKE
317321
#
@@ -325,8 +329,10 @@ cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
325329
echo " ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
326330
if [ "$IS_XTENSA" = "y" ]; then
327331
echo " \"-mlongcalls\"" >> "$AR_PLATFORMIO_PY"
332+
elif [ "$IDF_TARGET" = "esp32p4" ]; then
333+
echo " \"-march=rv32imafc_zicsr_zifencei_xesppie\"" >> "$AR_PLATFORMIO_PY"
328334
else
329-
echo " \"-march=rv32imc\"" >> "$AR_PLATFORMIO_PY"
335+
echo " \"-march=rv32imc_zicsr_zifencei\"" >> "$AR_PLATFORMIO_PY"
330336
fi
331337
echo " ]," >> "$AR_PLATFORMIO_PY"
332338
echo "" >> "$AR_PLATFORMIO_PY"

0 commit comments

Comments
 (0)