From 9b77b33ece7e7182cd2e12a061d749a153387b72 Mon Sep 17 00:00:00 2001
From: "John M. Schanck" <jschanck@uwaterloo.ca>
Date: Thu, 18 Mar 2021 10:58:22 -0400
Subject: [PATCH] Revert local McEliece changes

---
 src/kem/classic_mceliece/CMakeLists.txt             | 10 ----------
 .../pqclean_mceliece348864_avx/consts.S             | 13 -------------
 .../pqclean_mceliece348864_avx/int32_sort.c         |  4 ++--
 .../pqclean_mceliece348864f_avx/consts.S            | 13 -------------
 .../pqclean_mceliece348864f_avx/int32_sort.c        |  4 ++--
 .../pqclean_mceliece460896_avx/consts.S             | 13 -------------
 .../pqclean_mceliece460896_avx/int32_sort.c         |  4 ++--
 .../pqclean_mceliece460896f_avx/consts.S            | 13 -------------
 .../pqclean_mceliece460896f_avx/int32_sort.c        |  4 ++--
 .../pqclean_mceliece6688128_avx/consts.S            | 13 -------------
 .../pqclean_mceliece6688128_avx/int32_sort.c        |  4 ++--
 .../pqclean_mceliece6688128f_avx/consts.S           | 13 -------------
 .../pqclean_mceliece6688128f_avx/int32_sort.c       |  4 ++--
 .../pqclean_mceliece6960119_avx/consts.S            | 13 -------------
 .../pqclean_mceliece6960119_avx/int32_sort.c        |  4 ++--
 .../pqclean_mceliece6960119f_avx/consts.S           | 13 -------------
 .../pqclean_mceliece6960119f_avx/int32_sort.c       |  4 ++--
 .../pqclean_mceliece8192128_avx/consts.S            | 13 -------------
 .../pqclean_mceliece8192128_avx/int32_sort.c        |  4 ++--
 .../pqclean_mceliece8192128f_avx/consts.S           | 13 -------------
 .../pqclean_mceliece8192128f_avx/int32_sort.c       |  4 ++--
 21 files changed, 20 insertions(+), 160 deletions(-)

diff --git a/src/kem/classic_mceliece/CMakeLists.txt b/src/kem/classic_mceliece/CMakeLists.txt
index 74aaf0389..1b8f58d59 100644
--- a/src/kem/classic_mceliece/CMakeLists.txt
+++ b/src/kem/classic_mceliece/CMakeLists.txt
@@ -17,7 +17,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_348864_avx)
     target_include_directories(classic_mceliece_348864_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece348864_avx)
     target_include_directories(classic_mceliece_348864_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_348864_avx PRIVATE -mavx2 -mpopcnt)
-    target_compile_options(classic_mceliece_348864_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_348864_avx>)
 endif()
 
@@ -33,7 +32,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_348864f_avx)
     target_include_directories(classic_mceliece_348864f_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece348864f_avx)
     target_include_directories(classic_mceliece_348864f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_348864f_avx PRIVATE -mavx2 -mpopcnt -mbmi)
-    target_compile_options(classic_mceliece_348864f_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_348864f_avx>)
 endif()
 
@@ -49,7 +47,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_460896_avx)
     target_include_directories(classic_mceliece_460896_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece460896_avx)
     target_include_directories(classic_mceliece_460896_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_460896_avx PRIVATE -mavx2 -mpopcnt)
-    target_compile_options(classic_mceliece_460896_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_460896_avx>)
 endif()
 
@@ -65,7 +62,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_460896f_avx)
     target_include_directories(classic_mceliece_460896f_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece460896f_avx)
     target_include_directories(classic_mceliece_460896f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_460896f_avx PRIVATE -mavx2 -mbmi -mpopcnt)
-    target_compile_options(classic_mceliece_460896f_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_460896f_avx>)
 endif()
 
@@ -81,7 +77,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_6688128_avx)
     target_include_directories(classic_mceliece_6688128_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6688128_avx)
     target_include_directories(classic_mceliece_6688128_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_6688128_avx PRIVATE -mavx2 -mpopcnt)
-    target_compile_options(classic_mceliece_6688128_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_6688128_avx>)
 endif()
 
@@ -97,7 +92,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_6688128f_avx)
     target_include_directories(classic_mceliece_6688128f_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6688128f_avx)
     target_include_directories(classic_mceliece_6688128f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_6688128f_avx PRIVATE -mavx2 -mbmi -mpopcnt)
-    target_compile_options(classic_mceliece_6688128f_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_6688128f_avx>)
 endif()
 
@@ -113,7 +107,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_6960119_avx)
     target_include_directories(classic_mceliece_6960119_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6960119_avx)
     target_include_directories(classic_mceliece_6960119_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_6960119_avx PRIVATE -mavx2 -mpopcnt)
-    target_compile_options(classic_mceliece_6960119_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_6960119_avx>)
 endif()
 
@@ -129,7 +122,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_6960119f_avx)
     target_include_directories(classic_mceliece_6960119f_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece6960119f_avx)
     target_include_directories(classic_mceliece_6960119f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_6960119f_avx PRIVATE -mavx2 -mbmi -mpopcnt)
-    target_compile_options(classic_mceliece_6960119f_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_6960119f_avx>)
 endif()
 
@@ -145,7 +137,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_8192128_avx)
     target_include_directories(classic_mceliece_8192128_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece8192128_avx)
     target_include_directories(classic_mceliece_8192128_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_8192128_avx PRIVATE -mavx2 -mpopcnt)
-    target_compile_options(classic_mceliece_8192128_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_8192128_avx>)
 endif()
 
@@ -161,7 +152,6 @@ if(OQS_ENABLE_KEM_classic_mceliece_8192128f_avx)
     target_include_directories(classic_mceliece_8192128f_avx PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqclean_mceliece8192128f_avx)
     target_include_directories(classic_mceliece_8192128f_avx PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(classic_mceliece_8192128f_avx PRIVATE -mavx2 -mpopcnt -mbmi)
-    target_compile_options(classic_mceliece_8192128f_avx PRIVATE -Wno-language-extension-token)
     set(_CLASSIC_MCELIECE_OBJS ${_CLASSIC_MCELIECE_OBJS} $<TARGET_OBJECTS:classic_mceliece_8192128f_avx>)
 endif()
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece348864_avx/consts.S
index 72176eab4..385ad55a7 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE348864_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE348864_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE348864_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE348864_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece348864_avx/int32_sort.c
index 56a1f75a2..f984819f1 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/consts.S
index a2251f63e..63e6defe5 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE348864F_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE348864F_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE348864F_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE348864F_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/int32_sort.c
index eaa846957..3d00867db 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864f_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece460896_avx/consts.S
index 712c6073e..de62f1b01 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE460896_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE460896_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE460896_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE460896_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece460896_avx/int32_sort.c
index 4980ea799..aae917bd0 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/consts.S
index d75f18dbf..be9631933 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE460896F_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE460896F_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE460896F_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE460896F_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/int32_sort.c
index 9b6d0786c..d8c2b1c8a 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896f_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/consts.S
index 9438992a8..74691b8ce 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE6688128_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE6688128_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE6688128_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE6688128_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/int32_sort.c
index e657a2a76..d55525e73 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/consts.S
index 7e26c5675..f9127c38d 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE6688128F_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE6688128F_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE6688128F_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE6688128F_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/int32_sort.c
index ecd24d3fa..f70f51dda 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/consts.S
index 9880cbf94..e4abaf618 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE6960119_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE6960119_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE6960119_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE6960119_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/int32_sort.c
index 1a3264e77..02087a3e4 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/consts.S
index ef2ee0ff7..a3096c1f0 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE6960119F_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE6960119F_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE6960119F_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE6960119F_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/int32_sort.c
index 2bafa18e8..73bf75a2d 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/consts.S
index cdf5cbcde..e34172eab 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE8192128_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE8192128_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE8192128_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE8192128_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/int32_sort.c
index 5bace82e1..0e11f1c4c 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32
 
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/consts.S b/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/consts.S
index b495465a8..57ba3d8b6 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/consts.S
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/consts.S
@@ -16,19 +16,6 @@
 .globl PQCLEAN_MCELIECE8192128F_AVX_MASK5_0
 .globl PQCLEAN_MCELIECE8192128F_AVX_MASK5_1
 
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK0_0
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK0_1
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK1_0
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK1_1
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK2_0
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK2_1
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK3_0
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK3_1
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK4_0
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK4_1
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK5_0
-.hidden PQCLEAN_MCELIECE8192128F_AVX_MASK5_1
-
 .p2align 5
 
 PQCLEAN_MCELIECE8192128F_AVX_MASK0_0: .quad 0x5555555555555555, 0x5555555555555555, 0x5555555555555555, 0x5555555555555555
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/int32_sort.c b/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/int32_sort.c
index 6c0bd81f3..a35e886e2 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/int32_sort.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx/int32_sort.c
@@ -4,8 +4,8 @@
 #include <immintrin.h>
 
 typedef __m256i int32x8;
-#define int32x8_load(z) _mm256_loadu_si256((__m256i *) (z))
-#define int32x8_store(z,i) _mm256_storeu_si256((__m256i *) (z),(i))
+#define int32x8_load(z) _mm256_loadu_si256((__m256i_u *) (z))
+#define int32x8_store(z,i) _mm256_storeu_si256((__m256i_u *) (z),(i))
 #define int32x8_min _mm256_min_epi32
 #define int32x8_max _mm256_max_epi32