diff --git a/crt/CMakeLists.txt b/crt/CMakeLists.txt index 99296e6e7..25e7d1891 100644 --- a/crt/CMakeLists.txt +++ b/crt/CMakeLists.txt @@ -40,6 +40,15 @@ if(UNIX AND NOT APPLE) set(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX ON CACHE BOOL "Disable AVX512 on old GCC that not supports it") endif() + string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LOWER) + if(CMAKE_SYSTEM_PROCESSOR_LOWER MATCHES "x86_64|amd64|x86|i386|i686" AND CMAKE_SIZEOF_VOID_P EQUAL 4) + # Add -msse2 for x86-32bit because of https://github.com/aws/aws-lc/commit/6fe8dcbe96e580ea85233fdb98a142e42951b70b + # CMAKE_SYSTEM_PROCESSOR is supposed to match the target architecture when cross-compiling, + # but this is not guaranteed. See: https://cmake.org/cmake/help/v3.30/variable/CMAKE_SYSTEM_PROCESSOR.html + # So, check for both CMAKE_SIZEOF_VOID_P and CMAKE_SYSTEM_PROCESSOR_LOWER for x86-32bit + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") + endif() + add_subdirectory(aws-lc) endif() diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 52bf59161..1de544597 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 52bf591613d1a001c43ec99af7376f871759c5fe +Subproject commit 1de544597e9739f689e8ad2c055a86656856b3eb diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 77ca3aea8..2cb1d2eac 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 77ca3aea879bc768082fe7ec715adcde8e98c332 +Subproject commit 2cb1d2eac925e2dbc45025eb89af82bd790c23a0 diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ea1d421a4..f36d01672 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ea1d421a421ad83a540309a94c38d50b6a5d836b +Subproject commit f36d01672d61e49d96a777870d456f66fa391cd4 diff --git a/crt/aws-lc b/crt/aws-lc index 057477806..2f1879759 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 05747780676652f41d0b9c570a495e4bb6608560 +Subproject commit 2f1879759b2e0fc70592665bdf10087b64f44b7d diff --git a/crt/s2n b/crt/s2n index 79c0f1b43..87f4a0585 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 79c0f1b434742d9f1152c48d3781433649f6f8fe +Subproject commit 87f4a0585dc3056433f193b9305f587cff239be3 diff --git a/test/test_websocket.py b/test/test_websocket.py index b0e748b24..17de0a92d 100644 --- a/test/test_websocket.py +++ b/test/test_websocket.py @@ -467,7 +467,6 @@ def test_send_receive_data(self): self.assertIsNone(handler.exception) def test_send_frame_exceptions(self): - init_logging(LogLevel.Trace, 'stderr') with WebSocketServer(self.host, self.port) as server: handler = ClientHandler() handler.connect_sync(self.host, self.port)