Skip to content

NDS: do not force-disable stack protector on BlocksDS. #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asiekierka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NDS: do not force-disable stack protector on BlocksDS. #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arch/nds-blocksds/CONFIG.NDS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
./config.sh --platform nds-blocksds --prefix "$BLOCKSDS" --optimize-size --enable-lto \
--disable-editor --disable-helpsys --disable-utils \
--disable-libpng --enable-release --enable-meter \
--enable-extram --disable-screenshots --enable-stdio-redirect "$@"
--enable-extram --disable-screenshots --enable-stdio-redirect \
--disable-stack-protector "$@"
8 changes: 5 additions & 3 deletions config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,9 +917,6 @@ if [ "$PLATFORM" = "nds" ] || [ "$PLATFORM" = "nds-blocksds" ]; then
echo "BUILD_NDS=1" >> platform.inc
DOS_ROOTS="true"

echo "Force-disabling stack protector on NDS."
STACK_PROTECTOR="false"

echo "Building custom NDS renderer."

echo "Force-disabling hash tables on NDS."
Expand All @@ -940,6 +937,11 @@ if [ "$PLATFORM" = "nds" ] || [ "$PLATFORM" = "nds-blocksds" ]; then
VORBIS="false"
fi

if [ "$PLATFORM" = "nds" ]; then
echo "Force-disabling stack protector on NDS."
STACK_PROTECTOR="false"
fi

if [ "$PLATFORM" = "nds-blocksds" ]; then
echo "Enabling BlocksDS-specific hacks."
echo "#define CONFIG_NDS_BLOCKSDS" >> src/config.h
Expand Down
10 changes: 5 additions & 5 deletions docs/platform_matrix.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,10 @@
architecture: "ARM9",
format: "ELF",
endian: "Little",
toolchain: "gcc 15.1.0 <br> binutils&nbsp;2.44 <br> (blocksds&nbsp;1.11.1)",
libc: "Newlib",
toolchain: "gcc 15.2.1 <br> binutils&nbsp;2.45 <br> (blocksds&nbsp;1.15.3)",
libc: "Picolibc",
packaged: ZIP,
stack_protector: _FAULTY(),
stack_protector: no_low_memory,
layer_rendering: _FAULTY(),
module_engine: maxmod,
adlib_engine: _FAULTY(),
Expand Down Expand Up @@ -1006,8 +1006,8 @@ <h2>Platform Notes</h2>
<li id="note5">The editor and help system features are disabled
to conserve cache on embedded platforms. The features build and work
on these platforms, but they are basically unusable due to the lack of any
on-screen keyboard. Additionally, hash tables have been disabled on the NDS to
conserve memory.
on-screen keyboard. Additionally, hash tables and stack protection have been
disabled on the NDS to conserve memory.
</li>

<li id="note6">The updater may or may not work on these platforms, but
Expand Down
Loading