fix: dont try to enable AVX on ARM (or any non x86_64/x86 arch)

brainboxdotcc · Aug 28, 2023 · d85123b · d85123b
1 parent 95598a6
commit d85123b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/cmake/DetectArchitecture.cmake b/cmake/DetectArchitecture.cmake
@@ -19,7 +19,6 @@ function(check_instruction_set INSTRUCTION_SET_NAME INSTRUCTION_SET_FLAG INSTRUC
         set(AVX_FLAG "${INSTRUCTION_SET_FLAG}" PARENT_SCOPE)
         set(AVX_NAME "${INSTRUCTION_SET_NAME}" PARENT_SCOPE)
     else()
-        message(STATUS "Instruction set ${INSTRUCTION_SET_NAME} not supported. Falling back to the previous instruction set.")
         return()
     endif()
 endfunction()
@@ -41,16 +40,22 @@ endif()
 set(CMAKE_REQUIRED_FLAGS_SAVE "${CMAKE_REQUIRED_FLAGS}")
 
 set(AVX_NAME "T_Fallback")
+if ((${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i386"))
+
+	foreach(INSTRUCTION_SET IN LISTS INSTRUCTION_SETS)
+		string(REPLACE "?" ";" CURRENT_LIST "${INSTRUCTION_SET}")
+		list(GET CURRENT_LIST 0 INSTRUCTION_SET_NAME)
+		list(GET CURRENT_LIST 1 INSTRUCTION_SET_FLAG)
+		string(REPLACE "." ";" INSTRUCTION_SET_FLAG "${INSTRUCTION_SET_FLAG}")
+		list(GET CURRENT_LIST 2 INSTRUCTION_SET_INTRINSIC)
+		string(REPLACE "." ";" INSTRUCTION_SET_INTRINSIC "${INSTRUCTION_SET_INTRINSIC}")
+		check_instruction_set("${INSTRUCTION_SET_NAME}" "${INSTRUCTION_SET_FLAG}" "${INSTRUCTION_SET_INTRINSIC}")
+	endforeach()
+
+	string(REPLACE "T_" "" AVX_DISPLAY ${AVX_NAME})
+	message(STATUS "Detected ${CMAKE_SYSTEM_PROCESSOR} SSE type: ${AVX_DISPLAY}")
+else()
+	message(STATUS "SSE not supported by architecture ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
 
-foreach(INSTRUCTION_SET IN LISTS INSTRUCTION_SETS)
-    string(REPLACE "?" ";" CURRENT_LIST "${INSTRUCTION_SET}")
-    list(GET CURRENT_LIST 0 INSTRUCTION_SET_NAME)
-    list(GET CURRENT_LIST 1 INSTRUCTION_SET_FLAG)
-    string(REPLACE "." ";" INSTRUCTION_SET_FLAG "${INSTRUCTION_SET_FLAG}")
-    list(GET CURRENT_LIST 2 INSTRUCTION_SET_INTRINSIC)
-    string(REPLACE "." ";" INSTRUCTION_SET_INTRINSIC "${INSTRUCTION_SET_INTRINSIC}")
-    check_instruction_set("${INSTRUCTION_SET_NAME}" "${INSTRUCTION_SET_FLAG}" "${INSTRUCTION_SET_INTRINSIC}")
-endforeach()
-
-message(STATUS "Detected CPU Architecture: ${AVX_NAME}")
 set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS_SAVE}")
diff --git a/include/dpp/cluster_coro_calls.h b/include/dpp/cluster_coro_calls.h
@@ -1799,7 +1799,7 @@
 [[nodiscard]] async<confirmation_callback_t> co_nitro_sticker_get(snowflake id);
 
 /**
- * @brief Get sticker packs
+ * @brief Get a list of available sticker packs
  * @see dpp::cluster::sticker_packs_get
  * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs
  * @return sticker_pack_map returned object on completion

diff --git a/include/dpp/cluster_sync_calls.h b/include/dpp/cluster_sync_calls.h
@@ -2207,7 +2207,7 @@ sticker_map guild_stickers_get_sync(snowflake guild_id);
 sticker nitro_sticker_get_sync(snowflake id);
 
 /**
- * @brief Get sticker packs
+ * @brief Get a list of available sticker packs
  * @see dpp::cluster::sticker_packs_get
  * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs
  * @return sticker_pack_map returned object on completion