Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix illegal instruction on RPi 4 #2223

Merged
merged 3 commits into from
Feb 19, 2024
Merged

Fix illegal instruction on RPi 4 #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69e9c6f
third_party: bump absl LTS version
julianoes Feb 16, 2024
a714215
third_party: fix illegal instruction on RPi 4
julianoes Feb 16, 2024
be11e42
third_party: update gRPC as well
julianoes Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion third_party/absl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ endforeach()
ExternalProject_add(
absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
GIT_TAG 20230802.1
GIT_TAG 20240116.1
PREFIX absl
PATCH_COMMAND git checkout . && git apply ${PROJECT_SOURCE_DIR}/rpi-no-crypto.patch
CMAKE_ARGS "${CMAKE_ARGS}"
)
19 changes: 19 additions & 0 deletions third_party/absl/rpi-no-crypto.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/absl/random/internal/platform.h b/absl/random/internal/platform.h
index d779f481..ea30118f 100644
--- a/absl/random/internal/platform.h
+++ b/absl/random/internal/platform.h
@@ -116,10 +116,10 @@

// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0053c/IHI0053C_acle_2_0.pdf
// Rely on NEON+CRYPTO extensions for ARM.
-#if defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)
-#undef ABSL_HAVE_ACCELERATED_AES
-#define ABSL_HAVE_ACCELERATED_AES 1
-#endif
+//#if defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)
+//#undef ABSL_HAVE_ACCELERATED_AES
+//#define ABSL_HAVE_ACCELERATED_AES 1
+//#endif

#endif

2 changes: 1 addition & 1 deletion third_party/grpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endforeach()

ExternalProject_add(
grpc
URL https://github.com/grpc/grpc/archive/v1.60.0.tar.gz
URL https://github.com/grpc/grpc/archive/v1.61.1.tar.gz
PREFIX grpc
CMAKE_ARGS "${CMAKE_ARGS}"
)
Loading