len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-07 13:45:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Partial revert of 6c6bdbf60e

Browse source 
Turns out I compile-tested stale trees instead of the broken change

Net result is just the simpler MIPS revision (32/64/"classic") lookup rather than
the sub-revision (eg mips32r2 etc).

Change-Id: Ideebe522d29132f00f3769222f3846000b3a89fd
This commit is contained in:
Solomon Peachy 2025-12-06 15:48:42 -05:00
parent 6c6bdbf60e
commit dada036b10
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/asm/mips/thread.c
View file

@ -1,4 +1,4 @@
#if (CPU_MIPS == 32) || (CPU_MIPS == 32r2) #if (CPU_MIPS == 32)
#include "thread-mips32.c" #include "thread-mips32.c"
#else #else
#error Missing thread impl #error Missing thread impl

2
firmware/export/config.h
View file

@ -729,7 +729,7 @@ Lyre prototype 1 */
#endif #endif
#if ARCH == ARCH_MIPS #if ARCH == ARCH_MIPS
#define CPU_MIPS ARCH_VERSION /* 32, 32r2, 64 */ #define CPU_MIPS ARCH_VERSION /* 32, 64 */
#endif #endif
#endif /*__PCTOOL__*/ #endif /*__PCTOOL__*/

8
tools/configure vendored
View file

@ -4785,10 +4785,10 @@ if [ -z "$arch" ]; then
elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then
arch="mips" arch="mips"
arch_version="$(echo "$cpp_defines" | grep 'define __mips ' | sed -e 's,.* \([0-9]\+\).*,\1,')" arch_version="$(echo "$cpp_defines" | grep 'define __mips ' | sed -e 's,.* \([0-9]\+\).*,\1,')"
arch_revision="$(echo "$cpp_defines" | grep 'define __mips_isa_rev ' | sed -e 's,.* \([0-9]\+\).*,\1,')" # arch_revision="$(echo "$cpp_defines" | grep 'define __mips_isa_rev ' | sed -e 's,.* \([0-9]\+\).*,\1,')"
if [ -n "$arch_revision" ] ; then # if [ -n "$arch_revision" ] ; then
arch_version="${arch_version}r${arch_revision}" # arch_version="${arch_version}r${arch_revision}"
fi # fi
elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then
arch="x86" arch="x86"
elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then