From 3e08e14b9e8c8a28a9213b610b2a25a4e7c0538b Mon Sep 17 00:00:00 2001 From: r-a-sattarov Date: Thu, 11 Mar 2021 22:21:30 +0300 Subject: [PATCH] Exclude e2k/arm64/mips64 from the polygonBlock and brushBlock assertions --- neo/cm/CollisionModel_load.cpp | 2 +- neo/idlib/sys/sys_defines.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neo/cm/CollisionModel_load.cpp b/neo/cm/CollisionModel_load.cpp index b389199b..56f07e5d 100644 --- a/neo/cm/CollisionModel_load.cpp +++ b/neo/cm/CollisionModel_load.cpp @@ -3653,7 +3653,7 @@ cm_model_t* idCollisionModelManagerLocal::LoadBinaryModelFromFile( idFile* file, assert( model->polygonRefBlocks == NULL || ( model->polygonRefBlocks->next == NULL && model->polygonRefBlocks->nextRef == NULL ) ); // RB: FIXME -#if !defined(__x86_64__) && !defined(_WIN64) && !defined(__PPC64__) +#if !defined(__x86_64__) && !defined(_WIN64) && !defined(__PPC64__) && !defined(__e2k__) && !defined(__aarch64__) && !(defined(__mips64) || defined(__mips64_)) assert( model->polygonBlock->bytesRemaining == 0 ); assert( model->brushBlock->bytesRemaining == 0 ); #endif diff --git a/neo/idlib/sys/sys_defines.h b/neo/idlib/sys/sys_defines.h index 665f6e63..2e5a1b3a 100644 --- a/neo/idlib/sys/sys_defines.h +++ b/neo/idlib/sys/sys_defines.h @@ -121,9 +121,9 @@ If you have questions concerning this license or the applicable additional terms #define CPUSTRING "ppc64" #elif defined(__mips64) || defined(__mips64_) #define CPUSTRING "mips64" - #elif defined(__riscv) || defined(__riscv__) + #elif defined(__riscv__) || defined(__riscv) #define CPUSTRING "riscv" - #elif defined(__sparc__) || defined(__sparc__) + #elif defined(__sparc__) || defined(__sparc) #define CPUSTRING "sparc" #else #error unknown CPU