diff --git a/Makefile.common b/Makefile.common
index 41a323f107..7b26c60f78 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -736,7 +736,6 @@ ifeq ($(HAVE_7ZIP),1)
    7ZOBJ = 	deps/7zip/7zIn.o \
 		deps/7zip/7zAlloc.o \
 		deps/7zip/Bra86.o \
-		deps/7zip/CpuArch.o \
 		deps/7zip/7zFile.o \
 		deps/7zip/7zStream.o \
 		deps/7zip/7zBuf2.o \
diff --git a/deps/7zip/7zCrc.c b/deps/7zip/7zCrc.c
index 6b57e8bf59..4f081fbe77 100644
--- a/deps/7zip/7zCrc.c
+++ b/deps/7zip/7zCrc.c
@@ -47,7 +47,7 @@ uint32_t MY_FAST_CALL CrcCalc(const void *data, size_t size)
    return g_CrcUpdate(CRC_INIT_VAL, data, size, g_CrcTable) ^ CRC_INIT_VAL;
 }
 
-void MY_FAST_CALL CrcGenerateTable()
+void MY_FAST_CALL CrcGenerateTable(void)
 {
    uint32_t i;
    for (i = 0; i < 256; i++)
@@ -68,8 +68,7 @@ void MY_FAST_CALL CrcGenerateTable()
    }
    g_CrcUpdate = CrcUpdateT4;
 #ifdef MY_CPU_X86_OR_AMD64
-   if (!CPU_Is_InOrder())
-      g_CrcUpdate = CrcUpdateT8;
+   g_CrcUpdate = CrcUpdateT8;
 #endif
 #endif
 }
diff --git a/deps/7zip/CpuArch.c b/deps/7zip/CpuArch.c
deleted file mode 100644
index 36d5d6b48e..0000000000
--- a/deps/7zip/CpuArch.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdint.h>
-#include "CpuArch.h"
-
-Bool CPU_Is_InOrder(void);
-
-Bool CPU_Is_InOrder(void)
-{
-   return False;
-}
diff --git a/deps/7zip/CpuArch.h b/deps/7zip/CpuArch.h
index a51e873167..97dc50d1d7 100644
--- a/deps/7zip/CpuArch.h
+++ b/deps/7zip/CpuArch.h
@@ -120,8 +120,6 @@ Stop_Compiling_Bad_Endian
 
 #define GetBe16(p) (((uint16_t)((const uint8_t *)(p))[0] << 8) | ((const uint8_t *)(p))[1])
 
-Bool CPU_Is_InOrder();
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index f6fdb6b9f6..dcde091da6 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -855,7 +855,6 @@ DEPENDENCIES
 #include "../deps/7zip/7zIn.c"
 #include "../deps/7zip/7zAlloc.c"
 #include "../deps/7zip/Bra86.c"
-#include "../deps/7zip/CpuArch.c"
 #include "../deps/7zip/7zFile.c"
 #include "../deps/7zip/7zStream.c"
 #include "../deps/7zip/7zBuf2.c"