moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-02 15:56:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix __builtin_cpu_supports(aes) on GCC 9 and earlier

Browse Source
This commit is contained in:
Cameron Gutman 2024-02-17 13:23:06 -06:00
parent 8fb2c72ca1
commit 8125d2194b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -98,6 +98,11 @@ if (HAVE_GETAUXVAL)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_GETAUXVAL) list(APPEND MOONLIGHT_DEFINITIONS HAVE_GETAUXVAL)
endif() endif()
check_c_source_compiles("int main(void) { return __builtin_cpu_supports(\"aes\"); }" HAVE_BICS_AES)
if (HAVE_BICS_AES)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_BICS_AES)
endif()
if (CEC_FOUND) if (CEC_FOUND)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC) list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
list(APPEND MOONLIGHT_OPTIONS CEC) list(APPEND MOONLIGHT_OPTIONS CEC)

6
src/util.c
View File

@ -113,10 +113,6 @@ bool ensure_buf_size(void **buf, size_t *buf_size, size_t required_size) {
} }
bool has_fast_aes() { bool has_fast_aes() {
#ifndef __has_builtin
#define __has_builtin(x) 0
#endif
#if defined(HAVE_GETAUXVAL) && (defined(__arm__) || defined(__aarch64__)) #if defined(HAVE_GETAUXVAL) && (defined(__arm__) || defined(__aarch64__))
#if defined(__arm__) && defined(HWCAP2_AES) #if defined(__arm__) && defined(HWCAP2_AES)
return !!(getauxval(AT_HWCAP2) & HWCAP2_AES); return !!(getauxval(AT_HWCAP2) & HWCAP2_AES);
@ -125,7 +121,7 @@ bool has_fast_aes() {
#else #else
return false; return false;
#endif #endif
#elif __has_builtin(__builtin_cpu_supports) && (defined(__i386__) || defined(__x86_64__)) #elif defined(HAVE_BICS_AES)
return __builtin_cpu_supports("aes"); return __builtin_cpu_supports("aes");
#elif defined(__BUILTIN_CPU_SUPPORTS__) && defined(__powerpc__) #elif defined(__BUILTIN_CPU_SUPPORTS__) && defined(__powerpc__)
return __builtin_cpu_supports("vcrypto"); return __builtin_cpu_supports("vcrypto");